diff --git a/test/BasicToken.test.js b/test/BasicToken.test.js index 91d755257..093bcbfbf 100644 --- a/test/BasicToken.test.js +++ b/test/BasicToken.test.js @@ -1,6 +1,6 @@ const assertRevert = require('./helpers/assertRevert'); -var BasicTokenMock = artifacts.require('./helpers/BasicTokenMock.sol'); +var BasicTokenMock = artifacts.require('./mocks/BasicTokenMock.sol'); contract('BasicToken', function (accounts) { it('should return the correct totalSupply after construction', async function () { diff --git a/test/Bounty.test.js b/test/Bounty.test.js index 4e67db7a0..4ea34714f 100644 --- a/test/Bounty.test.js +++ b/test/Bounty.test.js @@ -6,8 +6,8 @@ let sendReward = function (sender, receiver, value) { value: value, }); }; -var SecureTargetBounty = artifacts.require('helpers/SecureTargetBounty.sol'); -var InsecureTargetBounty = artifacts.require('helpers/InsecureTargetBounty.sol'); +var SecureTargetBounty = artifacts.require('mocks/SecureTargetBounty.sol'); +var InsecureTargetBounty = artifacts.require('mocks/InsecureTargetBounty.sol'); function awaitEvent (event, handler) { return new Promise((resolve, reject) => { diff --git a/test/BurnableToken.test.js b/test/BurnableToken.test.js index 6658b2453..51eee0d78 100644 --- a/test/BurnableToken.test.js +++ b/test/BurnableToken.test.js @@ -1,6 +1,6 @@ const EVMRevert = require('./helpers/EVMRevert.js'); -const BurnableTokenMock = artifacts.require('./helpers/BurnableTokenMock.sol'); +const BurnableTokenMock = artifacts.require('./mocks/BurnableTokenMock.sol'); const BigNumber = web3.BigNumber; require('chai') diff --git a/test/CanReclaimToken.test.js b/test/CanReclaimToken.test.js index a6f4055ad..638717f86 100644 --- a/test/CanReclaimToken.test.js +++ b/test/CanReclaimToken.test.js @@ -2,7 +2,7 @@ import expectThrow from './helpers/expectThrow'; import toPromise from './helpers/toPromise'; const CanReclaimToken = artifacts.require('../contracts/ownership/CanReclaimToken.sol'); -const BasicTokenMock = artifacts.require('./helpers/BasicTokenMock.sol'); +const BasicTokenMock = artifacts.require('./mocks/BasicTokenMock.sol'); contract('CanReclaimToken', function (accounts) { let token = null; diff --git a/test/CappedCrowdsale.test.js b/test/CappedCrowdsale.test.js index dbbff6e79..c747fa217 100644 --- a/test/CappedCrowdsale.test.js +++ b/test/CappedCrowdsale.test.js @@ -11,7 +11,7 @@ require('chai') .use(require('chai-bignumber')(BigNumber)) .should(); -const CappedCrowdsale = artifacts.require('./helpers/CappedCrowdsaleImpl.sol'); +const CappedCrowdsale = artifacts.require('./mocks/CappedCrowdsaleImpl.sol'); const MintableToken = artifacts.require('MintableToken'); contract('CappedCrowdsale', function ([_, wallet]) { diff --git a/test/DayLimit.test.js b/test/DayLimit.test.js index 9b14409d9..ab712d354 100644 --- a/test/DayLimit.test.js +++ b/test/DayLimit.test.js @@ -3,7 +3,7 @@ const assertRevert = require('./helpers/assertRevert'); import latestTime from './helpers/latestTime'; import { increaseTimeTo, duration } from './helpers/increaseTime'; -var DayLimitMock = artifacts.require('./helpers/DayLimitMock.sol'); +var DayLimitMock = artifacts.require('./mocks/DayLimitMock.sol'); contract('DayLimit', function (accounts) { let dayLimit; diff --git a/test/DetailedERC20.test.js b/test/DetailedERC20.test.js index 0510f023e..907129e61 100644 --- a/test/DetailedERC20.test.js +++ b/test/DetailedERC20.test.js @@ -5,7 +5,7 @@ require('chai') .use(require('chai-bignumber')(BigNumber)) .should(); -const DetailedERC20Mock = artifacts.require('./helpers/DetailedERC20Mock.sol'); +const DetailedERC20Mock = artifacts.require('./mocks/DetailedERC20Mock.sol'); contract('DetailedERC20', accounts => { let detailedERC20 = null; diff --git a/test/FinalizableCrowdsale.test.js b/test/FinalizableCrowdsale.test.js index b07313d86..8e9d66241 100644 --- a/test/FinalizableCrowdsale.test.js +++ b/test/FinalizableCrowdsale.test.js @@ -10,7 +10,7 @@ const should = require('chai') .use(require('chai-bignumber')(BigNumber)) .should(); -const FinalizableCrowdsale = artifacts.require('./helpers/FinalizableCrowdsaleImpl.sol'); +const FinalizableCrowdsale = artifacts.require('./mocks/FinalizableCrowdsaleImpl.sol'); const MintableToken = artifacts.require('MintableToken'); contract('FinalizableCrowdsale', function ([_, owner, wallet, thirdparty]) { diff --git a/test/HasNoEther.test.js b/test/HasNoEther.test.js index 5b77a82f5..9e37ea351 100644 --- a/test/HasNoEther.test.js +++ b/test/HasNoEther.test.js @@ -2,8 +2,8 @@ import expectThrow from './helpers/expectThrow'; import toPromise from './helpers/toPromise'; const HasNoEther = artifacts.require('../contracts/lifecycle/HasNoEther.sol'); -const HasNoEtherTest = artifacts.require('../helpers/HasNoEtherTest.sol'); -const ForceEther = artifacts.require('../helpers/ForceEther.sol'); +const HasNoEtherTest = artifacts.require('../mocks/HasNoEtherTest.sol'); +const ForceEther = artifacts.require('../mocks/ForceEther.sol'); contract('HasNoEther', function (accounts) { const amount = web3.toWei('1', 'ether'); diff --git a/test/HasNoTokens.test.js b/test/HasNoTokens.test.js index 6f6ee0e71..a235fd11a 100644 --- a/test/HasNoTokens.test.js +++ b/test/HasNoTokens.test.js @@ -2,7 +2,7 @@ import expectThrow from './helpers/expectThrow'; import toPromise from './helpers/toPromise'; const HasNoTokens = artifacts.require('../contracts/lifecycle/HasNoTokens.sol'); -const ERC23TokenMock = artifacts.require('./helpers/ERC23TokenMock.sol'); +const ERC23TokenMock = artifacts.require('./mocks/ERC23TokenMock.sol'); contract('HasNoTokens', function (accounts) { let hasNoTokens = null; diff --git a/test/LimitBalance.test.js b/test/LimitBalance.test.js index 0a0edff99..bebab9f98 100644 --- a/test/LimitBalance.test.js +++ b/test/LimitBalance.test.js @@ -1,5 +1,5 @@ -var LimitBalanceMock = artifacts.require('helpers/LimitBalanceMock.sol'); +var LimitBalanceMock = artifacts.require('mocks/LimitBalanceMock.sol'); const assertRevert = require('./helpers/assertRevert'); contract('LimitBalance', function (accounts) { diff --git a/test/Pausable.test.js b/test/Pausable.test.js index e10e7c9e8..d061a8fe2 100644 --- a/test/Pausable.test.js +++ b/test/Pausable.test.js @@ -1,6 +1,6 @@ const assertRevert = require('./helpers/assertRevert'); -const PausableMock = artifacts.require('helpers/PausableMock.sol'); +const PausableMock = artifacts.require('mocks/PausableMock.sol'); contract('Pausable', function (accounts) { it('can perform normal process in non-pause', async function () { diff --git a/test/PausableToken.test.js b/test/PausableToken.test.js index 8da1c926b..dc9cb826f 100644 --- a/test/PausableToken.test.js +++ b/test/PausableToken.test.js @@ -1,7 +1,7 @@ 'user strict'; const assertRevert = require('./helpers/assertRevert'); -var PausableTokenMock = artifacts.require('./helpers/PausableTokenMock.sol'); +var PausableTokenMock = artifacts.require('./mocks/PausableTokenMock.sol'); contract('PausableToken', function (accounts) { let token; diff --git a/test/PullPayment.test.js b/test/PullPayment.test.js index aa002f42c..3840bce64 100644 --- a/test/PullPayment.test.js +++ b/test/PullPayment.test.js @@ -1,4 +1,4 @@ -var PullPaymentMock = artifacts.require('./helpers/PullPaymentMock.sol'); +var PullPaymentMock = artifacts.require('./mocks/PullPaymentMock.sol'); contract('PullPayment', function (accounts) { let ppce; diff --git a/test/RefundableCrowdsale.test.js b/test/RefundableCrowdsale.test.js index d34f1d945..ad2879913 100644 --- a/test/RefundableCrowdsale.test.js +++ b/test/RefundableCrowdsale.test.js @@ -11,7 +11,7 @@ require('chai') .use(require('chai-bignumber')(BigNumber)) .should(); -const RefundableCrowdsale = artifacts.require('./helpers/RefundableCrowdsaleImpl.sol'); +const RefundableCrowdsale = artifacts.require('./mocks/RefundableCrowdsaleImpl.sol'); contract('RefundableCrowdsale', function ([_, owner, wallet, investor]) { const rate = new BigNumber(1000); diff --git a/test/SafeERC20.test.js b/test/SafeERC20.test.js index 38d98099e..9b93521d0 100644 --- a/test/SafeERC20.test.js +++ b/test/SafeERC20.test.js @@ -4,7 +4,7 @@ require('chai') .use(require('chai-as-promised')) .should(); -const SafeERC20Helper = artifacts.require('./helpers/SafeERC20Helper.sol'); +const SafeERC20Helper = artifacts.require('./mocks/SafeERC20Helper.sol'); contract('SafeERC20', function () { beforeEach(async function () { diff --git a/test/SafeMath.test.js b/test/SafeMath.test.js index 09450e4f5..1098b5795 100644 --- a/test/SafeMath.test.js +++ b/test/SafeMath.test.js @@ -1,6 +1,6 @@ const assertRevert = require('./helpers/assertRevert'); const assertJump = require('./helpers/assertJump'); -var SafeMathMock = artifacts.require('./helpers/SafeMathMock.sol'); +var SafeMathMock = artifacts.require('./mocks/SafeMathMock.sol'); contract('SafeMath', function (accounts) { let safeMath; diff --git a/test/StandardToken.test.js b/test/StandardToken.test.js index 48f9f3d50..34440b028 100644 --- a/test/StandardToken.test.js +++ b/test/StandardToken.test.js @@ -1,7 +1,7 @@ const assertRevert = require('./helpers/assertRevert'); const expectThrow = require('./helpers/expectThrow'); -var StandardTokenMock = artifacts.require('./helpers/StandardTokenMock.sol'); +var StandardTokenMock = artifacts.require('./mocks/StandardTokenMock.sol'); contract('StandardToken', function (accounts) { let token; diff --git a/test/TokenDestructible.test.js b/test/TokenDestructible.test.js index c534367ff..a5b5ae77c 100644 --- a/test/TokenDestructible.test.js +++ b/test/TokenDestructible.test.js @@ -1,6 +1,6 @@ var TokenDestructible = artifacts.require('../contracts/lifecycle/TokenDestructible.sol'); -var StandardTokenMock = artifacts.require('./helpers/StandardTokenMock.sol'); +var StandardTokenMock = artifacts.require('./mocks/StandardTokenMock.sol'); require('./helpers/transactionMined.js'); contract('TokenDestructible', function (accounts) { diff --git a/test/helpers/BasicTokenMock.sol b/test/mocks/BasicTokenMock.sol similarity index 100% rename from test/helpers/BasicTokenMock.sol rename to test/mocks/BasicTokenMock.sol diff --git a/test/helpers/BurnableTokenMock.sol b/test/mocks/BurnableTokenMock.sol similarity index 100% rename from test/helpers/BurnableTokenMock.sol rename to test/mocks/BurnableTokenMock.sol diff --git a/test/helpers/CappedCrowdsaleImpl.sol b/test/mocks/CappedCrowdsaleImpl.sol similarity index 100% rename from test/helpers/CappedCrowdsaleImpl.sol rename to test/mocks/CappedCrowdsaleImpl.sol diff --git a/test/helpers/DayLimitMock.sol b/test/mocks/DayLimitMock.sol similarity index 100% rename from test/helpers/DayLimitMock.sol rename to test/mocks/DayLimitMock.sol diff --git a/test/helpers/DetailedERC20Mock.sol b/test/mocks/DetailedERC20Mock.sol similarity index 100% rename from test/helpers/DetailedERC20Mock.sol rename to test/mocks/DetailedERC20Mock.sol diff --git a/test/helpers/ERC23TokenMock.sol b/test/mocks/ERC23TokenMock.sol similarity index 100% rename from test/helpers/ERC23TokenMock.sol rename to test/mocks/ERC23TokenMock.sol diff --git a/test/helpers/FinalizableCrowdsaleImpl.sol b/test/mocks/FinalizableCrowdsaleImpl.sol similarity index 100% rename from test/helpers/FinalizableCrowdsaleImpl.sol rename to test/mocks/FinalizableCrowdsaleImpl.sol diff --git a/test/helpers/ForceEther.sol b/test/mocks/ForceEther.sol similarity index 100% rename from test/helpers/ForceEther.sol rename to test/mocks/ForceEther.sol diff --git a/test/helpers/HasNoEtherTest.sol b/test/mocks/HasNoEtherTest.sol similarity index 100% rename from test/helpers/HasNoEtherTest.sol rename to test/mocks/HasNoEtherTest.sol diff --git a/test/helpers/InsecureTargetBounty.sol b/test/mocks/InsecureTargetBounty.sol similarity index 100% rename from test/helpers/InsecureTargetBounty.sol rename to test/mocks/InsecureTargetBounty.sol diff --git a/test/helpers/LimitBalanceMock.sol b/test/mocks/LimitBalanceMock.sol similarity index 100% rename from test/helpers/LimitBalanceMock.sol rename to test/mocks/LimitBalanceMock.sol diff --git a/test/helpers/PausableMock.sol b/test/mocks/PausableMock.sol similarity index 100% rename from test/helpers/PausableMock.sol rename to test/mocks/PausableMock.sol diff --git a/test/helpers/PausableTokenMock.sol b/test/mocks/PausableTokenMock.sol similarity index 100% rename from test/helpers/PausableTokenMock.sol rename to test/mocks/PausableTokenMock.sol diff --git a/test/helpers/PullPaymentMock.sol b/test/mocks/PullPaymentMock.sol similarity index 100% rename from test/helpers/PullPaymentMock.sol rename to test/mocks/PullPaymentMock.sol diff --git a/test/helpers/ReentrancyAttack.sol b/test/mocks/ReentrancyAttack.sol similarity index 100% rename from test/helpers/ReentrancyAttack.sol rename to test/mocks/ReentrancyAttack.sol diff --git a/test/helpers/ReentrancyMock.sol b/test/mocks/ReentrancyMock.sol similarity index 100% rename from test/helpers/ReentrancyMock.sol rename to test/mocks/ReentrancyMock.sol diff --git a/test/helpers/RefundableCrowdsaleImpl.sol b/test/mocks/RefundableCrowdsaleImpl.sol similarity index 100% rename from test/helpers/RefundableCrowdsaleImpl.sol rename to test/mocks/RefundableCrowdsaleImpl.sol diff --git a/test/helpers/SafeERC20Helper.sol b/test/mocks/SafeERC20Helper.sol similarity index 100% rename from test/helpers/SafeERC20Helper.sol rename to test/mocks/SafeERC20Helper.sol diff --git a/test/helpers/SafeMathMock.sol b/test/mocks/SafeMathMock.sol similarity index 100% rename from test/helpers/SafeMathMock.sol rename to test/mocks/SafeMathMock.sol diff --git a/test/helpers/SecureTargetBounty.sol b/test/mocks/SecureTargetBounty.sol similarity index 100% rename from test/helpers/SecureTargetBounty.sol rename to test/mocks/SecureTargetBounty.sol diff --git a/test/helpers/StandardTokenMock.sol b/test/mocks/StandardTokenMock.sol similarity index 100% rename from test/helpers/StandardTokenMock.sol rename to test/mocks/StandardTokenMock.sol