crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix merge conflicts

Browse Source
This commit is contained in:
Leonid Logvinov 2017-11-27 16:03:57 -06:00
parent cf0a8b2d05
commit 32867c9a07
No known key found for this signature in database
GPG Key ID: 0DD294BFDE8C95D4
4 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/0x.js/src/contract_wrappers/contract_wrapper.ts
View File

@ -153,7 +153,7 @@ export class ContractWrapper {
// We need to coerce to Block type cause Web3.Block includes types for mempool blocks // We need to coerce to Block type cause Web3.Block includes types for mempool blocks
if (!_.isUndefined(this._blockAndLogStreamer)) { if (!_.isUndefined(this._blockAndLogStreamer)) {
// If we clear the interval while fetching the block - this._blockAndLogStreamer will be undefined // 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) { } catch (err) {
const filterTokens = _.keys(this._filterCallbacks); const filterTokens = _.keys(this._filterCallbacks);

8
packages/0x.js/src/contract_wrappers/exchange_wrapper.ts
View File

@ -5,6 +5,7 @@ import * as Web3 from 'web3';
import {artifacts} from '../artifacts'; import {artifacts} from '../artifacts';
import { import {
BlockParamLiteral,
DecodedLogArgs, DecodedLogArgs,
ECSignature, ECSignature,
EventCallback, EventCallback,
@ -26,10 +27,9 @@ import {
OrderTransactionOpts, OrderTransactionOpts,
OrderValues, OrderValues,
RawLog, RawLog,
EventCallback, SignedOrder,
ExchangeContractEventArgs, SubscriptionOpts,
DecodedLogArgs, ValidateOrderFillableOpts,
BlockParamLiteral,
} from '../types'; } from '../types';
import {AbiDecoder} from '../utils/abi_decoder'; import {AbiDecoder} from '../utils/abi_decoder';
import {assert} from '../utils/assert'; import {assert} from '../utils/assert';

7
packages/0x.js/test/exchange_transfer_simulator_test.ts
View File

@ -2,12 +2,7 @@ import BigNumber from 'bignumber.js';
import * as chai from 'chai'; import * as chai from 'chai';
import {ExchangeContractErrs, Token, ZeroEx} from '../src'; import {ExchangeContractErrs, Token, ZeroEx} from '../src';
import {TradeSide, TransferType} from '../src/types'; import {BlockParamLiteral, 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 {ExchangeTransferSimulator} from '../src/utils/exchange_transfer_simulator'; import {ExchangeTransferSimulator} from '../src/utils/exchange_transfer_simulator';
import {BlockchainLifecycle} from './utils/blockchain_lifecycle'; import {BlockchainLifecycle} from './utils/blockchain_lifecycle';

7
packages/0x.js/test/order_validation_test.ts
View File

@ -4,15 +4,10 @@ import * as Sinon from 'sinon';
import * as Web3 from 'web3'; import * as Web3 from 'web3';
import {ExchangeContractErrs, SignedOrder, Token, ZeroEx, ZeroExError} from '../src'; 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 {ExchangeTransferSimulator} from '../src/utils/exchange_transfer_simulator';
import {OrderValidationUtils} from '../src/utils/order_validation_utils'; 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 {BlockchainLifecycle} from './utils/blockchain_lifecycle';
import {chaiSetup} from './utils/chai_setup'; import {chaiSetup} from './utils/chai_setup';
import {constants} from './utils/constants'; import {constants} from './utils/constants';