diff options
| author | Leonid Logvinov <logvinov.leon@gmail.com> | 2018-07-05 22:51:37 +0800 |
|---|---|---|
| committer | Leonid Logvinov <logvinov.leon@gmail.com> | 2018-07-05 22:51:37 +0800 |
| commit | b87e48c113cffb08f5b3e8a262ff3ab8dfe57c70 (patch) | |
| tree | 6c0f055364ad8b10ff4ef2b292fe50af959e97f4 | |
| parent | efc3536283b57122d5cc57bd1b7f42a49d6e2a48 (diff) | |
| download | dexon-sol-tools-b87e48c113cffb08f5b3e8a262ff3ab8dfe57c70.tar dexon-sol-tools-b87e48c113cffb08f5b3e8a262ff3ab8dfe57c70.tar.gz dexon-sol-tools-b87e48c113cffb08f5b3e8a262ff3ab8dfe57c70.tar.bz2 dexon-sol-tools-b87e48c113cffb08f5b3e8a262ff3ab8dfe57c70.tar.lz dexon-sol-tools-b87e48c113cffb08f5b3e8a262ff3ab8dfe57c70.tar.xz dexon-sol-tools-b87e48c113cffb08f5b3e8a262ff3ab8dfe57c70.tar.zst dexon-sol-tools-b87e48c113cffb08f5b3e8a262ff3ab8dfe57c70.zip | |
Fix merge conflicts
| -rw-r--r-- | packages/contract-wrappers/src/contract_wrappers/contract_wrapper.ts | 2 | ||||
| -rw-r--r-- | packages/contract-wrappers/test/erc20_wrapper_test.ts | 12 |
2 files changed, 3 insertions, 11 deletions
diff --git a/packages/contract-wrappers/src/contract_wrappers/contract_wrapper.ts b/packages/contract-wrappers/src/contract_wrappers/contract_wrapper.ts index b8ca4d29b..9688edce2 100644 --- a/packages/contract-wrappers/src/contract_wrappers/contract_wrapper.ts +++ b/packages/contract-wrappers/src/contract_wrappers/contract_wrapper.ts @@ -32,7 +32,7 @@ export abstract class ContractWrapper { public abstract abi: ContractAbi; protected _web3Wrapper: Web3Wrapper; protected _networkId: number; - private _blockAndLogStreamerIfExists: BlockAndLogStreamer<Block, Log> | undefined; + private _blockAndLogStreamerIfExists: BlockAndLogStreamer | undefined; private _blockPollingIntervalMs: number; private _blockAndLogStreamIntervalIfExists?: NodeJS.Timer; private _filters: { [filterToken: string]: FilterObject }; diff --git a/packages/contract-wrappers/test/erc20_wrapper_test.ts b/packages/contract-wrappers/test/erc20_wrapper_test.ts index ae47a11ad..0011508e0 100644 --- a/packages/contract-wrappers/test/erc20_wrapper_test.ts +++ b/packages/contract-wrappers/test/erc20_wrapper_test.ts @@ -528,11 +528,7 @@ describe('ERC20Wrapper', () => { it('Outstanding subscriptions are cancelled when contractWrappers.setProvider called', (done: DoneCallback) => { (async () => { const callbackNeverToBeCalled = callbackErrorReporter.reportNodeCallbackErrors(done)( -<<<<<<< HEAD:packages/contract-wrappers/test/erc20_wrapper_test.ts - (logEvent: DecodedLogEvent<ERC20TokenApprovalEventArgs>) => { -======= - (_logEvent: DecodedLogEvent<ApprovalContractEventArgs>) => { ->>>>>>> v2-prototype:packages/contract-wrappers/test/token_wrapper_test.ts + (_logEvent: DecodedLogEvent<ERC20TokenApprovalEventArgs>) => { done(new Error('Expected this subscription to have been cancelled')); }, ); @@ -561,11 +557,7 @@ describe('ERC20Wrapper', () => { it('Should cancel subscription when unsubscribe called', (done: DoneCallback) => { (async () => { const callbackNeverToBeCalled = callbackErrorReporter.reportNodeCallbackErrors(done)( -<<<<<<< HEAD:packages/contract-wrappers/test/erc20_wrapper_test.ts - (logEvent: DecodedLogEvent<ERC20TokenApprovalEventArgs>) => { -======= - (_logEvent: DecodedLogEvent<ApprovalContractEventArgs>) => { ->>>>>>> v2-prototype:packages/contract-wrappers/test/token_wrapper_test.ts + (_logEvent: DecodedLogEvent<ERC20TokenApprovalEventArgs>) => { done(new Error('Expected this subscription to have been cancelled')); }, ); |