crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsync

Browse Source
This commit is contained in:
Fabio Berger
2017-06-01 14:59:26 +02:00
parent 1668a08504 75d0b69db2
commit 085e4fb896
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
test/exchange_wrapper_test.ts
View File

@@ -6,7 +6,7 @@ import promisify = require('es6-promisify');
import * as _ from 'lodash';
import {BlockchainLifecycle} from './utils/blockchain_lifecycle';
import * as BigNumber from 'bignumber.js';
import {orderFactory} from './utils/order';
import {orderFactory} from './utils/order_factory';
import {Token} from '../src/types';
import * as Web3 from 'web3';
import * as dirtyChai from 'dirty-chai';
@@ -128,7 +128,9 @@ describe('ExchangeWrapper', () => {
});
describe('failed fills', () => {
it('should throw when the fill amount is zero', async () => {
const signedOrder = await orderFactory.createSignedOrderAsync(zeroEx, networkId, userAddresses[0],
const maker = userAddresses[0];
const taker = userAddresses[1];
const signedOrder = await orderFactory.createSignedOrderAsync(zeroEx, networkId, maker, taker,
5, addressBySymbol.MLN, 5, addressBySymbol.GNT);
const fillAmount = new BigNumber(0);
expect(zeroEx.exchange.fillOrderAsync(signedOrder, fillAmount))
@@ -145,14 +147,9 @@ describe('ExchangeWrapper', () => {
await setAllowance(maker, 5, addressBySymbol.MLN);
await setBalance(taker, 5, addressBySymbol.GNT);
await setAllowance(taker, 5, addressBySymbol.GNT);
const signedOrder = await orderFactory.createSignedOrderAsync(zeroEx, networkId, maker,
const signedOrder = await orderFactory.createSignedOrderAsync(zeroEx, networkId, maker, taker,
5, addressBySymbol.MLN, 5, addressBySymbol.GNT);
const fillAmount = new BigNumber(5);
expect(await zeroEx.token.getBalanceAsync(addressBySymbol.MLN, maker)).to.be.bignumber.greaterThan(5);
expect(await zeroEx.token.getBalanceAsync(addressBySymbol.MLN, taker)).to.be.bignumber.equal(0);
expect(await zeroEx.token.getBalanceAsync(addressBySymbol.GNT, taker)).to.be.bignumber.equal(5);
expect(await zeroEx.token.getProxyAllowanceAsync(addressBySymbol.MLN, maker)).to.be.bignumber.equal(5);
expect(await zeroEx.token.getProxyAllowanceAsync(addressBySymbol.GNT, taker)).to.be.bignumber.equal(5);
zeroEx.setDefaultAccount(taker);
await zeroEx.exchange.fillOrderAsync(signedOrder, fillAmount);
expect(await zeroEx.token.getBalanceAsync(addressBySymbol.MLN, taker)).to.be.bignumber.equal(5);

3
test/utils/order.ts → test/utils/order_factory.ts
View File

@@ -10,6 +10,7 @@ export const orderFactory = {
zeroEx: ZeroEx,
networkId: number,
maker: string,
taker: string,
makerTokenAmount: BigNumber.BigNumber|number,
makerTokenAddress: string,
takerTokenAmount: BigNumber.BigNumber|number,
@@ -19,7 +20,7 @@ export const orderFactory = {
const INF_TIMESTAMP = 2524604400;
const order = {
maker,
taker: undefined,
taker,
makerFee: new BigNumber(0),
takerFee: new BigNumber(0),
makerTokenAmount: _.isNumber(makerTokenAmount) ? new BigNumber(makerTokenAmount) : makerTokenAmount,