Mirroristas/bigchaindb
2
0
Fork 0
mirror of https://github.com/bigchaindb/bigchaindb.git synced 2024-10-13 13:34:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolve forgotten conflict in utils

Browse Source
This commit is contained in:
tim 2016-10-04 17:03:01 +02:00
parent 7715bbc807
commit 48c657e2f2
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bigchaindb/util.py
View File

@ -152,12 +152,8 @@ def is_genesis_block(block):
# we cannot have empty blocks, there will always be at least one # we cannot have empty blocks, there will always be at least one
# element in the list so we can safely refer to it # element in the list so we can safely refer to it
<<<<<<< e00a34e943b596c2302d3911929c052767008611
# TODO: Remove this try-except and only handle `Block` as input # TODO: Remove this try-except and only handle `Block` as input
try: try:
return block.transactions[0].operation == 'GENESIS' return block.transactions[0].operation == 'GENESIS'
except AttributeError: except AttributeError:
return block['block']['transactions'][0]['transaction']['operation'] == 'GENESIS' return block['block']['transactions'][0]['transaction']['operation'] == 'GENESIS'
=======
return block['block']['transactions'][0]['transaction']['operation'] == 'GENESIS'
>>>>>>> Remove unnecessart database queries in get_asset_id