diff options
author | Leonid <logvinov.leon@gmail.com> | 2018-01-31 03:27:14 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-31 03:27:14 +0800 |
commit | 2bcb7d56394c43acd68d1823092de2ad047abc6d (patch) | |
tree | 55684889214373fcd66ca52efa079f381cfb388b /packages/0x.js/src/contract_wrappers/exchange_wrapper.ts | |
parent | d004df56e38726ed7f1b775da33d8f37aae270db (diff) | |
parent | 7ad314472d27e8a6c6ee8242f4f335d414709f4d (diff) | |
download | dexon-sol-tools-2bcb7d56394c43acd68d1823092de2ad047abc6d.tar dexon-sol-tools-2bcb7d56394c43acd68d1823092de2ad047abc6d.tar.gz dexon-sol-tools-2bcb7d56394c43acd68d1823092de2ad047abc6d.tar.bz2 dexon-sol-tools-2bcb7d56394c43acd68d1823092de2ad047abc6d.tar.lz dexon-sol-tools-2bcb7d56394c43acd68d1823092de2ad047abc6d.tar.xz dexon-sol-tools-2bcb7d56394c43acd68d1823092de2ad047abc6d.tar.zst dexon-sol-tools-2bcb7d56394c43acd68d1823092de2ad047abc6d.zip |
Merge pull request #332 from 0xProject/feature/contracts-abi-gen
Contracts refactor. Bye, truffle!!! :clap:
Diffstat (limited to 'packages/0x.js/src/contract_wrappers/exchange_wrapper.ts')
-rw-r--r-- | packages/0x.js/src/contract_wrappers/exchange_wrapper.ts | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts b/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts index 2b6117729..fceab851a 100644 --- a/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts +++ b/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts @@ -1,5 +1,6 @@ import { schemas } from '@0xproject/json-schemas'; -import { BigNumber } from '@0xproject/utils'; +import { DecodedLogArgs, LogWithDecodedArgs } from '@0xproject/types'; +import { AbiDecoder, BigNumber } from '@0xproject/utils'; import { Web3Wrapper } from '@0xproject/web3-wrapper'; import * as _ from 'lodash'; import * as Web3 from 'web3'; @@ -8,7 +9,6 @@ import { artifacts } from '../artifacts'; import { BlockParamLiteral, BlockRange, - DecodedLogArgs, ECSignature, EventCallback, ExchangeContractErrCodes, @@ -17,7 +17,6 @@ import { ExchangeEvents, IndexedFilterValues, LogErrorContractEventArgs, - LogWithDecodedArgs, MethodOpts, Order, OrderAddresses, @@ -28,7 +27,6 @@ import { SignedOrder, ValidateOrderFillableOpts, } from '../types'; -import { AbiDecoder } from '../utils/abi_decoder'; import { assert } from '../utils/assert'; import { decorators } from '../utils/decorators'; import { ExchangeTransferSimulator } from '../utils/exchange_transfer_simulator'; @@ -846,9 +844,9 @@ export class ExchangeWrapper extends ContractWrapper { public throwLogErrorsAsErrors(logs: Array<LogWithDecodedArgs<DecodedLogArgs> | Web3.LogEntry>): void { const errLog = _.find(logs, { event: ExchangeEvents.LogError, - }) as LogWithDecodedArgs<LogErrorContractEventArgs> | undefined; + }); if (!_.isUndefined(errLog)) { - const logArgs = errLog.args; + const logArgs = (errLog as LogWithDecodedArgs<LogErrorContractEventArgs>).args; const errCode = logArgs.errorId.toNumber(); const errMessage = this._exchangeContractErrCodesToMsg[errCode]; throw new Error(errMessage); |