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

Removed Initializable from mocks, removed explicit inheritances in the crowdsale mocks.

Browse Source
This commit is contained in:
Nicolás Venturo
2018-10-04 13:43:48 -03:00
parent dd750bc094
commit 143ccf7a74
41 changed files with 44 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
contracts/mocks/AllowanceCrowdsaleImpl.sol
View File

@ -1,11 +1,10 @@
pragma solidity ^0.4.24;
import "../Initializable.sol";
import "../token/ERC20/IERC20.sol";
import "../crowdsale/emission/AllowanceCrowdsale.sol";
contract AllowanceCrowdsaleImpl is Initializable, Crowdsale, AllowanceCrowdsale {
contract AllowanceCrowdsaleImpl is AllowanceCrowdsale {
constructor (
uint256 rate,

5
contracts/mocks/BreakInvariantBountyMock.sol
View File

@ -4,10 +4,9 @@ pragma solidity ^0.4.24;
// See: https://github.com/ethereum/solidity/issues/4871
// solium-disable-next-line max-len
import {BreakInvariantBounty, Target} from "../drafts/BreakInvariantBounty.sol";
import "../Initializable.sol";
contract TargetMock is Initializable, Target {
contract TargetMock is Target {
bool private exploited;
function exploitVulnerability() public {
@ -23,7 +22,7 @@ contract TargetMock is Initializable, Target {
}
}
contract BreakInvariantBountyMock is Initializable, BreakInvariantBounty {
contract BreakInvariantBountyMock is BreakInvariantBounty {
constructor() public {
BreakInvariantBounty.initialize();
}

3
contracts/mocks/CappedCrowdsaleImpl.sol
View File

@ -1,11 +1,10 @@
pragma solidity ^0.4.24;
import "../Initializable.sol";
import "../token/ERC20/IERC20.sol";
import "../crowdsale/validation/CappedCrowdsale.sol";
contract CappedCrowdsaleImpl is Initializable, Crowdsale, CappedCrowdsale {
contract CappedCrowdsaleImpl is CappedCrowdsale {
constructor (
uint256 rate,

3
contracts/mocks/CapperRoleMock.sol
View File

@ -1,10 +1,9 @@
pragma solidity ^0.4.24;
import "../Initializable.sol";
import "../access/roles/CapperRole.sol";
contract CapperRoleMock is Initializable, CapperRole {
contract CapperRoleMock is CapperRole {
constructor() public {
CapperRole.initialize();
}

4
contracts/mocks/ConditionalEscrowMock.sol
View File

@ -1,12 +1,10 @@
pragma solidity ^0.4.24;
import "../Initializable.sol";
import "../payment/ConditionalEscrow.sol";
// mock class using ConditionalEscrow
contract ConditionalEscrowMock is Initializable, ConditionalEscrow {
contract ConditionalEscrowMock is ConditionalEscrow {
mapping(address => bool) private _allowed;
constructor() public {

3
contracts/mocks/CrowdsaleMock.sol
View File

@ -1,10 +1,9 @@
pragma solidity ^0.4.24;
import "../Initializable.sol";
import "../crowdsale/Crowdsale.sol";
contract CrowdsaleMock is Initializable, Crowdsale {
contract CrowdsaleMock is Crowdsale {
constructor(uint256 rate, address wallet, IERC20 token) public {
Crowdsale.initialize(rate, wallet, token);
}

3
contracts/mocks/DetailedERC20Mock.sol
View File

@ -1,11 +1,10 @@
pragma solidity ^0.4.24;
import "../Initializable.sol";
import "../token/ERC20/ERC20.sol";
import "../token/ERC20/ERC20Detailed.sol";
contract ERC20DetailedMock is Initializable, ERC20, ERC20Detailed {
contract ERC20DetailedMock is ERC20, ERC20Detailed {
constructor(
string name,
string symbol,

1
contracts/mocks/ECDSAMock.sol
View File

@ -1,6 +1,5 @@
pragma solidity ^0.4.24;
import "../cryptography/ECDSA.sol";

3
contracts/mocks/ERC20BurnableMock.sol
View File

@ -1,10 +1,9 @@
pragma solidity ^0.4.24;
import "../Initializable.sol";
import "../token/ERC20/ERC20Burnable.sol";
contract ERC20BurnableMock is Initializable, ERC20Burnable {
contract ERC20BurnableMock is ERC20Burnable {
constructor(address initialAccount, uint256 initialBalance) public {
_mint(initialAccount, initialBalance);

3
contracts/mocks/ERC20CappedMock.sol
View File

@ -1,11 +1,10 @@
pragma solidity ^0.4.24;
import "../Initializable.sol";
import "../token/ERC20/ERC20Capped.sol";
import "./MinterRoleMock.sol";
contract ERC20CappedMock is Initializable, ERC20Capped, MinterRoleMock {
contract ERC20CappedMock is ERC20Capped, MinterRoleMock {
constructor(uint256 cap) public {
ERC20Capped.initialize(cap);

3
contracts/mocks/ERC20MigratorMock.sol
View File

@ -1,10 +1,9 @@
pragma solidity ^0.4.24;
import "../Initializable.sol";
import "../drafts/ERC20Migrator.sol";
contract ERC20MigratorMock is Initializable, ERC20Migrator {
contract ERC20MigratorMock is ERC20Migrator {
constructor(IERC20 legacyToken) public {
ERC20Migrator.initialize(legacyToken);

3
contracts/mocks/ERC20MintableMock.sol
View File

@ -1,11 +1,10 @@
pragma solidity ^0.4.24;
import "../Initializable.sol";
import "../token/ERC20/ERC20Mintable.sol";
import "./MinterRoleMock.sol";
contract ERC20MintableMock is Initializable, ERC20Mintable, MinterRoleMock {
contract ERC20MintableMock is ERC20Mintable, MinterRoleMock {
constructor() public {
ERC20Mintable.initialize();

3
contracts/mocks/ERC20Mock.sol
View File

@ -1,11 +1,10 @@
pragma solidity ^0.4.24;
import "../Initializable.sol";
import "../token/ERC20/ERC20.sol";
// mock class using ERC20
contract ERC20Mock is Initializable, ERC20 {
contract ERC20Mock is ERC20 {
constructor(address initialAccount, uint256 initialBalance) public {
_mint(initialAccount, initialBalance);

3
contracts/mocks/ERC20PausableMock.sol
View File

@ -1,12 +1,11 @@
pragma solidity ^0.4.24;
import "../Initializable.sol";
import "../token/ERC20/ERC20Pausable.sol";
import "./PauserRoleMock.sol";
// mock class using ERC20Pausable
contract ERC20PausableMock is Initializable, ERC20Pausable, PauserRoleMock {
contract ERC20PausableMock is ERC20Pausable, PauserRoleMock {
constructor(address initialAccount, uint initialBalance) public {
ERC20Pausable.initialize();

3
contracts/mocks/ERC20WithMetadataMock.sol
View File

@ -1,11 +1,10 @@
pragma solidity ^0.4.24;
import "../Initializable.sol";
import "../token/ERC20/ERC20.sol";
import "../drafts/ERC1046/TokenMetadata.sol";
contract ERC20WithMetadataMock is Initializable, ERC20, ERC20WithMetadata {
contract ERC20WithMetadataMock is ERC20, ERC20WithMetadata {
constructor(string tokenURI) public {
ERC20WithMetadata.initialize(tokenURI);
}

4
contracts/mocks/ERC721FullMock.sol
View File

@ -1,6 +1,5 @@
pragma solidity ^0.4.24;
import "../Initializable.sol";
import "../token/ERC721/ERC721Full.sol";
import "../token/ERC721/ERC721Mintable.sol";
import "../token/ERC721/ERC721MetadataMintable.sol";
@ -12,11 +11,12 @@ import "../token/ERC721/ERC721Burnable.sol";
* This mock just provides a public mint and burn functions for testing purposes,
* and a public setter for metadata URI
*/
contract ERC721FullMock is Initializable, ERC721Full, ERC721Mintable, ERC721MetadataMintable, ERC721Burnable {
contract ERC721FullMock is ERC721Full, ERC721Mintable, ERC721MetadataMintable, ERC721Burnable {
constructor(string name, string symbol) public
{
ERC721Full.initialize(name, symbol);
ERC721Mintable.initialize();
ERC721Burnable.initialize();
}
function exists(uint256 tokenId) public view returns (bool) {

4
contracts/mocks/ERC721MintableBurnableImpl.sol
View File

@ -1,6 +1,5 @@
pragma solidity ^0.4.24;
import "../Initializable.sol";
import "../token/ERC721/ERC721Full.sol";
import "../token/ERC721/ERC721Mintable.sol";
import "../token/ERC721/ERC721MetadataMintable.sol";
@ -11,13 +10,14 @@ import "../token/ERC721/ERC721Burnable.sol";
* @title ERC721MintableBurnableImpl
*/
contract ERC721MintableBurnableImpl
is Initializable, ERC721Full, ERC721Mintable, ERC721MetadataMintable, ERC721Burnable {
is ERC721Full, ERC721Mintable, ERC721MetadataMintable, ERC721Burnable {
constructor()
public
{
ERC721Full.initialize("Test", "TEST");
ERC721Mintable.initialize();
ERC721MetadataMintable.initialize();
ERC721Burnable.initialize();
}
}

3
contracts/mocks/ERC721Mock.sol
View File

@ -1,6 +1,5 @@
pragma solidity ^0.4.24;
import "../Initializable.sol";
import "../token/ERC721/ERC721.sol";
@ -8,7 +7,7 @@ import "../token/ERC721/ERC721.sol";
* @title ERC721Mock
* This mock just provides a public mint and burn functions for testing purposes
*/
contract ERC721Mock is Initializable, ERC721 {
contract ERC721Mock is ERC721 {
constructor() public {
ERC721.initialize();
}

3
contracts/mocks/ERC721PausableMock.sol
View File

@ -1,6 +1,5 @@
pragma solidity ^0.4.24;
import "../Initializable.sol";
import "../token/ERC721/ERC721Pausable.sol";
import "./PauserRoleMock.sol";
@ -9,7 +8,7 @@ import "./PauserRoleMock.sol";
* @title ERC721PausableMock
* This mock just provides a public mint, burn and exists functions for testing purposes
*/
contract ERC721PausableMock is Initializable, ERC721Pausable, PauserRoleMock {
contract ERC721PausableMock is ERC721Pausable, PauserRoleMock {
constructor() {
ERC721Pausable.initialize();
}

3
contracts/mocks/EscrowMock.sol
View File

@ -1,9 +1,8 @@
pragma solidity ^0.4.24;
import "../Initializable.sol";
import "../payment/Escrow.sol";
contract EscrowMock is Initializable, Escrow {
contract EscrowMock is Escrow {
constructor() public {
Escrow.initialize();
}

3
contracts/mocks/FinalizableCrowdsaleImpl.sol
View File

@ -1,11 +1,10 @@
pragma solidity ^0.4.24;
import "../Initializable.sol";
import "../token/ERC20/IERC20.sol";
import "../crowdsale/distribution/FinalizableCrowdsale.sol";
contract FinalizableCrowdsaleImpl is Initializable, Crowdsale, TimedCrowdsale, FinalizableCrowdsale {
contract FinalizableCrowdsaleImpl is FinalizableCrowdsale {
constructor (
uint256 openingTime,

3
contracts/mocks/IncreasingPriceCrowdsaleImpl.sol
View File

@ -1,11 +1,10 @@
pragma solidity ^0.4.24;
import "../Initializable.sol";
import "../crowdsale/price/IncreasingPriceCrowdsale.sol";
import "../math/SafeMath.sol";
contract IncreasingPriceCrowdsaleImpl is Initializable, IncreasingPriceCrowdsale {
contract IncreasingPriceCrowdsaleImpl is IncreasingPriceCrowdsale {
constructor (
uint256 openingTime,

3
contracts/mocks/IndividuallyCappedCrowdsaleImpl.sol
View File

@ -1,13 +1,12 @@
pragma solidity ^0.4.24;
import "../Initializable.sol";
import "../token/ERC20/IERC20.sol";
import "../crowdsale/validation/IndividuallyCappedCrowdsale.sol";
import "./CapperRoleMock.sol";
contract IndividuallyCappedCrowdsaleImpl
is Initializable, Crowdsale, IndividuallyCappedCrowdsale, CapperRoleMock {
is Crowdsale, IndividuallyCappedCrowdsale, CapperRoleMock {
constructor(
uint256 rate,

3
contracts/mocks/MintedCrowdsaleImpl.sol
View File

@ -1,11 +1,10 @@
pragma solidity ^0.4.24;
import "../Initializable.sol";
import "../token/ERC20/ERC20Mintable.sol";
import "../crowdsale/emission/MintedCrowdsale.sol";
contract MintedCrowdsaleImpl is Initializable, MintedCrowdsale {
contract MintedCrowdsaleImpl is MintedCrowdsale {
constructor (
uint256 rate,

3
contracts/mocks/MinterRoleMock.sol
View File

@ -1,10 +1,9 @@
pragma solidity ^0.4.24;
import "../Initializable.sol";
import "../access/roles/MinterRole.sol";
contract MinterRoleMock is Initializable, MinterRole {
contract MinterRoleMock is MinterRole {
constructor() public {
MinterRole.initialize();
}

4
contracts/mocks/PausableMock.sol
View File

@ -1,13 +1,11 @@
pragma solidity ^0.4.24;
import "../Initializable.sol";
import "../lifecycle/Pausable.sol";
import "./PauserRoleMock.sol";
// mock class using Pausable
contract PausableMock is Initializable, Pausable, PauserRoleMock {
contract PausableMock is Pausable, PauserRoleMock {
bool public drasticMeasureTaken;
uint256 public count;

3
contracts/mocks/PauserRoleMock.sol
View File

@ -1,10 +1,9 @@
pragma solidity ^0.4.24;
import "../Initializable.sol";
import "../access/roles/PauserRole.sol";
contract PauserRoleMock is Initializable, PauserRole {
contract PauserRoleMock is PauserRole {
constructor() public {
PauserRole.initialize();
}

3
contracts/mocks/PostDeliveryCrowdsaleImpl.sol
View File

@ -1,11 +1,10 @@
pragma solidity ^0.4.24;
import "../Initializable.sol";
import "../token/ERC20/IERC20.sol";
import "../crowdsale/distribution/PostDeliveryCrowdsale.sol";
contract PostDeliveryCrowdsaleImpl is Initializable, Crowdsale, TimedCrowdsale, PostDeliveryCrowdsale {
contract PostDeliveryCrowdsaleImpl is PostDeliveryCrowdsale {
constructor (
uint256 openingTime,

3
contracts/mocks/PullPaymentMock.sol
View File

@ -1,12 +1,11 @@
pragma solidity ^0.4.24;
import "../Initializable.sol";
import "../payment/PullPayment.sol";
// mock class using PullPayment
contract PullPaymentMock is Initializable, PullPayment {
contract PullPaymentMock is PullPayment {
constructor() public payable {
PullPayment.initialize();

3
contracts/mocks/ReentrancyMock.sol
View File

@ -1,11 +1,10 @@
pragma solidity ^0.4.24;
import "../Initializable.sol";
import "../utils/ReentrancyGuard.sol";
import "./ReentrancyAttack.sol";
contract ReentrancyMock is Initializable, ReentrancyGuard {
contract ReentrancyMock is ReentrancyGuard {
uint256 public counter;

3
contracts/mocks/RefundEscrowMock.sol
View File

@ -1,9 +1,8 @@
pragma solidity ^0.4.24;
import "../Initializable.sol";
import "../payment/RefundEscrow.sol";
contract RefundEscrowMock is Initializable, RefundEscrow {
contract RefundEscrowMock is RefundEscrow {
constructor(address beneficiary) public {
RefundEscrow.initialize(beneficiary);
}

3
contracts/mocks/RefundableCrowdsaleImpl.sol
View File

@ -1,11 +1,10 @@
pragma solidity ^0.4.24;
import "../Initializable.sol";
import "../token/ERC20/ERC20Mintable.sol";
import "../crowdsale/distribution/RefundableCrowdsale.sol";
contract RefundableCrowdsaleImpl is Initializable, Crowdsale, TimedCrowdsale, RefundableCrowdsale {
contract RefundableCrowdsaleImpl is Crowdsale, TimedCrowdsale, RefundableCrowdsale {
constructor (
uint256 openingTime,

5
contracts/mocks/SampleCrowdsaleMock.sol
View File

@ -1,16 +1,15 @@
pragma solidity ^0.4.24;
import "../Initializable.sol";
import "../examples/SampleCrowdsale.sol";
contract SampleCrowdsaleTokenMock is Initializable, SampleCrowdsaleToken {
contract SampleCrowdsaleTokenMock is SampleCrowdsaleToken {
constructor() public {
SampleCrowdsaleToken.initialize();
}
}
contract SampleCrowdsaleMock is Initializable, SampleCrowdsale {
contract SampleCrowdsaleMock is SampleCrowdsale {
constructor(
uint256 openingTime,
uint256 closingTime,

3
contracts/mocks/SecondaryMock.sol
View File

@ -1,10 +1,9 @@
pragma solidity ^0.4.24;
import "../Initializable.sol";
import "../ownership/Secondary.sol";
contract SecondaryMock is Initializable, Secondary {
contract SecondaryMock is Secondary {
constructor() public {
Secondary.initialize();
}

3
contracts/mocks/SignatureBouncerMock.sol
View File

@ -1,11 +1,10 @@
pragma solidity ^0.4.24;
import "../Initializable.sol";
import "../drafts/SignatureBouncer.sol";
import "./SignerRoleMock.sol";
contract SignatureBouncerMock is Initializable, SignatureBouncer, SignerRoleMock {
contract SignatureBouncerMock is SignatureBouncer, SignerRoleMock {
constructor() public {
SignatureBouncer.initialize();
}

3
contracts/mocks/SignerRoleMock.sol
View File

@ -1,10 +1,9 @@
pragma solidity ^0.4.24;
import "../Initializable.sol";
import "../access/roles/SignerRole.sol";
contract SignerRoleMock is Initializable, SignerRole {
contract SignerRoleMock is SignerRole {
constructor() public {
SignerRole.initialize();
}

3
contracts/mocks/SimpleTokenMock.sol
View File

@ -1,9 +1,8 @@
pragma solidity ^0.4.24;
import "../Initializable.sol";
import "../examples/SimpleToken.sol";
contract SimpleTokenMock is Initializable, SimpleToken {
contract SimpleTokenMock is SimpleToken {
constructor() public {
SimpleToken.initialize();
}

3
contracts/mocks/SplitPaymentMock.sol
View File

@ -1,9 +1,8 @@
pragma solidity ^0.4.24;
import "../Initializable.sol";
import "../payment/SplitPayment.sol";
contract SplitPaymentMock is Initializable, SplitPayment {
contract SplitPaymentMock is SplitPayment {
constructor(address[] payees, uint256[] shares) public {
SplitPayment.initialize(payees, shares);
}

3
contracts/mocks/TimedCrowdsaleImpl.sol
View File

@ -1,11 +1,10 @@
pragma solidity ^0.4.24;
import "../Initializable.sol";
import "../token/ERC20/IERC20.sol";
import "../crowdsale/validation/TimedCrowdsale.sol";
contract TimedCrowdsaleImpl is Initializable, Crowdsale, TimedCrowdsale {
contract TimedCrowdsaleImpl is TimedCrowdsale {
constructor (
uint256 openingTime,

3
contracts/mocks/TokenTimelockMock.sol
View File

@ -1,9 +1,8 @@
pragma solidity ^0.4.24;
import "../Initializable.sol";
import "../token/ERC20/TokenTimelock.sol";
contract TokenTimelockMock is Initializable, TokenTimelock {
contract TokenTimelockMock is TokenTimelock {
constructor(
IERC20 token,
address beneficiary,

3
contracts/mocks/TokenVestingMock.sol
View File

@ -1,9 +1,8 @@
pragma solidity ^0.4.24;
import "../Initializable.sol";
import "../drafts/TokenVesting.sol";
contract TokenVestingMock is Initializable, TokenVesting {
contract TokenVestingMock is TokenVesting {
constructor(
address beneficiary,
uint256 start,