aboutsummaryrefslogtreecommitdiffstats
path: root/packages/0x.js
diff options
context:
space:
mode:
authorLeonid Logvinov <logvinov.leon@gmail.com>2017-11-28 06:03:57 +0800
committerLeonid Logvinov <logvinov.leon@gmail.com>2017-11-28 06:03:57 +0800
commit32867c9a07fc7c833ff8491ec4feea8c783e7f4d (patch)
tree69be48f0ca710eb70221a542f662d283e9a8215b /packages/0x.js
parentcf0a8b2d0503f9d08ac789024d44b196613ecdc3 (diff)
downloaddexon-0x-contracts-32867c9a07fc7c833ff8491ec4feea8c783e7f4d.tar.gz
dexon-0x-contracts-32867c9a07fc7c833ff8491ec4feea8c783e7f4d.tar.zst
dexon-0x-contracts-32867c9a07fc7c833ff8491ec4feea8c783e7f4d.zip
Fix merge conflicts
Diffstat (limited to 'packages/0x.js')
-rw-r--r--packages/0x.js/src/contract_wrappers/contract_wrapper.ts2
-rw-r--r--packages/0x.js/src/contract_wrappers/exchange_wrapper.ts8
-rw-r--r--packages/0x.js/test/exchange_transfer_simulator_test.ts7
-rw-r--r--packages/0x.js/test/order_validation_test.ts7
4 files changed, 7 insertions, 17 deletions
diff --git a/packages/0x.js/src/contract_wrappers/contract_wrapper.ts b/packages/0x.js/src/contract_wrappers/contract_wrapper.ts
index 395d974b2..8c92931b4 100644
--- a/packages/0x.js/src/contract_wrappers/contract_wrapper.ts
+++ b/packages/0x.js/src/contract_wrappers/contract_wrapper.ts
@@ -153,7 +153,7 @@ export class ContractWrapper {
// We need to coerce to Block type cause Web3.Block includes types for mempool blocks
if (!_.isUndefined(this._blockAndLogStreamer)) {
// If we clear the interval while fetching the block - this._blockAndLogStreamer will be undefined
- this._blockAndLogStreamer.reconcileNewBlock(latestBlock as any as Block);
+ await this._blockAndLogStreamer.reconcileNewBlock(latestBlock as any as Block);
}
} catch (err) {
const filterTokens = _.keys(this._filterCallbacks);
diff --git a/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts b/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts
index cd38c78fc..91b41c4a4 100644
--- a/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts
+++ b/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts
@@ -5,6 +5,7 @@ import * as Web3 from 'web3';
import {artifacts} from '../artifacts';
import {
+ BlockParamLiteral,
DecodedLogArgs,
ECSignature,
EventCallback,
@@ -26,10 +27,9 @@ import {
OrderTransactionOpts,
OrderValues,
RawLog,
- EventCallback,
- ExchangeContractEventArgs,
- DecodedLogArgs,
- BlockParamLiteral,
+ SignedOrder,
+ SubscriptionOpts,
+ ValidateOrderFillableOpts,
} from '../types';
import {AbiDecoder} from '../utils/abi_decoder';
import {assert} from '../utils/assert';
diff --git a/packages/0x.js/test/exchange_transfer_simulator_test.ts b/packages/0x.js/test/exchange_transfer_simulator_test.ts
index 82cd54a34..a1d9bdade 100644
--- a/packages/0x.js/test/exchange_transfer_simulator_test.ts
+++ b/packages/0x.js/test/exchange_transfer_simulator_test.ts
@@ -2,12 +2,7 @@ import BigNumber from 'bignumber.js';
import * as chai from 'chai';
import {ExchangeContractErrs, Token, ZeroEx} from '../src';
-import {TradeSide, TransferType} from '../src/types';
-import {chaiSetup} from './utils/chai_setup';
-import {web3Factory} from './utils/web3_factory';
-import {ZeroEx, ExchangeContractErrs, Token} from '../src';
-import {TradeSide, TransferType, BlockParamLiteral} from '../src/types';
-import {BlockchainLifecycle} from './utils/blockchain_lifecycle';
+import {BlockParamLiteral, TradeSide, TransferType} from '../src/types';
import {ExchangeTransferSimulator} from '../src/utils/exchange_transfer_simulator';
import {BlockchainLifecycle} from './utils/blockchain_lifecycle';
diff --git a/packages/0x.js/test/order_validation_test.ts b/packages/0x.js/test/order_validation_test.ts
index 3725c85da..d585c1f3c 100644
--- a/packages/0x.js/test/order_validation_test.ts
+++ b/packages/0x.js/test/order_validation_test.ts
@@ -4,15 +4,10 @@ import * as Sinon from 'sinon';
import * as Web3 from 'web3';
import {ExchangeContractErrs, SignedOrder, Token, ZeroEx, ZeroExError} from '../src';
-import {TradeSide, TransferType} from '../src/types';
+import {BlockParamLiteral, TradeSide, TransferType} from '../src/types';
import {ExchangeTransferSimulator} from '../src/utils/exchange_transfer_simulator';
import {OrderValidationUtils} from '../src/utils/order_validation_utils';
-import {chaiSetup} from './utils/chai_setup';
-import {web3Factory} from './utils/web3_factory';
-import {ZeroEx, SignedOrder, Token, ExchangeContractErrs, ZeroExError} from '../src';
-import {TradeSide, TransferType, BlockParamLiteral} from '../src/types';
-import {TokenUtils} from './utils/token_utils';
import {BlockchainLifecycle} from './utils/blockchain_lifecycle';
import {chaiSetup} from './utils/chai_setup';
import {constants} from './utils/constants';