From 04a6313223b4840fba45783311d62727ef87e2d9 Mon Sep 17 00:00:00 2001
From: Dariusz Kedzierski <dkedzierski@syncad.com>
Date: Fri, 13 Nov 2020 12:05:43 +0100
Subject: [PATCH] Revert "mock data getters in a loop are now guarded by data
check"
This reverts commit 479f6a649a0bf885cee7d54f47f13ab6cab261ad.
---
hive/indexer/mock_data_provider.py | 6 ----
hive/steem/client.py | 44 ++++++++++++++----------------
2 files changed, 21 insertions(+), 29 deletions(-)
diff --git a/hive/indexer/mock_data_provider.py b/hive/indexer/mock_data_provider.py
index df68e3fb7..4745003ad 100644
--- a/hive/indexer/mock_data_provider.py
+++ b/hive/indexer/mock_data_provider.py
@@ -5,12 +5,6 @@ class MockDataProvider():
""" Data provider for test operations """
block_data = {}
- @classmethod
- def is_data(cls):
- if cls.block_data:
- return True
- return False
-
@classmethod
def print_data(cls):
print(dumps(cls.block_data, indent=4, sort_keys=True))
diff --git a/hive/steem/client.py b/hive/steem/client.py
index e66069c0a..cb48631cc 100644
--- a/hive/steem/client.py
+++ b/hive/steem/client.py
@@ -158,15 +158,14 @@ class SteemClient:
num = int(block['block_id'][:8], base=16)
blocks[num] = block
- if MockBlockProvider.is_data():
- for block_num in block_nums:
- data = MockBlockProvider.get_block_data(block_num, True)
- if data is not None:
- if block_num in blocks:
- blocks[block_num]["transactions"].extend(data["transactions"])
- blocks[block_num]["transaction_ids"].extend(data["transaction_ids"])
- else:
- blocks[block_num] = data
+ for block_num in block_nums:
+ data = MockBlockProvider.get_block_data(block_num, True)
+ if data is not None:
+ if block_num in blocks:
+ blocks[block_num]["transactions"].extend(data["transactions"])
+ blocks[block_num]["transaction_ids"].extend(data["transaction_ids"])
+ else:
+ blocks[block_num] = data
return [blocks[x] for x in block_nums]
@@ -184,20 +183,19 @@ class SteemClient:
def enum_virtual_ops(self, conf, begin_block, end_block):
""" Get virtual ops for range of blocks """
def add_mock_vops(ret, from_block, end_block):
- if MockVopsProvider.is_data():
- for block_num in range(from_block, end_block):
- mock_vops = MockVopsProvider.get_block_data(block_num)
- if mock_vops:
- if block_num in ret:
- if 'ops_by_block' in mock_vops:
- ret[block_num]['ops'].extend([op['op'] for op in mock_vops['ops_by_block'] if op['block'] == block_num])
- if 'ops' in mock_vops:
- ret[block_num]['ops'].extend([op['op'] for op in mock_vops['ops'] if op['block'] == block_num])
- else:
- if 'ops_by_block' in mock_vops:
- ret[block_num] = {'timestamp':mock_vops['timestamp'], "ops" : [op['op'] for op in mock_vops['ops_by_block'] if op['block'] == block_num]}
- if 'ops' in mock_vops:
- ret[block_num] = {'timestamp':mock_vops['timestamp'], "ops" : [op['op'] for op in mock_vops['ops'] if op['block'] == block_num]}
+ for block_num in range(from_block, end_block):
+ mock_vops = MockVopsProvider.get_block_data(block_num)
+ if mock_vops:
+ if block_num in ret:
+ if 'ops_by_block' in mock_vops:
+ ret[block_num]['ops'].extend([op['op'] for op in mock_vops['ops_by_block'] if op['block'] == block_num])
+ if 'ops' in mock_vops:
+ ret[block_num]['ops'].extend([op['op'] for op in mock_vops['ops'] if op['block'] == block_num])
+ else:
+ if 'ops_by_block' in mock_vops:
+ ret[block_num] = {'timestamp':mock_vops['timestamp'], "ops" : [op['op'] for op in mock_vops['ops_by_block'] if op['block'] == block_num]}
+ if 'ops' in mock_vops:
+ ret[block_num] = {'timestamp':mock_vops['timestamp'], "ops" : [op['op'] for op in mock_vops['ops'] if op['block'] == block_num]}
ret = {}
--
GitLab