Skip to content

Commit

Permalink
Fix merge/rebase regressions
Browse files Browse the repository at this point in the history
  • Loading branch information
cgewecke committed Jun 16, 2020
1 parent e2bc557 commit 7432e40
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
3 changes: 1 addition & 2 deletions packages/web3-core/types/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
*/

import * as net from 'net';
import { EventEmitter } from "events"
import {
HttpProviderBase,
HttpProviderOptions,
Expand Down Expand Up @@ -432,7 +431,7 @@ export interface AbstractProvider {
send?(payload: JsonRpcPayload, callback: (error: Error | null, result?: JsonRpcResponse) => void): void;
request?(args: RequestArguments): Promise<any>;
connected?: boolean;
}
}

export type provider =
| HttpProvider
Expand Down
4 changes: 1 addition & 3 deletions packages/web3-eth-contract/types/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,7 @@ export class Contract {

deploy(options: DeployOptions): ContractSendMethod;

methods: {
[key: string]: ContractSendMethod;
};
methods: any;

once(
event: string,
Expand Down

0 comments on commit 7432e40

Please sign in to comment.