diff options
author | Leonid Logvinov <logvinov.leon@gmail.com> | 2019-02-07 18:15:37 +0800 |
---|---|---|
committer | Leonid Logvinov <logvinov.leon@gmail.com> | 2019-02-07 18:15:37 +0800 |
commit | de234280690571dc3441c1a06bb49049df3289dc (patch) | |
tree | d6792c9172245ee836e31a2588f3ae91dd53a012 /contracts/exchange/test/utils/exchange_wrapper.ts | |
parent | 4d75681357b04ae77637ee62645b662796a3b15b (diff) | |
parent | 2a344e26cc51fa41a9df3535b625b8609dfc167e (diff) | |
download | dexon-0x-contracts-de234280690571dc3441c1a06bb49049df3289dc.tar.gz dexon-0x-contracts-de234280690571dc3441c1a06bb49049df3289dc.tar.zst dexon-0x-contracts-de234280690571dc3441c1a06bb49049df3289dc.zip |
Merge development
Diffstat (limited to 'contracts/exchange/test/utils/exchange_wrapper.ts')
-rw-r--r-- | contracts/exchange/test/utils/exchange_wrapper.ts | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/contracts/exchange/test/utils/exchange_wrapper.ts b/contracts/exchange/test/utils/exchange_wrapper.ts index 61176751f..535e3bcf2 100644 --- a/contracts/exchange/test/utils/exchange_wrapper.ts +++ b/contracts/exchange/test/utils/exchange_wrapper.ts @@ -1,12 +1,5 @@ -import { - FillResults, - formatters, - LogDecoder, - OrderInfo, - orderUtils, - SignedTransaction, -} from '@0x/contracts-test-utils'; -import { SignedOrder } from '@0x/types'; +import { FillResults, formatters, LogDecoder, OrderInfo, orderUtils } from '@0x/contracts-test-utils'; +import { SignedOrder, SignedZeroExTransaction } from '@0x/types'; import { AbiEncoder, BigNumber } from '@0x/utils'; import { Web3Wrapper } from '@0x/web3-wrapper'; import { MethodAbi, Provider, TransactionReceiptWithDecodedLogs } from 'ethereum-types'; @@ -204,7 +197,7 @@ export class ExchangeWrapper { return tx; } public async executeTransactionAsync( - signedTx: SignedTransaction, + signedTx: SignedZeroExTransaction, from: string, ): Promise<TransactionReceiptWithDecodedLogs> { const txHash = await this._exchange.executeTransaction.sendTransactionAsync( |