Further merge fixes after rebase onto develop

hive/cli.py

@@ -5,8 +5,8 @@
 import os
 import logging
 import time
-from hive.db.adapter import Db
 from hive.conf import Conf
+from hive.db.adapter import Db
 from hive.utils.stats import PrometheusClient
 
 

hive/indexer/sync.py

@@ -30,6 +30,7 @@ from hive.utils.stats import BroadcastObject
 from hive.utils.communities_rank import update_communities_posts_and_rank
 
 from hive.indexer.mock_block_provider import MockBlockProvider
+from hive.indexer.mock_vops_provider import MockVopsProvider
 
 from datetime import datetime
 
@@ -137,6 +138,8 @@ def _block_consumer(node, blocksQueue, vopsQueue, is_initial_sync, lbound, uboun
     time_start = OPSM.start()
     rate = {}
 
+    rate = minmax(rate, 0, 1.0, 0)
+
     def print_summary():
         stop = OPSM.stop(time_start)
         log.info("=== TOTAL STATS ===")
@@ -301,11 +304,6 @@ class Sync:
         DbState.initialize()
         Blocks.setup_own_db_access(self._db)
 
-        # initialize mock data
-        paths = self._conf.get("mock_block_data_path")
-        for path in paths:
-          self.load_mock_data(path)
-
         # prefetch id->name and id->rank memory maps
         Accounts.load_ids()
 

scripts/ci/hive-sync.sh

@@ -27,8 +27,9 @@ EOF
         --steemd-url "${RUNNER_HIVED_URL}" \
         --prometheus-port 11011 \
         --database-url "${DATABASE_URL}" \
-        --mock-block-data-path mock_data/block_data/ \
-        --mock-vops-data-path mock_data/vops_data/ \
+        --mock-block-data-path mock_data/block_data/follow_op/mock_block_data_follow.json \
+          mock_data/block_data/community_op/mock_block_data_community.json \
+          mock_data/block_data/reblog_op/mock_block_data_reblog.json \
         --community-start-block 4999998 \
         2>&1 | tee -i hivemind-sync.log
 

scripts/ci_sync.sh

@@ -59,5 +59,6 @@ fi
 echo Attempting to starting hive sync using hived node: $HIVEMIND_SOURCE_HIVED_URL . Max sync block is: $HIVEMIND_MAX_BLOCK
 echo Attempting to access database $DB_URL
 ./$HIVE_NAME sync --pid-file hive_sync.pid --test-max-block=$HIVEMIND_MAX_BLOCK --test-profile=False --steemd-url "$HIVEMIND_SOURCE_HIVED_URL" --prometheus-port 11011 \
-  --database-url $DB_URL --mock-block-data-path mock_data/block_data/ --mock-vops-data-path mock_data/vops_data/ --community-start-block 4999998 2>&1 | tee -i hivemind-sync.log
+  --database-url $DB_URL  --mock-block-data-path mock_data/block_data/follow_op/mock_block_data_follow.json mock_data/block_data/community_op/mock_block_data_community.json mock_data/block_data/reblog_op/mock_block_data_reblog.json \
+  --community-start-block 4999998 2>&1 | tee -i hivemind-sync.log
 rm hive_sync.pid