mirror of
https://github.com/bigchaindb/bigchaindb.git
synced 2024-06-28 08:37:45 +02:00
cleanup; remove transaction_exists and has_transaction
This commit is contained in:
parent
fc2b684f32
commit
6e7534d3c2
|
@ -212,13 +212,6 @@ def get_block(conn, block_id):
|
||||||
projection={'_id': False}))
|
projection={'_id': False}))
|
||||||
|
|
||||||
|
|
||||||
@register_query(MongoDBConnection)
|
|
||||||
def has_transaction(conn, transaction_id):
|
|
||||||
return bool(conn.run(
|
|
||||||
conn.collection('bigchain')
|
|
||||||
.find_one({'block.transactions.id': transaction_id})))
|
|
||||||
|
|
||||||
|
|
||||||
@register_query(MongoDBConnection)
|
@register_query(MongoDBConnection)
|
||||||
def count_blocks(conn):
|
def count_blocks(conn):
|
||||||
return conn.run(
|
return conn.run(
|
||||||
|
|
|
@ -211,20 +211,6 @@ def get_block(connection, block_id):
|
||||||
raise NotImplementedError
|
raise NotImplementedError
|
||||||
|
|
||||||
|
|
||||||
@singledispatch
|
|
||||||
def has_transaction(connection, transaction_id):
|
|
||||||
"""Check if a transaction exists in the bigchain table.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
transaction_id (str): the id of the transaction to check.
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
``True`` if the transaction exists, ``False`` otherwise.
|
|
||||||
"""
|
|
||||||
|
|
||||||
raise NotImplementedError
|
|
||||||
|
|
||||||
|
|
||||||
@singledispatch
|
@singledispatch
|
||||||
def count_blocks(connection):
|
def count_blocks(connection):
|
||||||
"""Count the number of blocks in the bigchain table.
|
"""Count the number of blocks in the bigchain table.
|
||||||
|
|
|
@ -158,13 +158,6 @@ def get_block(connection, block_id):
|
||||||
return connection.run(r.table('bigchain').get(block_id))
|
return connection.run(r.table('bigchain').get(block_id))
|
||||||
|
|
||||||
|
|
||||||
@register_query(RethinkDBConnection)
|
|
||||||
def has_transaction(connection, transaction_id):
|
|
||||||
return bool(connection.run(
|
|
||||||
r.table('bigchain', read_mode=READ_MODE)
|
|
||||||
.get_all(transaction_id, index='transaction_id').count()))
|
|
||||||
|
|
||||||
|
|
||||||
@register_query(RethinkDBConnection)
|
@register_query(RethinkDBConnection)
|
||||||
def count_blocks(connection):
|
def count_blocks(connection):
|
||||||
return connection.run(
|
return connection.run(
|
||||||
|
|
|
@ -542,9 +542,6 @@ class Bigchain(object):
|
||||||
|
|
||||||
return backend.query.write_block(self.connection, block)
|
return backend.query.write_block(self.connection, block)
|
||||||
|
|
||||||
def transaction_exists(self, transaction_id):
|
|
||||||
return backend.query.has_transaction(self.connection, transaction_id)
|
|
||||||
|
|
||||||
def prepare_genesis_block(self):
|
def prepare_genesis_block(self):
|
||||||
"""Prepare a genesis block."""
|
"""Prepare a genesis block."""
|
||||||
|
|
||||||
|
|
|
@ -248,19 +248,6 @@ def test_get_block(signed_create_tx):
|
||||||
assert block_db == block.to_dict()
|
assert block_db == block.to_dict()
|
||||||
|
|
||||||
|
|
||||||
def test_has_transaction(signed_create_tx):
|
|
||||||
from bigchaindb.backend import connect, query
|
|
||||||
from bigchaindb.models import Block
|
|
||||||
conn = connect()
|
|
||||||
|
|
||||||
# create and insert block
|
|
||||||
block = Block(transactions=[signed_create_tx])
|
|
||||||
conn.db.bigchain.insert_one(block.to_dict())
|
|
||||||
|
|
||||||
assert query.has_transaction(conn, signed_create_tx.id)
|
|
||||||
assert query.has_transaction(conn, 'aaa') is False
|
|
||||||
|
|
||||||
|
|
||||||
def test_count_blocks(signed_create_tx):
|
def test_count_blocks(signed_create_tx):
|
||||||
from bigchaindb.backend import connect, query
|
from bigchaindb.backend import connect, query
|
||||||
from bigchaindb.models import Block
|
from bigchaindb.models import Block
|
||||||
|
|
|
@ -29,7 +29,6 @@ def test_schema(schema_func_name, args_qty):
|
||||||
('get_votes_by_block_id', 1),
|
('get_votes_by_block_id', 1),
|
||||||
('write_block', 1),
|
('write_block', 1),
|
||||||
('get_block', 1),
|
('get_block', 1),
|
||||||
('has_transaction', 1),
|
|
||||||
('write_vote', 1),
|
('write_vote', 1),
|
||||||
('get_last_voted_block', 1),
|
('get_last_voted_block', 1),
|
||||||
('get_unvoted_blocks', 1),
|
('get_unvoted_blocks', 1),
|
||||||
|
|
|
@ -88,12 +88,3 @@ def test_has_previous_vote(monkeypatch):
|
||||||
block = {'votes': ({'node_pubkey': 'pubkey'},)}
|
block = {'votes': ({'node_pubkey': 'pubkey'},)}
|
||||||
with pytest.raises(Exception):
|
with pytest.raises(Exception):
|
||||||
bigchain.has_previous_vote(block)
|
bigchain.has_previous_vote(block)
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize('exists', (True, False))
|
|
||||||
def test_transaction_exists(monkeypatch, exists):
|
|
||||||
from bigchaindb.core import Bigchain
|
|
||||||
monkeypatch.setattr(
|
|
||||||
'bigchaindb.backend.query.has_transaction', lambda x, y: exists)
|
|
||||||
bigchain = Bigchain(public_key='pubkey', private_key='privkey')
|
|
||||||
assert bigchain.transaction_exists('txid') is exists
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user