This commit is contained in:
Jacob Evans 2017-11-15 15:52:23 -05:00
parent a2e1d28efc
commit 54c891a447

View File

@ -335,7 +335,7 @@ describe('OrderStateWatcher', () => {
const remainingFeeAmount = ZeroEx.toBaseUnitAmount(new BigNumber(3), 18); const remainingFeeAmount = ZeroEx.toBaseUnitAmount(new BigNumber(3), 18);
const transferFeeAmount = makerFee.sub(remainingFeeAmount); const transferFeeAmount = makerFee.sub(remainingFeeAmount);
const remainingTokenAmount = ZeroEx.toBaseUnitAmount(new BigNumber(3), 18); const remainingTokenAmount = ZeroEx.toBaseUnitAmount(new BigNumber(1), 18);
const transferTokenAmount = makerFee.sub(remainingFeeAmount); const transferTokenAmount = makerFee.sub(remainingFeeAmount);
zeroEx.orderStateWatcher.addOrder(signedOrder); zeroEx.orderStateWatcher.addOrder(signedOrder);
@ -343,15 +343,13 @@ describe('OrderStateWatcher', () => {
const validOrderState = orderState as OrderStateValid; const validOrderState = orderState as OrderStateValid;
const orderRelevantState = validOrderState.orderRelevantState; const orderRelevantState = validOrderState.orderRelevantState;
expect(orderRelevantState.remainingFillableMakerTokenAmount).to.be.bignumber.equal( expect(orderRelevantState.remainingFillableMakerTokenAmount).to.be.bignumber.equal(
remainingAmount); remainingFeeAmount);
expect(orderRelevantState.remainingFillableTakerTokenAmount).to.be.bignumber.equal(
remainingAmount);
done(); done();
}); });
zeroEx.orderStateWatcher.subscribe(callback); zeroEx.orderStateWatcher.subscribe(callback);
await zeroEx.token.setProxyAllowanceAsync(zrxTokenAddress, maker, remainingAmount); await zeroEx.token.setProxyAllowanceAsync(zrxTokenAddress, maker, remainingFeeAmount);
// await zeroEx.token.transferAsync( await zeroEx.token.transferAsync(
// zrxTokenAddress, maker, ZeroEx.NULL_ADDRESS, transferAmount); makerToken.address, maker, ZeroEx.NULL_ADDRESS, transferTokenAmount);
})().catch(done); })().catch(done);
}); });
}); });