diff options
author | Kadinsky <kandinsky454@protonmail.ch> | 2018-10-18 19:14:32 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-18 19:14:32 +0800 |
commit | 47dc384ea36fecbcf01eb9b3f20936331b43a0c6 (patch) | |
tree | e53a0c2d20b9f3271916144528f2214b32a3a83a /packages/order-utils/src | |
parent | c333d093b585fa0250a6973f2d396eb3cf227334 (diff) | |
parent | e7c6f2a35795610645598deba2c14ceeda6acc89 (diff) | |
download | dexon-sol-tools-47dc384ea36fecbcf01eb9b3f20936331b43a0c6.tar dexon-sol-tools-47dc384ea36fecbcf01eb9b3f20936331b43a0c6.tar.gz dexon-sol-tools-47dc384ea36fecbcf01eb9b3f20936331b43a0c6.tar.bz2 dexon-sol-tools-47dc384ea36fecbcf01eb9b3f20936331b43a0c6.tar.lz dexon-sol-tools-47dc384ea36fecbcf01eb9b3f20936331b43a0c6.tar.xz dexon-sol-tools-47dc384ea36fecbcf01eb9b3f20936331b43a0c6.tar.zst dexon-sol-tools-47dc384ea36fecbcf01eb9b3f20936331b43a0c6.zip |
Merge pull request #1140 from 0xProject/reSkinReferenceDocs
Move Doc Reference Pages & Wiki into Developer Section of Website
Diffstat (limited to 'packages/order-utils/src')
-rw-r--r-- | packages/order-utils/src/asset_data_utils.ts | 4 | ||||
-rw-r--r-- | packages/order-utils/src/index.ts | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/packages/order-utils/src/asset_data_utils.ts b/packages/order-utils/src/asset_data_utils.ts index 0c0b59548..12c11bce9 100644 --- a/packages/order-utils/src/asset_data_utils.ts +++ b/packages/order-utils/src/asset_data_utils.ts @@ -1,4 +1,4 @@ -import { AssetProxyId, ERC20AssetData, ERC721AssetData } from '@0xproject/types'; +import { AssetData, AssetProxyId, ERC20AssetData, ERC721AssetData } from '@0xproject/types'; import { BigNumber } from '@0xproject/utils'; import ethAbi = require('ethereumjs-abi'); import ethUtil = require('ethereumjs-util'); @@ -112,7 +112,7 @@ export const assetDataUtils = { * @param assetData Hex encoded assetData string to decode * @return Either a ERC20 or ERC721 assetData object */ - decodeAssetDataOrThrow(assetData: string): ERC20AssetData | ERC721AssetData { + decodeAssetDataOrThrow(assetData: string): AssetData { const assetProxyId = assetDataUtils.decodeAssetProxyId(assetData); switch (assetProxyId) { case AssetProxyId.ERC20: diff --git a/packages/order-utils/src/index.ts b/packages/order-utils/src/index.ts index dbb782b85..50b8a88a8 100644 --- a/packages/order-utils/src/index.ts +++ b/packages/order-utils/src/index.ts @@ -18,7 +18,6 @@ export { ExchangeTransferSimulator } from './exchange_transfer_simulator'; export { BalanceAndProxyAllowanceLazyStore } from './store/balance_and_proxy_allowance_lazy_store'; export { OrderFilledCancelledLazyStore } from './store/order_filled_cancelled_lazy_store'; -export { constants } from './constants'; export { eip712Utils } from './eip712_utils'; export { @@ -35,6 +34,7 @@ export { OrderRelevantState, OrderState, ECSignature, + AssetData, ERC20AssetData, ERC721AssetData, AssetProxyId, |