From 9033ba76f85aeb8e0cb6d0a10efaad34e081af3e Mon Sep 17 00:00:00 2001 From: Rodolphe Marques Date: Mon, 3 Jul 2017 14:30:19 +0200 Subject: [PATCH] Remove unnecessary output_has_owner method. - Refactor the code --- bigchaindb/fastquery.py | 5 +++-- bigchaindb/utils.py | 5 ----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/bigchaindb/fastquery.py b/bigchaindb/fastquery.py index 985b758e..e0431a71 100644 --- a/bigchaindb/fastquery.py +++ b/bigchaindb/fastquery.py @@ -1,4 +1,4 @@ -from bigchaindb.utils import output_has_owner +from bigchaindb.utils import condition_details_has_owner from bigchaindb.backend import query from bigchaindb.common.transaction import TransactionLink @@ -52,7 +52,8 @@ class FastQuery: return [TransactionLink(tx['id'], index) for tx in txs for index, output in enumerate(tx['outputs']) - if output_has_owner(output, public_key)] + if condition_details_has_owner(output['condition']['details'], + public_key)] def filter_spent_outputs(self, outputs): """ diff --git a/bigchaindb/utils.py b/bigchaindb/utils.py index 56bd6259..03651f8e 100644 --- a/bigchaindb/utils.py +++ b/bigchaindb/utils.py @@ -113,11 +113,6 @@ def condition_details_has_owner(condition_details, owner): return False -def output_has_owner(output, owner): - return condition_details_has_owner(output['condition']['details'], owner) - # TODO raise proper exception, e.g. invalid tx payload? - - def is_genesis_block(block): """Check if the block is the genesis block.