36550 fixed unit test

ProofOfToss · Jun 21, 2018 · 1dd4419 · 1dd4419
1 parent 091321f
commit 1dd4419
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 14 deletions.
diff --git a/scripts/app.js b/scripts/app.js
@@ -124,8 +124,8 @@ const esClient = new AwsEsPublicClient(
   await eventWatcher.initPromise;
 
   try {
-    // await eventWatcher.cacheEvents();
-    // await eventWatcher.cacheEventUpdates();
+    await eventWatcher.cacheEvents();
+    await eventWatcher.cacheEventUpdates();
 
     eventWatcher.tryWatchEvents();
     eventWatcher.tryWatchEventUpdates();

diff --git a/src/EventWatcher.js b/src/EventWatcher.js
@@ -74,7 +74,10 @@ export default class EventWatcher {
 
       eventBases[address] = Object.assign({address}, this.EventBaseConfig[address]);
 
-      eventBases[address].artifacts = require(`../build_archive/contracts/${this.EventBaseConfig[address].artifacts}`);
+      if (typeof this.EventBaseConfig[address].artifacts === 'string') {
+        eventBases[address].artifacts = require(`../build_archive/contracts/${this.EventBaseConfig[address].artifacts}`);
+      }
+
       eventBases[address].serializer = require(`../src/util/event/${this.EventBaseConfig[address].serializer}`);
 
       const EventBaseContract = contract(eventBases[address].artifacts);

diff --git a/src/util/indexingUtil.js b/src/util/indexingUtil.js
@@ -75,10 +75,6 @@ export class IndexingUtil {
     this.web3 = web3;
 
     this.forceRefresh = forceRefresh;
-
-    this.indexTags = this.indexTags.bind(this);
-    this.indexEvents = this.indexEvents.bind(this);
-    this.updateEvents = this.updateEvents.bind(this);
   }
 
   /**

diff --git a/test/eventIndexing.js b/test/eventIndexing.js
@@ -53,7 +53,7 @@ const indexingUtil = new IndexingUtil(
 const eventBaseConfig = {};
 eventBaseConfig[EventBase.address] = {
   "expired": false,
-    "artifacts": "EventBaseV1.json",
+    "artifacts": EventBase,
     "indexer": "eventIndexerV1",
     "serializer": "eventSerializerV1"
 };
@@ -64,13 +64,13 @@ const eventWatcher = new EventWatcher(
   BET_INDEX,
   esClient,
   logger,
-  Main.web3,
+  EventBase.web3,
   {
-    provider: Main.web3.currentProvider,
-    network_id: Main.network_id,
-    from: Main.defaults.from,
-    gas: Main.defaults.gas,
-    gasPrice: Main.defaults.gasPrice,
+    provider: EventBase.web3.currentProvider,
+    network_id: EventBase.network_id,
+    from: EventBase.defaults.from,
+    gas: EventBase.defaults.gas,
+    gasPrice: EventBase.defaults.gasPrice,
   },
   {
     Token,