NoBey/openzeppelin-contracts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "add workaround because truffle doesn't support transitive dependencies"

Browse Source 
This reverts commit 48a7cd4e60.
This commit is contained in:
Francisco Giordano
2018-05-22 16:07:27 -03:00
parent b732b6417e
commit 31ec824aef
12 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contracts/access/SignatureBouncer.sol
View File

@ -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

2
contracts/ownership/Ownable.sol
View File

@ -1,6 +1,6 @@
pragma solidity ^0.4.21;
import "../zos-lib/migrations/Migratable.sol";
import "zos-lib/contracts/migrations/Migratable.sol";
/**

3
contracts/ownership/rbac/RBACWithAdmin.sol
View File

@ -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

2
contracts/payment/SplitPayment.sol
View File

@ -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";
/**

2
contracts/token/ERC20/DetailedERC20.sol
View File

@ -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 {

2
contracts/token/ERC20/DetailedMintableToken.sol
View File

@ -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";

2
contracts/token/ERC20/DetailedPremintedToken.sol
View File

@ -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";

2
contracts/token/ERC20/MintableToken.sol
View File

@ -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";
/**

2
contracts/token/ERC20/TokenTimelock.sol
View File

@ -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";
/**

2
contracts/token/ERC20/TokenVesting.sol
View File

@ -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";
/**

2
contracts/token/ERC721/ERC721Token.sol
View File

@ -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";
/**

1
contracts/zos-lib/migrations/Migratable.sol
View File

@ -1 +0,0 @@
../../../node_modules/zos-lib/contracts/migrations/Migratable.sol