diff options
author | Fabio Berger <me@fabioberger.com> | 2017-05-30 20:53:25 +0800 |
---|---|---|
committer | Fabio Berger <me@fabioberger.com> | 2017-05-30 20:53:25 +0800 |
commit | 86cdb6cb83078f9f29f473e0ebb8425a2d90f5ec (patch) | |
tree | 45f76be2fa6b4e4f1c48a60c5104bb58f405dd44 | |
parent | 2f16c5483569b819b292554efc736b415b43ca19 (diff) | |
download | dexon-0x-contracts-86cdb6cb83078f9f29f473e0ebb8425a2d90f5ec.tar.gz dexon-0x-contracts-86cdb6cb83078f9f29f473e0ebb8425a2d90f5ec.tar.zst dexon-0x-contracts-86cdb6cb83078f9f29f473e0ebb8425a2d90f5ec.zip |
use token instead of erc20
-rw-r--r-- | src/0x.js.ts | 6 | ||||
-rw-r--r-- | test/token_wrapper_test.ts | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/0x.js.ts b/src/0x.js.ts index 96b290439..d231c579e 100644 --- a/src/0x.js.ts +++ b/src/0x.js.ts @@ -21,7 +21,7 @@ const MAX_DIGITS_IN_UNSIGNED_256_INT = 78; export class ZeroEx { public exchange: ExchangeWrapper; public tokenRegistry: TokenRegistryWrapper; - public erc20: TokenWrapper; + public token: TokenWrapper; private web3Wrapper: Web3Wrapper; /** * Computes the orderHash given the order parameters and returns it as a hex encoded string. @@ -137,7 +137,7 @@ export class ZeroEx { this.web3Wrapper = new Web3Wrapper(web3); this.exchange = new ExchangeWrapper(this.web3Wrapper); this.tokenRegistry = new TokenRegistryWrapper(this.web3Wrapper); - this.erc20 = new TokenWrapper(this.web3Wrapper); + this.token = new TokenWrapper(this.web3Wrapper); } /** * Sets a new provider for the web3 instance used by 0x.js @@ -146,7 +146,7 @@ export class ZeroEx { this.web3Wrapper.setProvider(provider); this.exchange.invalidateContractInstance(); this.tokenRegistry.invalidateContractInstance(); - this.erc20.invalidateContractInstances(); + this.token.invalidateContractInstances(); } /** * Signs an orderHash and returns it's elliptic curve signature diff --git a/test/token_wrapper_test.ts b/test/token_wrapper_test.ts index 22fb6e052..a15fab505 100644 --- a/test/token_wrapper_test.ts +++ b/test/token_wrapper_test.ts @@ -34,20 +34,20 @@ describe('TokenWrapper', () => { it('should return the balance for an existing ERC20 token', async () => { const aToken = tokens[0]; const aOwnerAddress = userAddresses[0]; - const balance = await zeroEx.erc20.getBalanceAsync(aToken.address, aOwnerAddress); + const balance = await zeroEx.token.getBalanceAsync(aToken.address, aOwnerAddress); const expectedBalance = new BigNumber('100000000000000000000000000'); expect(balance).to.be.bignumber.equal(expectedBalance); }); it ('should throw a CONTRACT_DOES_NOT_EXIST error for a non-existent token contract', async () => { const nonExistentTokenAddress = '0x9dd402f14d67e001d8efbe6583e51bf9706aa065'; const aOwnerAddress = userAddresses[0]; - expect(zeroEx.erc20.getBalanceAsync(nonExistentTokenAddress, aOwnerAddress)) + expect(zeroEx.token.getBalanceAsync(nonExistentTokenAddress, aOwnerAddress)) .to.be.rejectedWith(ZeroExError.CONTRACT_DOES_NOT_EXIST); }); it ('should return a balance of 0 for a non-existent owner address', async () => { const aToken = tokens[0]; const aNonExistentOwner = '0x198C6Ad858F213Fb31b6FE809E25040E6B964593'; - const balance = await zeroEx.erc20.getBalanceAsync(aToken.address, aNonExistentOwner); + const balance = await zeroEx.token.getBalanceAsync(aToken.address, aNonExistentOwner); const expectedBalance = new BigNumber('0'); expect(balance).to.be.bignumber.equal(expectedBalance); }); |