Merge branch 'erc20transfer' into fillOrderAsync

2 files changed, 111 insertions, 2 deletions

diff --git a/test/exchange_wrapper_test.ts b/test/exchange_wrapper_test.ts
index 355a5d01b..ede4198d8 100644
--- a/test/exchange_wrapper_test.ts
+++ b/test/exchange_wrapper_test.ts
@@ -1,6 +1,5 @@
 import 'mocha';
 import * as chai from 'chai';
-import chaiAsPromised = require('chai-as-promised');
 import {web3Factory} from './utils/web3_factory';
 import {ZeroEx} from '../src/0x.js';
 import {BlockchainLifecycle} from './utils/blockchain_lifecycle';
@@ -8,7 +7,6 @@ import * as BigNumber from 'bignumber.js';
 import {createSignedOrder} from './utils/order';
 
 const expect = chai.expect;
-chai.use(chaiAsPromised);
 const blockchainLifecycle = new BlockchainLifecycle();
 
 describe('ExchangeWrapper', () => {
diff --git a/test/token_wrapper_test.ts b/test/token_wrapper_test.ts
new file mode 100644
index 000000000..113dd32d6
--- /dev/null
+++ b/test/token_wrapper_test.ts
@@ -0,0 +1,111 @@
+import 'mocha';
+import * as chai from 'chai';
+import * as Web3 from 'web3';
+import * as BigNumber from 'bignumber.js';
+import promisify = require('es6-promisify');
+import {web3Factory} from './utils/web3_factory';
+import {ZeroEx} from '../src/0x.js';
+import {ZeroExError, Token} from '../src/types';
+import {BlockchainLifecycle} from './utils/blockchain_lifecycle';
+
+const expect = chai.expect;
+const blockchainLifecycle = new BlockchainLifecycle();
+
+describe('TokenWrapper', () => {
+    let web3: Web3;
+    let zeroEx: ZeroEx;
+    let userAddresses: string[];
+    let tokens: Token[];
+    before(async () => {
+        web3 = web3Factory.create();
+        zeroEx = new ZeroEx(web3);
+        userAddresses = await promisify(web3.eth.getAccounts)();
+        tokens = await zeroEx.tokenRegistry.getTokensAsync();
+    });
+    beforeEach(async () => {
+        await blockchainLifecycle.startAsync();
+    });
+    afterEach(async () => {
+        await blockchainLifecycle.revertAsync();
+    });
+    describe('#transferAsync', () => {
+        it('should successfully transfer tokens', async () => {
+            const token = tokens[0];
+            const fromAddress = userAddresses[0];
+            const toAddress = userAddresses[1];
+            const preBalance = await zeroEx.token.getBalanceAsync(token.address, toAddress);
+            expect(preBalance).to.be.bignumber.equal(0);
+            await zeroEx.token.transferAsync(token.address, fromAddress, toAddress, new BigNumber(42));
+            const postBalance = await zeroEx.token.getBalanceAsync(token.address, toAddress);
+            expect(postBalance).to.be.bignumber.equal(42);
+        });
+        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.token.transferAsync(
+                nonExistentTokenAddress, userAddresses[0], userAddresses[1], new BigNumber(42),
+            )).to.be.rejectedWith(ZeroExError.CONTRACT_DOES_NOT_EXIST);
+        });
+    });
+    describe('#getBalanceAsync', () => {
+        it('should return the balance for an existing ERC20 token', async () => {
+            const aToken = tokens[0];
+            const aOwnerAddress = userAddresses[0];
+            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.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.token.getBalanceAsync(aToken.address, aNonExistentOwner);
+            const expectedBalance = new BigNumber('0');
+            expect(balance).to.be.bignumber.equal(expectedBalance);
+        });
+    });
+    describe('#getProxyAllowanceAsync', () => {
+        it('should get the proxy allowance', async () => {
+            const aToken = tokens[0];
+            const aOwnerAddress = userAddresses[0];
+
+            const amountInUnits = new BigNumber('50');
+            const amountInBaseUnits = ZeroEx.toBaseUnitAmount(amountInUnits, aToken.decimals);
+            await zeroEx.token.setProxyAllowanceAsync(aToken.address, aOwnerAddress, amountInBaseUnits);
+
+            const allowance = await zeroEx.token.getProxyAllowanceAsync(aToken.address, aOwnerAddress);
+            const expectedAllowance = amountInBaseUnits;
+            expect(allowance).to.be.bignumber.equal(expectedAllowance);
+        });
+        it('should return 0 if no allowance set yet', async () => {
+            const aToken = tokens[0];
+            const aOwnerAddress = userAddresses[0];
+            const allowance = await zeroEx.token.getProxyAllowanceAsync(aToken.address, aOwnerAddress);
+            const expectedAllowance = new BigNumber('0');
+            expect(allowance).to.be.bignumber.equal(expectedAllowance);
+        });
+    });
+    describe('#setProxyAllowanceAsync', () => {
+        it('should set the proxy allowance', async () => {
+            const aToken = tokens[0];
+            const aOwnerAddress = userAddresses[0];
+
+            const allowanceBeforeSet = await zeroEx.token.getProxyAllowanceAsync(aToken.address, aOwnerAddress);
+            const expectedAllowanceBeforeAllowanceSet = new BigNumber('0');
+            expect(allowanceBeforeSet).to.be.bignumber.equal(expectedAllowanceBeforeAllowanceSet);
+
+            const amountInUnits = new BigNumber('50');
+            const amountInBaseUnits = ZeroEx.toBaseUnitAmount(amountInUnits, aToken.decimals);
+            await zeroEx.token.setProxyAllowanceAsync(aToken.address, aOwnerAddress, amountInBaseUnits);
+
+            const allowanceAfterSet = await zeroEx.token.getProxyAllowanceAsync(aToken.address, aOwnerAddress);
+            const expectedAllowanceAfterAllowanceSet = amountInBaseUnits;
+            expect(allowanceAfterSet).to.be.bignumber.equal(expectedAllowanceAfterAllowanceSet);
+        });
+    });
+});