diff --git a/test/access/Roles.test.js b/test/access/Roles.test.js index 7d5573cec..76517492c 100644 --- a/test/access/Roles.test.js +++ b/test/access/Roles.test.js @@ -1,13 +1,11 @@ const { assertRevert } = require('../helpers/assertRevert'); - +const { ZERO_ADDRESS } = require('../helpers/constants'); const RolesMock = artifacts.require('RolesMock'); require('chai') .should(); contract('Roles', function ([_, authorized, otherAuthorized, anyone]) { - const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000'; - beforeEach(async function () { this.roles = await RolesMock.new(); }); diff --git a/test/access/roles/PublicRole.behavior.js b/test/access/roles/PublicRole.behavior.js index f1c723b78..a3067f88e 100644 --- a/test/access/roles/PublicRole.behavior.js +++ b/test/access/roles/PublicRole.behavior.js @@ -1,4 +1,5 @@ const { assertRevert } = require('../../helpers/assertRevert'); +const { ZERO_ADDRESS } = require('../../helpers/constants'); const expectEvent = require('../../helpers/expectEvent'); require('chai') @@ -10,7 +11,6 @@ function capitalize (str) { function shouldBehaveLikePublicRole (authorized, otherAuthorized, [anyone], rolename) { rolename = capitalize(rolename); - const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000'; describe('should behave like public role', function () { beforeEach('check preconditions', async function () { diff --git a/test/crowdsale/AllowanceCrowdsale.test.js b/test/crowdsale/AllowanceCrowdsale.test.js index ee6a063f2..82a5b6410 100644 --- a/test/crowdsale/AllowanceCrowdsale.test.js +++ b/test/crowdsale/AllowanceCrowdsale.test.js @@ -1,6 +1,7 @@ const { ether } = require('../helpers/ether'); const { assertRevert } = require('../helpers/assertRevert'); const { ethGetBalance } = require('../helpers/web3'); +const { ZERO_ADDRESS } = require('../helpers/constants'); const BigNumber = web3.BigNumber; @@ -16,7 +17,6 @@ contract('AllowanceCrowdsale', function ([_, investor, wallet, purchaser, tokenW const value = ether(0.42); const expectedTokenAmount = rate.mul(value); const tokenAllowance = new BigNumber('1e22'); - const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000'; beforeEach(async function () { this.token = await SimpleToken.new({ from: tokenWallet }); diff --git a/test/crowdsale/Crowdsale.test.js b/test/crowdsale/Crowdsale.test.js index 556855796..89fd53b2d 100644 --- a/test/crowdsale/Crowdsale.test.js +++ b/test/crowdsale/Crowdsale.test.js @@ -1,6 +1,7 @@ const { assertRevert } = require('../helpers/assertRevert'); const { ether } = require('../helpers/ether'); const { ethGetBalance } = require('../helpers/web3'); +const { ZERO_ADDRESS } = require('../helpers/constants'); const BigNumber = web3.BigNumber; @@ -16,7 +17,6 @@ contract('Crowdsale', function ([_, investor, wallet, purchaser]) { const value = ether(42); const tokenSupply = new BigNumber('1e22'); const expectedTokenAmount = rate.mul(value); - const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000'; it('requires a non-null token', async function () { await assertRevert( diff --git a/test/drafts/ERC20Migrator.test.js b/test/drafts/ERC20Migrator.test.js index 315a7ea78..608dce860 100644 --- a/test/drafts/ERC20Migrator.test.js +++ b/test/drafts/ERC20Migrator.test.js @@ -1,5 +1,5 @@ const { assertRevert } = require('../helpers/assertRevert'); - +const { ZERO_ADDRESS } = require('../helpers/constants'); const ERC20Mock = artifacts.require('ERC20Mock'); const ERC20Mintable = artifacts.require('ERC20Mintable'); const ERC20Migrator = artifacts.require('ERC20Migrator'); @@ -11,8 +11,6 @@ require('chai') .should(); contract('ERC20Migrator', function ([_, owner, recipient, anotherAccount]) { - const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000'; - const totalSupply = 200; it('reverts with a null legacy token address', async function () { diff --git a/test/examples/SimpleToken.test.js b/test/examples/SimpleToken.test.js index a28cf4641..49b8a7aa4 100644 --- a/test/examples/SimpleToken.test.js +++ b/test/examples/SimpleToken.test.js @@ -1,4 +1,5 @@ const { decodeLogs } = require('../helpers/decodeLogs'); +const { ZERO_ADDRESS } = require('../helpers/constants'); const SimpleToken = artifacts.require('SimpleToken'); const BigNumber = web3.BigNumber; @@ -10,8 +11,6 @@ require('chai') contract('SimpleToken', function ([_, creator]) { let token; - const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000'; - beforeEach(async function () { token = await SimpleToken.new({ from: creator }); }); diff --git a/test/helpers/constants.js b/test/helpers/constants.js new file mode 100644 index 000000000..70d2242a3 --- /dev/null +++ b/test/helpers/constants.js @@ -0,0 +1,6 @@ +const BigNumber = web3.BigNumber; + +module.exports = { + ZERO_ADDRESS: '0x0000000000000000000000000000000000000000', + MAX_UINT256: new BigNumber(2).pow(256).minus(1), +}; diff --git a/test/math/SafeMath.test.js b/test/math/SafeMath.test.js index 0174bd0ac..56cedeb84 100644 --- a/test/math/SafeMath.test.js +++ b/test/math/SafeMath.test.js @@ -1,4 +1,5 @@ const { assertRevert } = require('../helpers/assertRevert'); +const { MAX_UINT256 } = require('../helpers/constants'); const BigNumber = web3.BigNumber; const SafeMathMock = artifacts.require('SafeMathMock'); @@ -8,8 +9,6 @@ require('chai') .should(); contract('SafeMath', function () { - const MAX_UINT = new BigNumber(2).pow(256).minus(1); - beforeEach(async function () { this.safeMath = await SafeMathMock.new(); }); @@ -23,7 +22,7 @@ contract('SafeMath', function () { }); it('throws a revert error on addition overflow', async function () { - const a = MAX_UINT; + const a = MAX_UINT256; const b = new BigNumber(1); await assertRevert(this.safeMath.add(a, b)); @@ -62,7 +61,7 @@ contract('SafeMath', function () { }); it('throws a revert error on multiplication overflow', async function () { - const a = MAX_UINT; + const a = MAX_UINT256; const b = new BigNumber(2); await assertRevert(this.safeMath.mul(a, b)); diff --git a/test/ownership/Ownable.behavior.js b/test/ownership/Ownable.behavior.js index baf609c57..1e2fd7564 100644 --- a/test/ownership/Ownable.behavior.js +++ b/test/ownership/Ownable.behavior.js @@ -1,8 +1,7 @@ const { expectThrow } = require('../helpers/expectThrow'); const { EVMRevert } = require('../helpers/EVMRevert'); const expectEvent = require('../helpers/expectEvent'); - -const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000'; +const { ZERO_ADDRESS } = require('../helpers/constants'); require('chai') .should(); diff --git a/test/ownership/Secondary.test.js b/test/ownership/Secondary.test.js index 000d0af11..31676be79 100644 --- a/test/ownership/Secondary.test.js +++ b/test/ownership/Secondary.test.js @@ -1,13 +1,11 @@ const { assertRevert } = require('../helpers/assertRevert'); - +const { ZERO_ADDRESS } = require('../helpers/constants'); const SecondaryMock = artifacts.require('SecondaryMock'); require('chai') .should(); contract('Secondary', function ([_, primary, newPrimary, anyone]) { - const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000'; - beforeEach(async function () { this.secondary = await SecondaryMock.new({ from: primary }); }); diff --git a/test/payment/ConditionalEscrow.test.js b/test/payment/ConditionalEscrow.test.js index 5115fee48..03eed68f7 100644 --- a/test/payment/ConditionalEscrow.test.js +++ b/test/payment/ConditionalEscrow.test.js @@ -1,6 +1,7 @@ const { shouldBehaveLikeEscrow } = require('./Escrow.behavior'); const { expectThrow } = require('../helpers/expectThrow'); const { EVMRevert } = require('../helpers/EVMRevert'); +const { ether } = require('../helpers/ether'); const BigNumber = web3.BigNumber; @@ -24,7 +25,7 @@ contract('ConditionalEscrow', function ([_, owner, payee, ...otherAccounts]) { }); context('when withdrawal is disallowed', function () { - const amount = web3.toWei(23.0, 'ether'); + const amount = ether(23.0); beforeEach(async function () { await this.escrow.setAllowed(payee, false); diff --git a/test/payment/Escrow.behavior.js b/test/payment/Escrow.behavior.js index 761aecd89..28abd5af8 100644 --- a/test/payment/Escrow.behavior.js +++ b/test/payment/Escrow.behavior.js @@ -2,6 +2,7 @@ const expectEvent = require('../helpers/expectEvent'); const { expectThrow } = require('../helpers/expectThrow'); const { EVMRevert } = require('../helpers/EVMRevert'); const { ethGetBalance } = require('../helpers/web3'); +const { ether } = require('../helpers/ether'); const BigNumber = web3.BigNumber; @@ -10,7 +11,7 @@ require('chai') .should(); function shouldBehaveLikeEscrow (primary, [payee1, payee2]) { - const amount = web3.toWei(42.0, 'ether'); + const amount = ether(42.0); describe('as an escrow', function () { describe('deposits', function () { diff --git a/test/payment/PullPayment.test.js b/test/payment/PullPayment.test.js index 1eab3911f..1f4bcc525 100644 --- a/test/payment/PullPayment.test.js +++ b/test/payment/PullPayment.test.js @@ -1,4 +1,5 @@ const { ethGetBalance } = require('../helpers/web3'); +const { ether } = require('../helpers/ether'); const BigNumber = web3.BigNumber; @@ -9,7 +10,7 @@ require('chai') const PullPaymentMock = artifacts.require('PullPaymentMock'); contract('PullPayment', function ([_, payer, payee1, payee2]) { - const amount = web3.toWei(17.0, 'ether'); + const amount = ether(17.0); beforeEach(async function () { this.contract = await PullPaymentMock.new({ value: amount }); diff --git a/test/payment/RefundEscrow.test.js b/test/payment/RefundEscrow.test.js index e412816c4..1bd1a41c2 100644 --- a/test/payment/RefundEscrow.test.js +++ b/test/payment/RefundEscrow.test.js @@ -2,6 +2,8 @@ const { expectThrow } = require('../helpers/expectThrow'); const { EVMRevert } = require('../helpers/EVMRevert'); const expectEvent = require('../helpers/expectEvent'); const { ethGetBalance } = require('../helpers/web3'); +const { ether } = require('../helpers/ether'); +const { ZERO_ADDRESS } = require('../helpers/constants'); const BigNumber = web3.BigNumber; @@ -12,9 +14,8 @@ require('chai') const RefundEscrow = artifacts.require('RefundEscrow'); contract('RefundEscrow', function ([_, primary, beneficiary, refundee1, refundee2]) { - const amount = web3.toWei(54.0, 'ether'); + const amount = ether(54.0); const refundees = [refundee1, refundee2]; - const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000'; it('requires a non-null beneficiary', async function () { await expectThrow( diff --git a/test/payment/SplitPayment.test.js b/test/payment/SplitPayment.test.js index 05cc0b701..c1ed22ead 100644 --- a/test/payment/SplitPayment.test.js +++ b/test/payment/SplitPayment.test.js @@ -1,4 +1,6 @@ const { ethGetBalance, ethSendTransaction } = require('../helpers/web3'); +const { ether } = require('../helpers/ether'); +const { ZERO_ADDRESS } = require('./../helpers/constants'); const BigNumber = web3.BigNumber; @@ -11,8 +13,7 @@ const { EVMRevert } = require('../helpers/EVMRevert.js'); const SplitPayment = artifacts.require('SplitPayment'); contract('SplitPayment', function ([_, owner, payee1, payee2, payee3, nonpayee1, payer1]) { - const amount = web3.toWei(1.0, 'ether'); - const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000'; + const amount = ether(1.0); it('rejects an empty set of payees', async function () { await expectThrow(SplitPayment.new([], []), EVMRevert); diff --git a/test/token/ERC20/ERC20.test.js b/test/token/ERC20/ERC20.test.js index f9568b87e..7f4981d21 100644 --- a/test/token/ERC20/ERC20.test.js +++ b/test/token/ERC20/ERC20.test.js @@ -1,5 +1,6 @@ const { assertRevert } = require('../../helpers/assertRevert'); const expectEvent = require('../../helpers/expectEvent'); +const { ZERO_ADDRESS } = require('../../helpers/constants'); const ERC20 = artifacts.require('ERC20Mock'); @@ -10,8 +11,6 @@ require('chai') .should(); contract('ERC20', function ([_, owner, recipient, anotherAccount]) { - const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000'; - beforeEach(async function () { this.token = await ERC20.new(owner, 100); }); diff --git a/test/token/ERC20/TokenVesting.test.js b/test/token/ERC20/TokenVesting.test.js index 1fe9326f5..b88f8a673 100644 --- a/test/token/ERC20/TokenVesting.test.js +++ b/test/token/ERC20/TokenVesting.test.js @@ -3,6 +3,7 @@ const { EVMRevert } = require('../../helpers/EVMRevert'); const { latestTime } = require('../../helpers/latestTime'); const { increaseTimeTo, duration } = require('../../helpers/increaseTime'); const { ethGetBlock } = require('../../helpers/web3'); +const { ZERO_ADDRESS } = require('../../helpers/constants'); const BigNumber = web3.BigNumber; @@ -15,7 +16,6 @@ const TokenVesting = artifacts.require('TokenVesting'); contract('TokenVesting', function ([_, owner, beneficiary]) { const amount = new BigNumber(1000); - const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000'; beforeEach(async function () { this.start = (await latestTime()) + duration.minutes(1); // +1 minute so it starts after contract instantiation diff --git a/test/token/ERC20/behaviors/ERC20Burnable.behavior.js b/test/token/ERC20/behaviors/ERC20Burnable.behavior.js index cf0190046..996beb0e3 100644 --- a/test/token/ERC20/behaviors/ERC20Burnable.behavior.js +++ b/test/token/ERC20/behaviors/ERC20Burnable.behavior.js @@ -1,8 +1,8 @@ const { assertRevert } = require('../../../helpers/assertRevert'); const expectEvent = require('../../../helpers/expectEvent'); +const { ZERO_ADDRESS } = require('../../../helpers/constants'); const BigNumber = web3.BigNumber; -const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000'; require('chai') .use(require('chai-bignumber')(BigNumber)) diff --git a/test/token/ERC20/behaviors/ERC20Mintable.behavior.js b/test/token/ERC20/behaviors/ERC20Mintable.behavior.js index 16126d99a..a5812f655 100644 --- a/test/token/ERC20/behaviors/ERC20Mintable.behavior.js +++ b/test/token/ERC20/behaviors/ERC20Mintable.behavior.js @@ -1,5 +1,6 @@ const { assertRevert } = require('../../../helpers/assertRevert'); const expectEvent = require('../../../helpers/expectEvent'); +const { ZERO_ADDRESS } = require('../../../helpers/constants'); const BigNumber = web3.BigNumber; @@ -8,8 +9,6 @@ require('chai') .should(); function shouldBehaveLikeERC20Mintable (minter, [anyone]) { - const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000'; - describe('as a mintable token', function () { describe('mint', function () { const amount = 100; diff --git a/test/token/ERC721/ERC721.behavior.js b/test/token/ERC721/ERC721.behavior.js index 03e83fabe..8da645d33 100644 --- a/test/token/ERC721/ERC721.behavior.js +++ b/test/token/ERC721/ERC721.behavior.js @@ -1,5 +1,6 @@ const { shouldSupportInterfaces } = require('../../introspection/SupportsInterface.behavior'); const { assertRevert } = require('../../helpers/assertRevert'); +const { ZERO_ADDRESS } = require('../../helpers/constants'); const { decodeLogs } = require('../../helpers/decodeLogs'); const { sendTransaction } = require('../../helpers/sendTransaction'); const _ = require('lodash'); @@ -19,7 +20,6 @@ function shouldBehaveLikeERC721 ( const firstTokenId = 1; const secondTokenId = 2; const unknownTokenId = 3; - const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000'; const RECEIVER_MAGIC_VALUE = '0x150b7a02'; describe('like an ERC721', function () { diff --git a/test/token/ERC721/ERC721MintBurn.behavior.js b/test/token/ERC721/ERC721MintBurn.behavior.js index ab54a6ae6..e40356561 100644 --- a/test/token/ERC721/ERC721MintBurn.behavior.js +++ b/test/token/ERC721/ERC721MintBurn.behavior.js @@ -1,5 +1,6 @@ const { assertRevert } = require('../../helpers/assertRevert'); const expectEvent = require('../../helpers/expectEvent'); +const { ZERO_ADDRESS } = require('../../helpers/constants'); const BigNumber = web3.BigNumber; require('chai') @@ -15,7 +16,6 @@ function shouldBehaveLikeMintAndBurnERC721 ( const secondTokenId = 2; const thirdTokenId = 3; const unknownTokenId = 4; - const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000'; const MOCK_URI = 'https://example.com'; describe('like a mintable and burnable ERC721', function () { diff --git a/test/token/ERC721/ERC721PausedToken.behavior.js b/test/token/ERC721/ERC721PausedToken.behavior.js index d14e6a395..a7196d837 100644 --- a/test/token/ERC721/ERC721PausedToken.behavior.js +++ b/test/token/ERC721/ERC721PausedToken.behavior.js @@ -1,5 +1,6 @@ const { assertRevert } = require('../../helpers/assertRevert'); const { sendTransaction } = require('../../helpers/sendTransaction'); +const { ZERO_ADDRESS } = require('../../helpers/constants'); const BigNumber = web3.BigNumber; @@ -11,7 +12,6 @@ function shouldBehaveLikeERC721PausedToken (owner, [recipient, operator]) { const firstTokenId = 1; const mintedTokens = 1; const mockData = '0x42'; - const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000'; describe('like a paused ERC721', function () { beforeEach(async function () {