Fix codegen for creating subgraph watcher for Sushiswap (#432)

* Fix EthClient import in codegen and graph-node package

* Fix codegen for resolving common events between contracts

packages/graph-node/src/watcher.ts

@@ -11,7 +11,6 @@ import { ContractInterface, utils, providers } from 'ethers';
 import { SelectionNode } from 'graphql';
 
 import { ResultObject } from '@cerc-io/assemblyscript/lib/loader';
-import { EthClient } from '@cerc-io/ipld-eth-client';
 import {
   getFullBlock,
   BlockHeight,
@@ -27,6 +26,7 @@ import {
   createEvent,
   getSubgraphConfig,
   Transaction,
+  EthClient,
   DEFAULT_LIMIT
 } from '@cerc-io/util';
 

packages/graph-node/test/utils/indexer.ts

@@ -16,9 +16,9 @@ import {
   StateInterface,
   getResultEvent,
   ResultEvent,
-  StateKind
+  StateKind,
+  EthClient
 } from '@cerc-io/util';
-import { EthClient } from '@cerc-io/ipld-eth-client';
 import { GetStorageAt, getStorageValue, MappingKey, StorageLayout } from '@cerc-io/solidity-mapper';
 
 export class Indexer implements IndexerInterface {