@0x/contracts-exchange: Fix broken tests.
`@0x/contracts-test-utils`: Remove unecessary wait timeout in `LogDecoder`.
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
// tslint:disable: max-file-line-count
|
||||
import { ERC20ProxyContract, ERC20Wrapper } from '@0x/contracts-asset-proxy';
|
||||
import { DummyERC20TokenContract } from '@0x/contracts-erc20';
|
||||
import { artifacts as erc20Artifacts, DummyERC20TokenContract } from '@0x/contracts-erc20';
|
||||
import {
|
||||
blockchainTests,
|
||||
constants,
|
||||
@@ -25,7 +25,7 @@ import * as ethUtil from 'ethereumjs-util';
|
||||
import * as _ from 'lodash';
|
||||
|
||||
import {
|
||||
artifacts,
|
||||
artifacts as localArtifacts,
|
||||
constants as exchangeConstants,
|
||||
ExchangeCancelEventArgs,
|
||||
ExchangeCancelUpToEventArgs,
|
||||
@@ -40,6 +40,8 @@ import {
|
||||
WhitelistContract,
|
||||
} from '../src/';
|
||||
|
||||
const artifacts = { ...erc20Artifacts, ...localArtifacts };
|
||||
|
||||
// tslint:disable:no-unnecessary-type-assertion
|
||||
blockchainTests.resets('Exchange transactions', env => {
|
||||
let chainId: number;
|
||||
|
||||
@@ -45,10 +45,7 @@ export class LogDecoder {
|
||||
return logWithDecodedArgsOrLog;
|
||||
}
|
||||
public async getTxWithDecodedLogsAsync(txHash: string): Promise<TransactionReceiptWithDecodedLogs> {
|
||||
const receipt = await this._web3Wrapper.awaitTransactionSuccessAsync(
|
||||
txHash,
|
||||
constants.AWAIT_TRANSACTION_MINED_MS,
|
||||
);
|
||||
const receipt = await this._web3Wrapper.awaitTransactionSuccessAsync(txHash);
|
||||
return this.decodeReceiptLogs(receipt);
|
||||
}
|
||||
public decodeReceiptLogs(receipt: TransactionReceipt): TransactionReceiptWithDecodedLogs {
|
||||
|
||||
Reference in New Issue
Block a user