Dedupe AssetProxyId types

This commit is contained in:
Leonid Logvinov 2018-07-09 11:43:00 +02:00
parent 12f30c78ff
commit 9fb7865292
No known key found for this signature in database
GPG Key ID: 0DD294BFDE8C95D4
5 changed files with 3 additions and 10 deletions

View File

@ -1,9 +1,9 @@
import { AssetProxyId } from '@0xproject/types';
import { Web3Wrapper } from '@0xproject/web3-wrapper'; import { Web3Wrapper } from '@0xproject/web3-wrapper';
import { ContractAbi } from 'ethereum-types'; import { ContractAbi } from 'ethereum-types';
import * as _ from 'lodash'; import * as _ from 'lodash';
import { artifacts } from '../artifacts'; import { artifacts } from '../artifacts';
import { AssetProxyId } from '../types';
import { assert } from '../utils/assert'; import { assert } from '../utils/assert';
import { ContractWrapper } from './contract_wrapper'; import { ContractWrapper } from './contract_wrapper';

View File

@ -1,9 +1,9 @@
import { AssetProxyId } from '@0xproject/types';
import { Web3Wrapper } from '@0xproject/web3-wrapper'; import { Web3Wrapper } from '@0xproject/web3-wrapper';
import { ContractAbi } from 'ethereum-types'; import { ContractAbi } from 'ethereum-types';
import * as _ from 'lodash'; import * as _ from 'lodash';
import { artifacts } from '../artifacts'; import { artifacts } from '../artifacts';
import { AssetProxyId } from '../types';
import { assert } from '../utils/assert'; import { assert } from '../utils/assert';
import { ContractWrapper } from './contract_wrapper'; import { ContractWrapper } from './contract_wrapper';

View File

@ -1,5 +1,5 @@
import { schemas } from '@0xproject/json-schemas'; import { schemas } from '@0xproject/json-schemas';
import { ExchangeContractErrs, Order, SignedOrder } from '@0xproject/types'; import { AssetProxyId, Order, SignedOrder } from '@0xproject/types';
import { BigNumber } from '@0xproject/utils'; import { BigNumber } from '@0xproject/utils';
import { Web3Wrapper } from '@0xproject/web3-wrapper'; import { Web3Wrapper } from '@0xproject/web3-wrapper';
import { ContractAbi, LogWithDecodedArgs } from 'ethereum-types'; import { ContractAbi, LogWithDecodedArgs } from 'ethereum-types';
@ -10,7 +10,6 @@ import { methodOptsSchema } from '../schemas/method_opts_schema';
import { orderTxOptsSchema } from '../schemas/order_tx_opts_schema'; import { orderTxOptsSchema } from '../schemas/order_tx_opts_schema';
import { txOptsSchema } from '../schemas/tx_opts_schema'; import { txOptsSchema } from '../schemas/tx_opts_schema';
import { import {
AssetProxyId,
BlockRange, BlockRange,
EventCallback, EventCallback,
ExchangeWrapperError, ExchangeWrapperError,

View File

@ -33,11 +33,6 @@ export enum ContractWrappersError {
ERC721NoApproval = 'ERC_721_NO_APPROVAL', ERC721NoApproval = 'ERC_721_NO_APPROVAL',
} }
export declare enum AssetProxyId {
ERC20 = '0xf47261b0',
ERC721 = '0x08e937fa',
}
export enum InternalContractWrappersError { export enum InternalContractWrappersError {
NoAbiDecoder = 'NO_ABI_DECODER', NoAbiDecoder = 'NO_ABI_DECODER',
} }

View File

@ -158,7 +158,6 @@ export interface ECSignature {
} }
export enum AssetProxyId { export enum AssetProxyId {
INVALID = '0x00000000',
ERC20 = '0xf47261b0', ERC20 = '0xf47261b0',
ERC721 = '0x08e937fa', ERC721 = '0x08e937fa',
} }