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

Fixed typos

Browse Source 
Fixed failing test
This commit is contained in:
Rodolphe Marques 2016-12-08 18:41:11 +01:00
parent dbf53c80e7
commit 8266dfadb0
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bigchaindb/backend/rethinkdb/query.py
View File

@ -253,5 +253,5 @@ def get_old_transactions(connection, node_pubkey):
.between([node_pubkey, r.minval], .between([node_pubkey, r.minval],
[node_pubkey, r.maxval], [node_pubkey, r.maxval],
index='assignee__transaction_timestamp') index='assignee__transaction_timestamp')
.order_by(index=r.asc('assignee_transaction_timestamp')) .order_by(index=r.asc('assignee__transaction_timestamp'))
) )

4
bigchaindb/pipelines/block.py
View File

@ -166,8 +166,8 @@ def start():
"""Create, start, and return the block pipeline.""" """Create, start, and return the block pipeline."""
connection = connect(**bigchaindb.config['database']) connection = connect(**bigchaindb.config['database'])
changefeed = get_changefeed(connection, 'backlog', changefeed = get_changefeed(connection, 'backlog',
ChangeFeed.INSER | ChangeFeed.UPDATE, ChangeFeed.INSERT | ChangeFeed.UPDATE,
preefed=initial()) prefeed=initial())
pipeline = create_pipeline() pipeline = create_pipeline()
pipeline.setup(indata=changefeed) pipeline.setup(indata=changefeed)
pipeline.start() pipeline.start()

13
tests/pipelines/test_block_creation.py
View File

@ -95,7 +95,8 @@ def test_duplicate_transaction(b, user_pk):
# verify tx is in the backlog # verify tx is in the backlog
assert b.get_transaction(txs[0].id) is not None assert b.get_transaction(txs[0].id) is not None
# try to validate a transaction that's already in the chain; should not work # try to validate a transaction that's already in the chain; should not
# work
assert block_maker.validate_tx(txs[0].to_dict()) is None assert block_maker.validate_tx(txs[0].to_dict()) is None
# duplicate tx should be removed from backlog # duplicate tx should be removed from backlog
@ -159,9 +160,10 @@ def test_start(create_pipeline):
def test_full_pipeline(b, user_pk): def test_full_pipeline(b, user_pk):
import random import random
from bigchaindb.backend import query from bigchaindb.backend import query, get_changefeed
from bigchaindb.backend.changefeed import ChangeFeed
from bigchaindb.models import Block, Transaction from bigchaindb.models import Block, Transaction
from bigchaindb.pipelines.block import create_pipeline, get_changefeed from bigchaindb.pipelines.block import create_pipeline, initial
outpipe = Pipe() outpipe = Pipe()
# include myself here, so that some tx are actually assigned to me # include myself here, so that some tx are actually assigned to me
@ -175,8 +177,11 @@ def test_full_pipeline(b, user_pk):
assert query.count_backlog(b.connection) == 100 assert query.count_backlog(b.connection) == 100
changefeed = get_changefeed(b.connection, 'backlog',
ChangeFeed.INSERT | ChangeFeed.UPDATE,
prefeed=initial())
pipeline = create_pipeline() pipeline = create_pipeline()
pipeline.setup(indata=get_changefeed(), outdata=outpipe) pipeline.setup(indata=changefeed, outdata=outpipe)
pipeline.start() pipeline.start()
time.sleep(2) time.sleep(2)