diff options
| author | Amir Bandeali <abandeali1@gmail.com> | 2018-08-25 08:29:09 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-25 08:29:09 +0800 |
| commit | 74ce893f520db6ae4617432975b5c9321ff5b89b (patch) | |
| tree | 45853fe1c16066290834ee5827b3c269a9fb7734 /packages/contracts/test/utils | |
| parent | 94e01be9ed5bfe2d0ace4cd0562fced889b34108 (diff) | |
| parent | cc1fac9bbee2656bdb327490de42922abfc5125a (diff) | |
| download | dexon-sol-tools-74ce893f520db6ae4617432975b5c9321ff5b89b.tar dexon-sol-tools-74ce893f520db6ae4617432975b5c9321ff5b89b.tar.gz dexon-sol-tools-74ce893f520db6ae4617432975b5c9321ff5b89b.tar.bz2 dexon-sol-tools-74ce893f520db6ae4617432975b5c9321ff5b89b.tar.lz dexon-sol-tools-74ce893f520db6ae4617432975b5c9321ff5b89b.tar.xz dexon-sol-tools-74ce893f520db6ae4617432975b5c9321ff5b89b.tar.zst dexon-sol-tools-74ce893f520db6ae4617432975b5c9321ff5b89b.zip | |
Merge pull request #1003 from 0xProject/feature/contracts/roundup
[contracts] Add getPartialAmountCeil and isRoundingErrorCeil
Diffstat (limited to 'packages/contracts/test/utils')
| -rw-r--r-- | packages/contracts/test/utils/fill_order_combinatorial_utils.ts | 12 | ||||
| -rw-r--r-- | packages/contracts/test/utils/order_utils.ts | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/packages/contracts/test/utils/fill_order_combinatorial_utils.ts b/packages/contracts/test/utils/fill_order_combinatorial_utils.ts index a9318571c..92d0f4003 100644 --- a/packages/contracts/test/utils/fill_order_combinatorial_utils.ts +++ b/packages/contracts/test/utils/fill_order_combinatorial_utils.ts @@ -467,17 +467,17 @@ export class FillOrderCombinatorialUtils { ? remainingTakerAmountToFill : alreadyFilledTakerAmount.add(takerAssetFillAmount); - const expFilledMakerAmount = orderUtils.getPartialAmount( + const expFilledMakerAmount = orderUtils.getPartialAmountFloor( expFilledTakerAmount, signedOrder.takerAssetAmount, signedOrder.makerAssetAmount, ); - const expMakerFeePaid = orderUtils.getPartialAmount( + const expMakerFeePaid = orderUtils.getPartialAmountFloor( expFilledTakerAmount, signedOrder.takerAssetAmount, signedOrder.makerFee, ); - const expTakerFeePaid = orderUtils.getPartialAmount( + const expTakerFeePaid = orderUtils.getPartialAmountFloor( expFilledTakerAmount, signedOrder.takerAssetAmount, signedOrder.takerFee, @@ -668,7 +668,7 @@ export class FillOrderCombinatorialUtils { signedOrder: SignedOrder, takerAssetFillAmount: BigNumber, ): Promise<void> { - const makerAssetFillAmount = orderUtils.getPartialAmount( + const makerAssetFillAmount = orderUtils.getPartialAmountFloor( takerAssetFillAmount, signedOrder.takerAssetAmount, signedOrder.makerAssetAmount, @@ -705,7 +705,7 @@ export class FillOrderCombinatorialUtils { ); } - const makerFee = orderUtils.getPartialAmount( + const makerFee = orderUtils.getPartialAmountFloor( takerAssetFillAmount, signedOrder.takerAssetAmount, signedOrder.makerFee, @@ -829,7 +829,7 @@ export class FillOrderCombinatorialUtils { ); } - const takerFee = orderUtils.getPartialAmount( + const takerFee = orderUtils.getPartialAmountFloor( takerAssetFillAmount, signedOrder.takerAssetAmount, signedOrder.takerFee, diff --git a/packages/contracts/test/utils/order_utils.ts b/packages/contracts/test/utils/order_utils.ts index 019f6e74b..444e27c44 100644 --- a/packages/contracts/test/utils/order_utils.ts +++ b/packages/contracts/test/utils/order_utils.ts @@ -5,7 +5,7 @@ import { constants } from './constants'; import { CancelOrder, MatchOrder } from './types'; export const orderUtils = { - getPartialAmount(numerator: BigNumber, denominator: BigNumber, target: BigNumber): BigNumber { + getPartialAmountFloor(numerator: BigNumber, denominator: BigNumber, target: BigNumber): BigNumber { const partialAmount = numerator .mul(target) .div(denominator) |