From 14a2c13a06ce2568835f1a8e8f44aa3379415a9a Mon Sep 17 00:00:00 2001 From: Rodolphe Marques Date: Wed, 14 Dec 2016 13:12:47 +0100 Subject: [PATCH] Removed get_old_transactions Fixed tests. --- bigchaindb/backend/query.py | 15 --------------- bigchaindb/backend/rethinkdb/query.py | 11 ----------- bigchaindb/core.py | 12 ------------ bigchaindb/pipelines/block.py | 3 +-- tests/backend/test_generics.py | 1 - 5 files changed, 1 insertion(+), 41 deletions(-) diff --git a/bigchaindb/backend/query.py b/bigchaindb/backend/query.py index 930fb3e1..88f215c4 100644 --- a/bigchaindb/backend/query.py +++ b/bigchaindb/backend/query.py @@ -318,18 +318,3 @@ def get_unvoted_blocks(connection, node_pubkey): """ raise NotImplementedError - - -@singledispatch -def get_old_transactions(connection, node_pubkey): - """Return all the transactions from the backlog that have not been - processed by the specified node. - - Args: - node_pubkey (str): base58 encoded public key - - Returns: - :obj:`list` of :obj:`dict`: a list of unprocessed transactions - """ - - raise NotImplementedError diff --git a/bigchaindb/backend/rethinkdb/query.py b/bigchaindb/backend/rethinkdb/query.py index 61f008c2..8fa6a512 100644 --- a/bigchaindb/backend/rethinkdb/query.py +++ b/bigchaindb/backend/rethinkdb/query.py @@ -244,14 +244,3 @@ def get_unvoted_blocks(connection, node_pubkey): # database level. Solving issue #444 can help untangling the situation unvoted_blocks = filter(lambda block: not util.is_genesis_block(block), unvoted) return unvoted_blocks - - -@register_query(RethinkDBConnection) -def get_old_transactions(connection, node_pubkey): - return connection.run( - r.table('backlog') - .between([node_pubkey, r.minval], - [node_pubkey, r.maxval], - index='assignee__transaction_timestamp') - .order_by(index=r.asc('assignee__transaction_timestamp')) - ) diff --git a/bigchaindb/core.py b/bigchaindb/core.py index 5a61f117..f0e1b89c 100644 --- a/bigchaindb/core.py +++ b/bigchaindb/core.py @@ -676,15 +676,3 @@ class Bigchain(object): return Bigchain.BLOCK_INVALID else: return Bigchain.BLOCK_UNDECIDED - - def get_old_transactions(self): - """Return all the transactions from the backlog that have not been - processed by the specified node. - - Args: - node_pubkey (str): base58 encoded public key - - Returns: - :obj:`list` of :obj:`dict`: a list of unprocessed transactions - """ - return backend.query.get_old_transactions(self.connection, self.me) diff --git a/bigchaindb/pipelines/block.py b/bigchaindb/pipelines/block.py index b8fcfa30..d5c81741 100644 --- a/bigchaindb/pipelines/block.py +++ b/bigchaindb/pipelines/block.py @@ -157,8 +157,7 @@ def create_pipeline(): def get_changefeed(): connection = backend.connect(**bigchaindb.config['database']) return backend.get_changefeed(connection, 'backlog', - ChangeFeed.INSERT | ChangeFeed.UPDATE, - prefeed=initial()) + ChangeFeed.INSERT | ChangeFeed.UPDATE) def start(): diff --git a/tests/backend/test_generics.py b/tests/backend/test_generics.py index d2d29921..f9a76e6d 100644 --- a/tests/backend/test_generics.py +++ b/tests/backend/test_generics.py @@ -37,7 +37,6 @@ def test_schema(schema_func_name, args_qty): ('get_votes_by_block_id_and_voter', 2), ('update_transaction', 2), ('get_transaction_from_block', 2), - ('get_old_transactions', 1), )) def test_query(query_func_name, args_qty): from bigchaindb.backend import query