From 31ec824aefbe51dbc121ecb81371ca95d849ec37 Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Tue, 22 May 2018 16:07:27 -0300 Subject: [PATCH] Revert "add workaround because truffle doesn't support transitive dependencies" This reverts commit 48a7cd4e60d8e17f907bf305922df7c400927dbd. --- contracts/access/SignatureBouncer.sol | 2 -- contracts/ownership/Ownable.sol | 2 +- contracts/ownership/rbac/RBACWithAdmin.sol | 3 +-- contracts/payment/SplitPayment.sol | 2 +- contracts/token/ERC20/DetailedERC20.sol | 2 +- contracts/token/ERC20/DetailedMintableToken.sol | 2 +- contracts/token/ERC20/DetailedPremintedToken.sol | 2 +- contracts/token/ERC20/MintableToken.sol | 2 +- contracts/token/ERC20/TokenTimelock.sol | 2 +- contracts/token/ERC20/TokenVesting.sol | 2 +- contracts/token/ERC721/ERC721Token.sol | 2 +- contracts/zos-lib/migrations/Migratable.sol | 1 - 12 files changed, 10 insertions(+), 14 deletions(-) delete mode 120000 contracts/zos-lib/migrations/Migratable.sol diff --git a/contracts/access/SignatureBouncer.sol b/contracts/access/SignatureBouncer.sol index 44e18e356..bfaa06f83 100644 --- a/contracts/access/SignatureBouncer.sol +++ b/contracts/access/SignatureBouncer.sol @@ -1,11 +1,9 @@ pragma solidity ^0.4.18; -import "../zos-lib/migrations/Migratable.sol"; import "../ownership/Ownable.sol"; import "../ownership/rbac/RBAC.sol"; import "../ECRecovery.sol"; - /** * @title SignatureBouncer * @author PhABC and Shrugs diff --git a/contracts/ownership/Ownable.sol b/contracts/ownership/Ownable.sol index 4dd804ed7..c2de6ff95 100644 --- a/contracts/ownership/Ownable.sol +++ b/contracts/ownership/Ownable.sol @@ -1,6 +1,6 @@ pragma solidity ^0.4.21; -import "../zos-lib/migrations/Migratable.sol"; +import "zos-lib/contracts/migrations/Migratable.sol"; /** diff --git a/contracts/ownership/rbac/RBACWithAdmin.sol b/contracts/ownership/rbac/RBACWithAdmin.sol index 2ef1d2c7a..eeac34ed6 100644 --- a/contracts/ownership/rbac/RBACWithAdmin.sol +++ b/contracts/ownership/rbac/RBACWithAdmin.sol @@ -1,8 +1,7 @@ pragma solidity ^0.4.21; import "./RBAC.sol"; -import "../../zos-lib/migrations/Migratable.sol"; - +import 'zos-lib/contracts/migrations/Migratable.sol'; /** * @title RBACWithAdmin diff --git a/contracts/payment/SplitPayment.sol b/contracts/payment/SplitPayment.sol index b15be74d6..9415d42d9 100644 --- a/contracts/payment/SplitPayment.sol +++ b/contracts/payment/SplitPayment.sol @@ -1,7 +1,7 @@ pragma solidity ^0.4.21; import "../math/SafeMath.sol"; -import "../zos-lib/migrations/Migratable.sol"; +import "zos-lib/contracts/migrations/Migratable.sol"; /** diff --git a/contracts/token/ERC20/DetailedERC20.sol b/contracts/token/ERC20/DetailedERC20.sol index 921f23c8c..f648bdb83 100644 --- a/contracts/token/ERC20/DetailedERC20.sol +++ b/contracts/token/ERC20/DetailedERC20.sol @@ -1,7 +1,7 @@ pragma solidity ^0.4.21; import "./ERC20.sol"; -import "../../zos-lib/migrations/Migratable.sol"; +import "zos-lib/contracts/migrations/Migratable.sol"; contract DetailedERC20 is Migratable, ERC20 { diff --git a/contracts/token/ERC20/DetailedMintableToken.sol b/contracts/token/ERC20/DetailedMintableToken.sol index 7ad41582c..3f1ba77ca 100644 --- a/contracts/token/ERC20/DetailedMintableToken.sol +++ b/contracts/token/ERC20/DetailedMintableToken.sol @@ -1,6 +1,6 @@ pragma solidity ^0.4.21; -import "../../zos-lib/migrations/Migratable.sol"; +import "zos-lib/contracts/migrations/Migratable.sol"; import "./DetailedERC20.sol"; import "./MintableToken.sol"; diff --git a/contracts/token/ERC20/DetailedPremintedToken.sol b/contracts/token/ERC20/DetailedPremintedToken.sol index a27804fac..2acc32917 100644 --- a/contracts/token/ERC20/DetailedPremintedToken.sol +++ b/contracts/token/ERC20/DetailedPremintedToken.sol @@ -1,6 +1,6 @@ pragma solidity ^0.4.21; -import "../../zos-lib/migrations/Migratable.sol"; +import "zos-lib/contracts/migrations/Migratable.sol"; import "./DetailedERC20.sol"; import "./MintableToken.sol"; diff --git a/contracts/token/ERC20/MintableToken.sol b/contracts/token/ERC20/MintableToken.sol index 84cb75817..58d846d73 100644 --- a/contracts/token/ERC20/MintableToken.sol +++ b/contracts/token/ERC20/MintableToken.sol @@ -2,7 +2,7 @@ pragma solidity ^0.4.21; import "./StandardToken.sol"; import "../../ownership/Ownable.sol"; -import "../../zos-lib/migrations/Migratable.sol"; +import "zos-lib/contracts/migrations/Migratable.sol"; /** diff --git a/contracts/token/ERC20/TokenTimelock.sol b/contracts/token/ERC20/TokenTimelock.sol index 8c3f65d08..a790e2d10 100644 --- a/contracts/token/ERC20/TokenTimelock.sol +++ b/contracts/token/ERC20/TokenTimelock.sol @@ -1,7 +1,7 @@ pragma solidity ^0.4.21; import "./SafeERC20.sol"; -import "../../zos-lib/migrations/Migratable.sol"; +import "zos-lib/contracts/migrations/Migratable.sol"; /** diff --git a/contracts/token/ERC20/TokenVesting.sol b/contracts/token/ERC20/TokenVesting.sol index f2105ec1a..c1c08bfd8 100644 --- a/contracts/token/ERC20/TokenVesting.sol +++ b/contracts/token/ERC20/TokenVesting.sol @@ -6,7 +6,7 @@ import "./ERC20Basic.sol"; import "./SafeERC20.sol"; import "../../ownership/Ownable.sol"; import "../../math/SafeMath.sol"; -import "../../zos-lib/migrations/Migratable.sol"; +import "zos-lib/contracts/migrations/Migratable.sol"; /** diff --git a/contracts/token/ERC721/ERC721Token.sol b/contracts/token/ERC721/ERC721Token.sol index 324a82d3a..fa704bca2 100644 --- a/contracts/token/ERC721/ERC721Token.sol +++ b/contracts/token/ERC721/ERC721Token.sol @@ -2,7 +2,7 @@ pragma solidity ^0.4.21; import "./ERC721.sol"; import "./ERC721BasicToken.sol"; -import "../../zos-lib/migrations/Migratable.sol"; +import "zos-lib/contracts/migrations/Migratable.sol"; /** diff --git a/contracts/zos-lib/migrations/Migratable.sol b/contracts/zos-lib/migrations/Migratable.sol deleted file mode 120000 index 7d53eda1a..000000000 --- a/contracts/zos-lib/migrations/Migratable.sol +++ /dev/null @@ -1 +0,0 @@ -../../../node_modules/zos-lib/contracts/migrations/Migratable.sol \ No newline at end of file