From 60575efc66b75b05a8fd82bfaa049bafb8e46c38 Mon Sep 17 00:00:00 2001
From: haad <haad@haja.io>
Date: Wed, 18 Jul 2018 12:59:56 +0300
Subject: [PATCH] Use latest orbit-db-store

Also add try/catch to catch assertion errors in replication tests that weren't caught before.
---
 package.json           |  2 +-
 test/replicate.test.js | 26 ++++++++++++++++----------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index ed23764..d6edfc3 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
     "orbit-db-keystore": "~0.1.0",
     "orbit-db-kvstore": "~1.4.0",
     "orbit-db-pubsub": "~0.5.5",
-    "orbit-db-store": "~2.5.0"
+    "orbit-db-store": "~2.5.2"
   },
   "devDependencies": {
     "babel-core": "^6.26.0",
diff --git a/test/replicate.test.js b/test/replicate.test.js
index acf63cf..f2cc354 100644
--- a/test/replicate.test.js
+++ b/test/replicate.test.js
@@ -300,15 +300,16 @@ Object.keys(testAPIs).forEach(API => {
         db2.events.on('replicated', (address, length) => {
           eventCount['replicated'] += length
           // console.log("[replicated]", '#' + eventCount['replicated'] + ':', db2.replicationStatus.progress, '/', db2.replicationStatus.max, '| Tasks (in/queued/running/out):', db2._loader.tasksRequested, '/',  db2._loader.tasksQueued,  '/', db2._loader.tasksRunning, '/', db2._loader.tasksFinished, "|")
-          assert.equal(db2.replicationStatus.progress, eventCount['replicated'])
-          assert.equal(db2.replicationStatus.max, expectedEventCount)
-
-          // Test the replicator state
-          assert.equal(db2._loader.tasksRequested >= db2.replicationStatus.progress, true)
-          assert.equal(db2._loader.tasksQueued <= db2.options.referenceCount, true)
-          assert.equal(db2.options.referenceCount, 64)
-          assert.equal(db2._loader.tasksRunning, 0)
-          assert.equal(db2._loader.tasksFinished, db2.replicationStatus.progress)
+          try {
+            // Test the replicator state
+            assert.equal(db2._loader.tasksRequested >= db2.replicationStatus.progress, true)
+            assert.equal(db2._loader.tasksQueued <= db2.options.referenceCount, true)
+            assert.equal(db2.options.referenceCount, 64)
+            assert.equal(db2._loader.tasksRunning, 0)
+            assert.equal(db2._loader.tasksFinished, db2.replicationStatus.progress)
+          } catch (e) {
+            reject(e)
+          }
 
           events.push({ 
             event: 'replicated', 
@@ -428,7 +429,12 @@ Object.keys(testAPIs).forEach(API => {
           eventCount['replicated'] += length
           const values = db2.iterator({limit: -1}).collect()
           // console.log("[replicated]", '#' + eventCount['replicated'] + ':', current, '/', total, '| Tasks (in/queued/running/out):', db2._loader.tasksRequested, '/',  db2._loader.tasksQueued,  '/', db2._loader.tasksRunning, '/', db2._loader.tasksFinished, "|", db2._loader._stats.a, db2._loader._stats.b, db2._loader._stats.c, db2._loader._stats.d)
-          assert.equal(db2.replicationStatus.progress <= db2.replicationStatus.max, true)
+          try {
+            assert.equal(db2.replicationStatus.progress <= db2.replicationStatus.max, true)
+          } catch (e) {
+            reject(e)
+          }
+
           events.push({ 
             event: 'replicated', 
             count: eventCount['replicate'],