diff options
author | Fabio Berger <me@fabioberger.com> | 2018-04-05 20:06:58 +0800 |
---|---|---|
committer | Fabio Berger <me@fabioberger.com> | 2018-04-05 20:06:58 +0800 |
commit | 89a72ebf0dbff606d511ae51bfee7ffc0a5df18f (patch) | |
tree | 65c935c4c372d2c497bec08164b314866050192b /packages/0x.js/test/utils | |
parent | 20aaab0847d0ec8b2a44f392ddd467f0c475cfb5 (diff) | |
parent | 7f7ddee0f95f3ed3e903c230088dbee4648771bd (diff) | |
download | dexon-0x-contracts-89a72ebf0dbff606d511ae51bfee7ffc0a5df18f.tar dexon-0x-contracts-89a72ebf0dbff606d511ae51bfee7ffc0a5df18f.tar.gz dexon-0x-contracts-89a72ebf0dbff606d511ae51bfee7ffc0a5df18f.tar.bz2 dexon-0x-contracts-89a72ebf0dbff606d511ae51bfee7ffc0a5df18f.tar.lz dexon-0x-contracts-89a72ebf0dbff606d511ae51bfee7ffc0a5df18f.tar.xz dexon-0x-contracts-89a72ebf0dbff606d511ae51bfee7ffc0a5df18f.tar.zst dexon-0x-contracts-89a72ebf0dbff606d511ae51bfee7ffc0a5df18f.zip |
Merge branch 'development' into removeMigrateStep
* development:
Fix tests
Call static functions as static
Address feedback
Move our contract templates to accept Provider instead of Web3Wrapper
Diffstat (limited to 'packages/0x.js/test/utils')
-rw-r--r-- | packages/0x.js/test/utils/fill_scenarios.ts | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/packages/0x.js/test/utils/fill_scenarios.ts b/packages/0x.js/test/utils/fill_scenarios.ts index 25e2aa36f..cd68b7dfa 100644 --- a/packages/0x.js/test/utils/fill_scenarios.ts +++ b/packages/0x.js/test/utils/fill_scenarios.ts @@ -37,7 +37,12 @@ export class FillScenarios { for (const token of this._tokens) { if (token.symbol !== 'ZRX' && token.symbol !== 'WETH') { const defaults = {}; - const dummyToken = new DummyTokenContract(web3Wrapper, artifacts.DummyTokenArtifact.abi, token.address); + const dummyToken = new DummyTokenContract( + artifacts.DummyTokenArtifact.abi, + token.address, + web3Wrapper.getProvider(), + web3Wrapper.getContractDefaults(), + ); const tokenSupply = ZeroEx.toBaseUnitAmount(INITIAL_COINBASE_TOKEN_SUPPLY_IN_UNITS, token.decimals); const txHash = await dummyToken.setBalance.sendTransactionAsync(this._coinbase, tokenSupply, { from: this._coinbase, |