diff options
author | Amir Bandeali <abandeali1@gmail.com> | 2018-08-01 03:44:16 +0800 |
---|---|---|
committer | Amir Bandeali <abandeali1@gmail.com> | 2018-08-09 06:44:43 +0800 |
commit | 970bef717e422ac79901300b56ac8f11d3593685 (patch) | |
tree | 45d6cde7e24aee49ea56a92fa6f7308238f625e1 /packages/contracts/test/utils/fill_order_combinatorial_utils.ts | |
parent | 651a468b4476a20542014da93b04f93fd3ff0515 (diff) | |
download | dexon-sol-tools-970bef717e422ac79901300b56ac8f11d3593685.tar dexon-sol-tools-970bef717e422ac79901300b56ac8f11d3593685.tar.gz dexon-sol-tools-970bef717e422ac79901300b56ac8f11d3593685.tar.bz2 dexon-sol-tools-970bef717e422ac79901300b56ac8f11d3593685.tar.lz dexon-sol-tools-970bef717e422ac79901300b56ac8f11d3593685.tar.xz dexon-sol-tools-970bef717e422ac79901300b56ac8f11d3593685.tar.zst dexon-sol-tools-970bef717e422ac79901300b56ac8f11d3593685.zip |
Add return values to combinatorial fillOrder tests
Diffstat (limited to 'packages/contracts/test/utils/fill_order_combinatorial_utils.ts')
-rw-r--r-- | packages/contracts/test/utils/fill_order_combinatorial_utils.ts | 33 |
1 files changed, 23 insertions, 10 deletions
diff --git a/packages/contracts/test/utils/fill_order_combinatorial_utils.ts b/packages/contracts/test/utils/fill_order_combinatorial_utils.ts index bdd1e62a2..85acae5af 100644 --- a/packages/contracts/test/utils/fill_order_combinatorial_utils.ts +++ b/packages/contracts/test/utils/fill_order_combinatorial_utils.ts @@ -456,6 +456,29 @@ export class FillOrderCombinatorialUtils { signedOrder.takerAssetAmount, signedOrder.makerAssetAmount, ); + const expMakerFeePaid = orderUtils.getPartialAmount( + expFilledTakerAmount, + signedOrder.takerAssetAmount, + signedOrder.makerFee, + ); + const expTakerFeePaid = orderUtils.getPartialAmount( + expFilledTakerAmount, + signedOrder.takerAssetAmount, + signedOrder.takerFee, + ); + const fillResults = await this.exchangeWrapper.getFillOrderResultsAsync(signedOrder, this.takerAddress, { + takerAssetFillAmount, + }); + expect(fillResults.takerAssetFilledAmount).to.be.bignumber.equal( + expFilledTakerAmount, + 'takerAssetFilledAmount', + ); + expect(fillResults.makerAssetFilledAmount).to.be.bignumber.equal( + expFilledMakerAmount, + 'makerAssetFilledAmount', + ); + expect(fillResults.takerFeePaid).to.be.bignumber.equal(expTakerFeePaid, 'takerFeePaid'); + expect(fillResults.makerFeePaid).to.be.bignumber.equal(expMakerFeePaid, 'makerFeePaid'); // - Let's fill the order! const txReceipt = await this.exchangeWrapper.fillOrderAsync(signedOrder, this.takerAddress, { @@ -479,17 +502,7 @@ export class FillOrderCombinatorialUtils { expFilledTakerAmount, 'log.args.takerAssetFilledAmount', ); - const expMakerFeePaid = orderUtils.getPartialAmount( - expFilledTakerAmount, - signedOrder.takerAssetAmount, - signedOrder.makerFee, - ); expect(log.args.makerFeePaid).to.be.bignumber.equal(expMakerFeePaid, 'log.args.makerFeePaid'); - const expTakerFeePaid = orderUtils.getPartialAmount( - expFilledTakerAmount, - signedOrder.takerAssetAmount, - signedOrder.takerFee, - ); expect(log.args.takerFeePaid).to.be.bignumber.equal(expTakerFeePaid, 'logs.args.takerFeePaid'); expect(log.args.orderHash).to.be.equal(orderHash, 'log.args.orderHash'); expect(log.args.makerAssetData).to.be.equal(makerAssetData, 'log.args.makerAssetData'); |