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
2018-07-05 16:51:37 +02:00
parent efc3536283
commit b87e48c113
2 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/contract-wrappers/src/contract_wrappers/contract_wrapper.ts
View File

@@ -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 };

12
packages/contract-wrappers/test/erc20_wrapper_test.ts
View File

@@ -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'));
},
);