Move event watcher to util (#262)

packages/erc20-watcher/src/cli/reset-cmds/watcher.ts

@@ -21,5 +21,6 @@ export const handler = async (argv: any): Promise<void> => {
   const resetWatcherCmd = new ResetWatcherCmd();
   await resetWatcherCmd.init(argv, Database);
   await resetWatcherCmd.initIndexer(Indexer);
+
   await resetWatcherCmd.exec();
 };

packages/erc20-watcher/src/cli/watch-contract.ts

@@ -16,6 +16,7 @@ const main = async (): Promise<void> => {
   const watchContractCmd = new WatchContractCmd();
   await watchContractCmd.init(Database);
   await watchContractCmd.initIndexer(Indexer);
+
   await watchContractCmd.exec();
 };
 

packages/erc20-watcher/src/events.ts

@@ -1,70 +0,0 @@
-//
-// Copyright 2021 Vulcanize, Inc.
-//
-
-import assert from 'assert';
-import { PubSub } from 'graphql-subscriptions';
-
-import { EthClient } from '@cerc-io/ipld-eth-client';
-import {
-  JobQueue,
-  EventWatcher as BaseEventWatcher,
-  EventWatcherInterface,
-  QUEUE_BLOCK_PROCESSING,
-  QUEUE_EVENT_PROCESSING,
-  IndexerInterface
-} from '@cerc-io/util';
-
-import { Indexer } from './indexer';
-
-export class EventWatcher implements EventWatcherInterface {
-  _ethClient: EthClient
-  _indexer: Indexer
-  _subscription: ZenObservable.Subscription | undefined
-  _baseEventWatcher: BaseEventWatcher
-  _pubsub: PubSub
-  _jobQueue: JobQueue
-
-  constructor (ethClient: EthClient, indexer: IndexerInterface, pubsub: PubSub, jobQueue: JobQueue) {
-    assert(ethClient);
-    assert(indexer);
-
-    this._ethClient = ethClient;
-    this._indexer = indexer as Indexer;
-    this._pubsub = pubsub;
-    this._jobQueue = jobQueue;
-    this._baseEventWatcher = new BaseEventWatcher(this._ethClient, this._indexer, this._pubsub, this._jobQueue);
-  }
-
-  getEventIterator (): AsyncIterator<any> {
-    return this._baseEventWatcher.getEventIterator();
-  }
-
-  getBlockProgressEventIterator (): AsyncIterator<any> {
-    return this._baseEventWatcher.getBlockProgressEventIterator();
-  }
-
-  async start (): Promise<void> {
-    assert(!this._subscription, 'subscription already started');
-
-    await this.initBlockProcessingOnCompleteHandler();
-    await this.initEventProcessingOnCompleteHandler();
-    this._baseEventWatcher.startBlockProcessing();
-  }
-
-  async stop (): Promise<void> {
-    this._baseEventWatcher.stop();
-  }
-
-  async initBlockProcessingOnCompleteHandler (): Promise<void> {
-    this._jobQueue.onComplete(QUEUE_BLOCK_PROCESSING, async (job) => {
-      await this._baseEventWatcher.blockProcessingCompleteHandler(job);
-    });
-  }
-
-  async initEventProcessingOnCompleteHandler (): Promise<void> {
-    await this._jobQueue.onComplete(QUEUE_EVENT_PROCESSING, async (job) => {
-      await this._baseEventWatcher.eventProcessingCompleteHandler(job);
-    });
-  }
-}

packages/erc20-watcher/src/fill.ts

@@ -9,14 +9,13 @@ import { FillCmd } from '@cerc-io/cli';
 
 import { Database } from './database';
 import { Indexer } from './indexer';
-import { EventWatcher } from './events';
 
 const log = debug('vulcanize:fill');
 
 export const main = async (): Promise<any> => {
   const fillCmd = new FillCmd();
   await fillCmd.init(Database);
-  await fillCmd.initIndexer(Indexer, EventWatcher);
+  await fillCmd.initIndexer(Indexer);
   await fillCmd.exec();
 };
 

packages/erc20-watcher/src/resolvers.ts

@@ -6,17 +6,15 @@ import assert from 'assert';
 import BigInt from 'apollo-type-bigint';
 import debug from 'debug';
 
-import { EventWatcherInterface, IndexerInterface, ValueResult } from '@cerc-io/util';
+import { EventWatcher, IndexerInterface, ValueResult } from '@cerc-io/util';
 
 import { Indexer } from './indexer';
-import { EventWatcher } from './events';
 import { CONTRACT_KIND } from './utils/index';
 
 const log = debug('vulcanize:resolver');
 
-export const createResolvers = async (indexerArg: IndexerInterface, eventWatcherArg: EventWatcherInterface): Promise<any> => {
+export const createResolvers = async (indexerArg: IndexerInterface, eventWatcher: EventWatcher): Promise<any> => {
   const indexer = indexerArg as Indexer;
-  const eventWatcher = eventWatcherArg as EventWatcher;
 
   return {
     BigInt: new BigInt('bigInt'),

packages/erc20-watcher/src/server.ts

@@ -13,14 +13,13 @@ import typeDefs from './schema';
 import { createResolvers } from './resolvers';
 import { Indexer } from './indexer';
 import { Database } from './database';
-import { EventWatcher } from './events';
 
 const log = debug('vulcanize:server');
 
 export const main = async (): Promise<any> => {
   const serverCmd = new ServerCmd();
   await serverCmd.init(Database);
-  await serverCmd.initIndexer(Indexer, EventWatcher);
+  await serverCmd.initIndexer(Indexer);
 
   return serverCmd.exec(createResolvers, typeDefs);
 };