Skip to content
Snippets Groups Projects
Commit 59e14fbe authored by Bartek Wrona's avatar Bartek Wrona
Browse files

Merge branch 'dk-issue-3-filtered-vops' of...

Merge branch 'dk-issue-3-filtered-vops' of gitlab.syncad.com:blocktrades/hivemind into dk-issue-3-filtered-vops

 Conflicts:
	hive/steem/client.py
parents 93ccb68e 98969bb3
No related branches found
No related tags found
5 merge requests!456Release candidate v1 24,!230Setup monitoring with pghero,!135Enable postgres monitoring on CI server,!16Dk issue 3 concurrent block query rebase,!15Dk issue 3 concurrent block query
...@@ -107,7 +107,7 @@ class Blocks: ...@@ -107,7 +107,7 @@ class Blocks:
val = {'hbd_payout':op_value['hbd_payout'], 'hive_payout':op_value['hive_payout'], 'vesting_payout':op_value['vesting_payout']} val = {'hbd_payout':op_value['hbd_payout'], 'hive_payout':op_value['hive_payout'], 'vesting_payout':op_value['vesting_payout']}
elif op_type == 'comment_reward_operation': elif op_type == 'comment_reward_operation':
if('payout' not in op_value or op_value['payout'] is None): if('payout' not in op_value or op_value['payout'] is None):
logger.error("Broken op: `{}'".format(str(op))) log.error("Broken op: `{}'".format(str(vop)))
key = "{}/{}".format(op_value['author'], op_value['permlink']) key = "{}/{}".format(op_value['author'], op_value['permlink'])
val = {'payout':op_value['payout'], 'author_rewards':op_value['author_rewards']} val = {'payout':op_value['payout'], 'author_rewards':op_value['author_rewards']}
elif op_type == 'effective_comment_vote_operation': elif op_type == 'effective_comment_vote_operation':
......
...@@ -40,10 +40,11 @@ def print_ops_stats(prefix, ops_stats): ...@@ -40,10 +40,11 @@ def print_ops_stats(prefix, ops_stats):
log.info("`{}': {}".format(k, v)) log.info("`{}': {}".format(k, v))
log.info("############################################################################") log.info("############################################################################")
def prepare_vops(vops_by_block): def prepare_vops(vops_by_block):
preparedVops = {} preparedVops = {}
for blockNum, blockDict in vops_by_block.items():
for blockNum, blockDict in vops_by_block.items():
vopsList = blockDict['ops'] vopsList = blockDict['ops']
date = blockDict['timestamp'] date = blockDict['timestamp']
preparedVops[blockNum] = Blocks.prepare_vops(vopsList, date) preparedVops[blockNum] = Blocks.prepare_vops(vopsList, date)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment