From 371fe3e567e0ec894caa8d5f14ad590b18c5ae86 Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Sun, 12 Aug 2018 13:22:32 -0300 Subject: [PATCH] simplify mocks --- contracts/mocks/BurnableTokenMock.sol | 12 ++++++------ contracts/mocks/ERC223TokenMock.sol | 10 ++++++---- contracts/mocks/PausableTokenMock.sol | 10 ++++++---- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/contracts/mocks/BurnableTokenMock.sol b/contracts/mocks/BurnableTokenMock.sol index a148f17f4..8f6832f7f 100644 --- a/contracts/mocks/BurnableTokenMock.sol +++ b/contracts/mocks/BurnableTokenMock.sol @@ -1,12 +1,12 @@ pragma solidity ^0.4.24; +import "./StandardTokenMock.sol"; import "../token/ERC20/BurnableToken.sol"; -contract BurnableTokenMock is BurnableToken { - - constructor(address _initialAccount, uint256 _initialBalance) public { - _mint(_initialAccount, _initialBalance); - } - +contract BurnableTokenMock is StandardTokenMock, BurnableToken { + constructor(address _initialAccount, uint256 _initialBalance) + StandardTokenMock(_initialAccount, _initialBalance) + public + { } } diff --git a/contracts/mocks/ERC223TokenMock.sol b/contracts/mocks/ERC223TokenMock.sol index 2f92bc5f1..47cf164de 100644 --- a/contracts/mocks/ERC223TokenMock.sol +++ b/contracts/mocks/ERC223TokenMock.sol @@ -1,5 +1,6 @@ pragma solidity ^0.4.24; +import "./StandardTokenMock.sol"; import "../token/ERC20/StandardToken.sol"; @@ -8,11 +9,12 @@ contract ERC223ContractInterface { } -contract ERC223TokenMock is StandardToken { +contract ERC223TokenMock is StandardTokenMock { - constructor(address _initialAccount, uint256 _initialBalance) public { - _mint(_initialAccount, _initialBalance); - } + constructor(address _initialAccount, uint256 _initialBalance) + StandardTokenMock(_initialAccount, _initialBalance) + public + { } // ERC223 compatible transfer function (except the name) function transferERC223(address _to, uint256 _value, bytes _data) public diff --git a/contracts/mocks/PausableTokenMock.sol b/contracts/mocks/PausableTokenMock.sol index 24ef281ba..e8ec8ccff 100644 --- a/contracts/mocks/PausableTokenMock.sol +++ b/contracts/mocks/PausableTokenMock.sol @@ -1,13 +1,15 @@ pragma solidity ^0.4.24; +import "./StandardTokenMock.sol"; import "../token/ERC20/PausableToken.sol"; // mock class using PausableToken -contract PausableTokenMock is PausableToken { +contract PausableTokenMock is StandardTokenMock, PausableToken { - constructor(address _initialAccount, uint _initialBalance) public { - _mint(_initialAccount, _initialBalance); - } + constructor(address _initialAccount, uint256 _initialBalance) + StandardTokenMock(_initialAccount, _initialBalance) + public + { } }