diff options
| author | Fabio Berger <me@fabioberger.com> | 2018-06-26 14:43:37 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2018-06-26 14:43:37 +0800 |
| commit | 105b9273975b34d46dc98254846d2b31990d9d9a (patch) | |
| tree | 2a099d173df79d6ce0f37960977b39ebc61eecc7 /packages/contracts/src/utils/core_combinatorial_utils.ts | |
| parent | 9219f9d8ae2166c7c7b1d0a4ede78890094a3831 (diff) | |
| download | dexon-sol-tools-105b9273975b34d46dc98254846d2b31990d9d9a.tar dexon-sol-tools-105b9273975b34d46dc98254846d2b31990d9d9a.tar.gz dexon-sol-tools-105b9273975b34d46dc98254846d2b31990d9d9a.tar.bz2 dexon-sol-tools-105b9273975b34d46dc98254846d2b31990d9d9a.tar.lz dexon-sol-tools-105b9273975b34d46dc98254846d2b31990d9d9a.tar.xz dexon-sol-tools-105b9273975b34d46dc98254846d2b31990d9d9a.tar.zst dexon-sol-tools-105b9273975b34d46dc98254846d2b31990d9d9a.zip | |
Fix merge issues
Diffstat (limited to 'packages/contracts/src/utils/core_combinatorial_utils.ts')
| -rw-r--r-- | packages/contracts/src/utils/core_combinatorial_utils.ts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/contracts/src/utils/core_combinatorial_utils.ts b/packages/contracts/src/utils/core_combinatorial_utils.ts index a2d2a500b..a775c619f 100644 --- a/packages/contracts/src/utils/core_combinatorial_utils.ts +++ b/packages/contracts/src/utils/core_combinatorial_utils.ts @@ -515,7 +515,7 @@ export class CoreCombinatorialUtils { const takerAssetProxyId = assetProxyUtils.decodeAssetDataId(signedOrder.takerAssetData); const makerAssetProxyId = assetProxyUtils.decodeAssetDataId(signedOrder.makerAssetData); const isEitherAssetERC721 = - takerAssetProxyId === constants.ERC721_PROXY_ID || makerAssetProxyId === constants.ERC721_PROXY_ID; + takerAssetProxyId === AssetProxyId.ERC721 || makerAssetProxyId === AssetProxyId.ERC721; if (isEitherAssetERC721) { throw new Error( 'Cannot test `TakerAssetFillAmountScenario.LessThanRemainingFillableTakerAssetAmount` together with ERC721 assets since orders involving ERC721 must always be filled exactly.', |