diff options
| author | Steve Klebanoff <steve.klebanoff@gmail.com> | 2018-12-22 08:26:07 +0800 |
|---|---|---|
| committer | Steve Klebanoff <steve.klebanoff@gmail.com> | 2018-12-22 08:26:07 +0800 |
| commit | c8c8219c055cc5798cf5cdc71199ee7ae505cd5a (patch) | |
| tree | 40bc54fc631768b8b328eb567836294d3f19446e | |
| parent | e144ebbb936c74b4af0e1c1776578208ea148de4 (diff) | |
| download | dexon-0x-contracts-c8c8219c055cc5798cf5cdc71199ee7ae505cd5a.tar.gz dexon-0x-contracts-c8c8219c055cc5798cf5cdc71199ee7ae505cd5a.tar.zst dexon-0x-contracts-c8c8219c055cc5798cf5cdc71199ee7ae505cd5a.zip | |
Make amountAvailableToFill required
| -rw-r--r-- | packages/asset-buyer/src/errors.ts | 4 | ||||
| -rw-r--r-- | packages/asset-buyer/src/utils/buy_quote_calculator.ts | 6 | ||||
| -rw-r--r-- | packages/instant/src/util/asset.ts | 1 |
3 files changed, 3 insertions, 8 deletions
diff --git a/packages/asset-buyer/src/errors.ts b/packages/asset-buyer/src/errors.ts index 68e9a684b..ec5fe548c 100644 --- a/packages/asset-buyer/src/errors.ts +++ b/packages/asset-buyer/src/errors.ts @@ -9,11 +9,11 @@ export class InsufficientAssetLiquidityError extends Error { /** * The amount availabe to fill (in base units) factoring in slippage. */ - public amountAvailableToFill?: BigNumber; + public amountAvailableToFill: BigNumber; /** * @param amountAvailableToFill The amount availabe to fill (in base units) factoring in slippage */ - constructor(amountAvailableToFill?: BigNumber) { + constructor(amountAvailableToFill: BigNumber) { super(AssetBuyerError.InsufficientAssetLiquidity); this.amountAvailableToFill = amountAvailableToFill; // Setting prototype so instanceof works. See https://github.com/Microsoft/TypeScript/wiki/Breaking-Changes#extending-built-ins-like-error-array-and-map-may-no-longer-work diff --git a/packages/asset-buyer/src/utils/buy_quote_calculator.ts b/packages/asset-buyer/src/utils/buy_quote_calculator.ts index 59293d1b7..ceeee93d3 100644 --- a/packages/asset-buyer/src/utils/buy_quote_calculator.ts +++ b/packages/asset-buyer/src/utils/buy_quote_calculator.ts @@ -47,11 +47,7 @@ export const buyQuoteCalculator = { .div(multiplerNeededWithSlippage) .round(0, BigNumber.ROUND_DOWN); - throw new InsufficientAssetLiquidityError( - amountAvailableToFillConsideringSlippage.gt(constants.ZERO_AMOUNT) - ? amountAvailableToFillConsideringSlippage - : undefined, - ); + throw new InsufficientAssetLiquidityError(amountAvailableToFillConsideringSlippage); } // if we are not buying ZRX: // given the orders calculated above, find the fee-orders that cover the desired assetBuyAmount (with slippage) diff --git a/packages/instant/src/util/asset.ts b/packages/instant/src/util/asset.ts index e7aa55c88..b009a327f 100644 --- a/packages/instant/src/util/asset.ts +++ b/packages/instant/src/util/asset.ts @@ -115,7 +115,6 @@ export const assetUtils = { const assetName = assetUtils.bestNameForAsset(asset, 'of this asset'); if ( error instanceof InsufficientAssetLiquidityError && - error.amountAvailableToFill && error.amountAvailableToFill.greaterThan(BIG_NUMBER_ZERO) ) { const unitAmountAvailableToFill = Web3Wrapper.toUnitAmount( |