bigchaindb
/
bigchaindb
mirror of https://github.com/bigchaindb/bigchaindb.git
1
0
Fork 0
Code Releases Activity

Rename any *util.py to *utils.py (#991)

This commit is contained in:
Brett Sun 2016-12-22 17:39:39 +01:00 committed by GitHub
parent 438958fdea
commit 8fa3245309
18 changed files with 66 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
benchmarking-tests/benchmark_utils.py
View File

@ -11,7 +11,7 @@ from os.path import expanduser
from bigchaindb.common.transaction import Transaction
from bigchaindb import Bigchain
from bigchaindb.util import ProcessGroup
from bigchaindb.utils import ProcessGroup
from bigchaindb.commands import utils

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

@ -3,7 +3,7 @@ from time import time
import rethinkdb as r
from bigchaindb import backend, util
from bigchaindb import backend, utils
from bigchaindb.common import exceptions
from bigchaindb.backend.utils import module_dispatch_registrar
from bigchaindb.backend.rethinkdb.connection import RethinkDBConnection
@ -184,7 +184,7 @@ def write_vote(connection, vote):
def get_genesis_block(connection):
return connection.run(
r.table('bigchain', read_mode=READ_MODE)
.filter(util.is_genesis_block)
.filter(utils.is_genesis_block)
.nth(0))
@ -252,5 +252,5 @@ def get_unvoted_blocks(connection, node_pubkey):
# FIXME: I (@vrde) don't like this solution. Filtering should be done at a
# database level. Solving issue #444 can help untangling the situation
unvoted_blocks = filter(lambda block: not util.is_genesis_block(block), unvoted)
unvoted_blocks = filter(lambda block: not utils.is_genesis_block(block), unvoted)
return unvoted_blocks

2
bigchaindb/commands/bigchain.py
View File

@ -21,7 +21,7 @@ import rethinkdb as r
import bigchaindb
import bigchaindb.config_utils
from bigchaindb.models import Transaction
from bigchaindb.util import ProcessGroup
from bigchaindb.utils import ProcessGroup
from bigchaindb import backend
from bigchaindb.backend import schema
from bigchaindb.commands import utils

2
bigchaindb/common/transaction.py
View File

@ -9,7 +9,7 @@ from bigchaindb.common.crypto import PrivateKey, hash_data
from bigchaindb.common.exceptions import (KeypairMismatchException,
InvalidHash, InvalidSignature,
AmountError, AssetIdMismatch)
from bigchaindb.common.util import serialize, gen_timestamp
from bigchaindb.common.utils import serialize, gen_timestamp
class Input(object):

0
bigchaindb/common/util.py → bigchaindb/common/utils.py
View File

4
bigchaindb/consensus.py
View File

@ -1,6 +1,6 @@
import logging
from bigchaindb.util import verify_vote_signature
from bigchaindb.utils import verify_vote_signature
from bigchaindb.common.schema import (SchemaValidationError,
validate_vote_schema)
@ -30,7 +30,7 @@ class BaseConsensusRules():
"""Verify the signature of a vote.
Refer to the documentation of
:func:`bigchaindb.util.verify_signature`.
:func:`bigchaindb.utils.verify_signature`.
"""
if verify_vote_signature(voters, signed_vote):
try:

8
bigchaindb/core.py
View File

@ -5,12 +5,12 @@ from time import time
from itertools import compress
from bigchaindb.common import crypto, exceptions
from bigchaindb.common.util import gen_timestamp, serialize
from bigchaindb.common.utils import gen_timestamp, serialize
from bigchaindb.common.transaction import TransactionLink
import bigchaindb
from bigchaindb import backend, config_utils, util
from bigchaindb import backend, config_utils, utils
from bigchaindb.consensus import BaseConsensusRules
from bigchaindb.models import Block, Transaction
@ -433,7 +433,7 @@ class Bigchain(object):
# for transactions with multiple `public_keys` there will be several subfulfillments nested
# in the condition. We need to iterate the subfulfillments to make sure there is a
# subfulfillment for `owner`
if util.condition_details_has_owner(output['condition']['details'], owner):
if utils.condition_details_has_owner(output['condition']['details'], owner):
tx_link = TransactionLink(tx['id'], index)
# check if input was already spent
if not self.get_spent(tx_link.txid, tx_link.output):
@ -501,7 +501,7 @@ class Bigchain(object):
.format(block_id=block_id, n_votes=str(len(votes)), me=self.me))
has_previous_vote = False
if votes:
if util.verify_vote_signature(voters, votes[0]):
if utils.verify_vote_signature(voters, votes[0]):
has_previous_vote = True
else:
raise exceptions.ImproperVoteError('Block {block_id} already has an incorrectly signed vote '

2
bigchaindb/models.py
View File

@ -5,7 +5,7 @@ from bigchaindb.common.exceptions import (InvalidHash, InvalidSignature,
TransactionNotInValidBlock,
AssetIdMismatch, AmountError)
from bigchaindb.common.transaction import Transaction
from bigchaindb.common.util import gen_timestamp, serialize
from bigchaindb.common.utils import gen_timestamp, serialize
from bigchaindb.common.schema import validate_transaction_schema

2
bigchaindb/util.py → bigchaindb/utils.py
View File

@ -4,7 +4,7 @@ import queue
import multiprocessing as mp
from bigchaindb.common import crypto
from bigchaindb.common.util import serialize
from bigchaindb.common.utils import serialize
class ProcessGroup(object):

4
bigchaindb/web/server.py
View File

@ -9,7 +9,7 @@ import multiprocessing
from flask import Flask
import gunicorn.app.base
from bigchaindb import util
from bigchaindb import utils
from bigchaindb import Bigchain
from bigchaindb.web.views.info import info_views
from bigchaindb.web.views.transactions import transaction_views
@ -66,7 +66,7 @@ def create_app(*, debug=False, threads=4):
app.debug = debug
app.config['bigchain_pool'] = util.pool(Bigchain, size=threads)
app.config['bigchain_pool'] = utils.pool(Bigchain, size=threads)
app.config['monitor'] = Monitor()
app.register_blueprint(info_views, url_prefix='/')

24
tests/common/test_transaction.py
View File

@ -289,7 +289,7 @@ def test_create_default_asset_on_tx_initialization(asset_definition):
def test_transaction_serialization(user_input, user_output, data):
from bigchaindb.common.transaction import Transaction
from .util import validate_transaction_model
from .utils import validate_transaction_model
tx_id = 'l0l'
@ -317,7 +317,7 @@ def test_transaction_serialization(user_input, user_output, data):
def test_transaction_deserialization(user_input, user_output, data):
from bigchaindb.common.transaction import Transaction
from .util import validate_transaction_model
from .utils import validate_transaction_model
expected_asset = {'data': data}
expected = Transaction(Transaction.CREATE, expected_asset, [user_input],
@ -456,7 +456,7 @@ def test_add_input_to_tx_with_invalid_parameters(asset_definition):
def test_add_output_to_tx(user_output, asset_definition):
from bigchaindb.common.transaction import Transaction
from .util import validate_transaction_model
from .utils import validate_transaction_model
tx = Transaction(Transaction.CREATE, asset_definition)
tx.add_output(user_output)
@ -486,7 +486,7 @@ def test_validate_tx_simple_create_signature(user_input, user_output, user_priv,
from copy import deepcopy
from bigchaindb.common.crypto import PrivateKey
from bigchaindb.common.transaction import Transaction
from .util import validate_transaction_model
from .utils import validate_transaction_model
tx = Transaction(Transaction.CREATE, asset_definition, [user_input], [user_output])
expected = deepcopy(user_output)
@ -546,7 +546,7 @@ def test_validate_multiple_inputs(user_input, user_output, user_priv,
from bigchaindb.common.crypto import PrivateKey
from bigchaindb.common.transaction import Transaction
from .util import validate_transaction_model
from .utils import validate_transaction_model
tx = Transaction(Transaction.CREATE, asset_definition,
[user_input, deepcopy(user_input)],
@ -585,7 +585,7 @@ def test_validate_tx_threshold_create_signature(user_user2_threshold_input,
from bigchaindb.common.crypto import PrivateKey
from bigchaindb.common.transaction import Transaction
from .util import validate_transaction_model
from .utils import validate_transaction_model
tx = Transaction(Transaction.CREATE, asset_definition,
[user_user2_threshold_input],
@ -613,7 +613,7 @@ def test_multiple_input_validation_of_transfer_tx(user_input, user_output,
from bigchaindb.common.transaction import (Transaction, TransactionLink,
Input, Output)
from cryptoconditions import Ed25519Fulfillment
from .util import validate_transaction_model
from .utils import validate_transaction_model
tx = Transaction(Transaction.CREATE, asset_definition,
[user_input, deepcopy(user_input)],
@ -657,7 +657,7 @@ def test_validate_inputs_of_transfer_tx_with_invalid_params(
def test_create_create_transaction_single_io(user_output, user_pub, data):
from bigchaindb.common.transaction import Transaction
from .util import validate_transaction_model
from .utils import validate_transaction_model
expected = {
'outputs': [user_output.to_dict()],
@ -728,7 +728,7 @@ def test_validate_multiple_io_create_transaction(user_pub, user_priv,
user2_pub, user2_priv,
asset_definition):
from bigchaindb.common.transaction import Transaction
from .util import validate_transaction_model
from .utils import validate_transaction_model
tx = Transaction.create([user_pub, user2_pub],
[([user_pub], 1), ([user2_pub], 1)],
@ -774,7 +774,7 @@ def test_create_create_transaction_threshold(user_pub, user2_pub, user3_pub,
def test_validate_threshold_create_transaction(user_pub, user_priv, user2_pub,
data, asset_definition):
from bigchaindb.common.transaction import Transaction
from .util import validate_transaction_model
from .utils import validate_transaction_model
tx = Transaction.create([user_pub], [([user_pub, user2_pub], 1)],
metadata=data)
@ -823,8 +823,8 @@ def test_create_transfer_transaction_single_io(tx, user_pub, user2_pub,
from copy import deepcopy
from bigchaindb.common.crypto import PrivateKey
from bigchaindb.common.transaction import Transaction
from bigchaindb.common.util import serialize
from .util import validate_transaction_model
from bigchaindb.common.utils import serialize
from .utils import validate_transaction_model
expected = {
'outputs': [user2_output.to_dict()],

0
tests/common/util.py → tests/common/utils.py
View File

9
tests/db/test_bigchain_api.py
View File

@ -37,7 +37,7 @@ class TestBigchainApi(object):
def test_get_last_voted_block_cyclic_blockchain(self, b, monkeypatch):
from bigchaindb.common.crypto import PrivateKey
from bigchaindb.common.exceptions import CyclicBlockchainError
from bigchaindb.common.util import serialize
from bigchaindb.common.utils import serialize
from bigchaindb.models import Transaction
tx = Transaction.create([b.me], [([b.me], 1)])
@ -688,11 +688,10 @@ class TestBlockValidation(object):
@pytest.mark.skipif(reason='Separated tx validation from block creation.')
@pytest.mark.usefixtures('inputs')
def test_invalid_transactions_in_block(self, b, user_pk):
from bigchaindb import utils
from bigchaindb.common import crypto
from bigchaindb.common.exceptions import TransactionOwnerError
from bigchaindb.common.util import gen_timestamp
from bigchaindb import util
from bigchaindb.common.utils import gen_timestamp
# invalid transaction
valid_input = b.get_owned_ids(user_pk).pop()
@ -710,7 +709,7 @@ class TestBlockValidation(object):
# NOTE: This is not the correct function anymore, but this test is
# skipped
block_data = util.serialize_block(block)
block_data = utils.serialize_block(block)
block_hash = crypto.hash_data(block_data)
block_signature = crypto.PrivateKey(b.me_private).sign(block_data)

38
tests/pipelines/test_vote.py
View File

@ -25,7 +25,7 @@ DUMMY_SHA3 = '0123456789abcdef' * 4
def test_vote_creation_valid(b):
from bigchaindb.common import crypto
from bigchaindb.common.util import serialize
from bigchaindb.common.utils import serialize
# create valid block
block = dummy_block(b)
@ -45,7 +45,7 @@ def test_vote_creation_valid(b):
def test_vote_creation_invalid(b):
from bigchaindb.common import crypto
from bigchaindb.common.util import serialize
from bigchaindb.common.utils import serialize
# create valid block
block = dummy_block(b)
@ -162,7 +162,7 @@ def test_vote_accumulates_transactions(b):
@pytest.mark.bdb
def test_valid_block_voting_sequential(b, genesis_block, monkeypatch):
from bigchaindb.backend import query
from bigchaindb.common import crypto, util
from bigchaindb.common import crypto, utils
from bigchaindb.pipelines import vote
monkeypatch.setattr('time.time', lambda: 1111111111)
@ -182,7 +182,7 @@ def test_valid_block_voting_sequential(b, genesis_block, monkeypatch):
'invalid_reason': None,
'timestamp': '1111111111'}
serialized_vote = util.serialize(vote_doc['vote']).encode()
serialized_vote = utils.serialize(vote_doc['vote']).encode()
assert vote_doc['node_pubkey'] == b.me
assert crypto.PublicKey(b.me).verify(serialized_vote,
vote_doc['signature']) is True
@ -191,7 +191,7 @@ def test_valid_block_voting_sequential(b, genesis_block, monkeypatch):
@pytest.mark.bdb
def test_valid_block_voting_multiprocessing(b, genesis_block, monkeypatch):
from bigchaindb.backend import query
from bigchaindb.common import crypto, util
from bigchaindb.common import crypto, utils
from bigchaindb.pipelines import vote
inpipe = Pipe()
@ -217,7 +217,7 @@ def test_valid_block_voting_multiprocessing(b, genesis_block, monkeypatch):
'invalid_reason': None,
'timestamp': '1111111111'}
serialized_vote = util.serialize(vote_doc['vote']).encode()
serialized_vote = utils.serialize(vote_doc['vote']).encode()
assert vote_doc['node_pubkey'] == b.me
assert crypto.PublicKey(b.me).verify(serialized_vote,
vote_doc['signature']) is True
@ -228,7 +228,7 @@ def test_valid_block_voting_with_create_transaction(b,
genesis_block,
monkeypatch):
from bigchaindb.backend import query
from bigchaindb.common import crypto, util
from bigchaindb.common import crypto, utils
from bigchaindb.models import Transaction
from bigchaindb.pipelines import vote
@ -260,7 +260,7 @@ def test_valid_block_voting_with_create_transaction(b,
'invalid_reason': None,
'timestamp': '1111111111'}
serialized_vote = util.serialize(vote_doc['vote']).encode()
serialized_vote = utils.serialize(vote_doc['vote']).encode()
assert vote_doc['node_pubkey'] == b.me
assert crypto.PublicKey(b.me).verify(serialized_vote,
vote_doc['signature']) is True
@ -270,7 +270,7 @@ def test_valid_block_voting_with_create_transaction(b,
def test_valid_block_voting_with_transfer_transactions(monkeypatch,
b, genesis_block):
from bigchaindb.backend import query
from bigchaindb.common import crypto, util
from bigchaindb.common import crypto, utils
from bigchaindb.models import Transaction
from bigchaindb.pipelines import vote
@ -316,7 +316,7 @@ def test_valid_block_voting_with_transfer_transactions(monkeypatch,
'invalid_reason': None,
'timestamp': '2222222222'}
serialized_vote = util.serialize(vote_doc['vote']).encode()
serialized_vote = utils.serialize(vote_doc['vote']).encode()
assert vote_doc['node_pubkey'] == b.me
assert crypto.PublicKey(b.me).verify(serialized_vote,
vote_doc['signature']) is True
@ -330,7 +330,7 @@ def test_valid_block_voting_with_transfer_transactions(monkeypatch,
'invalid_reason': None,
'timestamp': '2222222222'}
serialized_vote2 = util.serialize(vote2_doc['vote']).encode()
serialized_vote2 = utils.serialize(vote2_doc['vote']).encode()
assert vote2_doc['node_pubkey'] == b.me
assert crypto.PublicKey(b.me).verify(serialized_vote2,
vote2_doc['signature']) is True
@ -339,7 +339,7 @@ def test_valid_block_voting_with_transfer_transactions(monkeypatch,
@pytest.mark.bdb
def test_unsigned_tx_in_block_voting(monkeypatch, b, user_pk, genesis_block):
from bigchaindb.backend import query
from bigchaindb.common import crypto, util
from bigchaindb.common import crypto, utils
from bigchaindb.models import Transaction
from bigchaindb.pipelines import vote
@ -368,7 +368,7 @@ def test_unsigned_tx_in_block_voting(monkeypatch, b, user_pk, genesis_block):
'invalid_reason': None,
'timestamp': '1111111111'}
serialized_vote = util.serialize(vote_doc['vote']).encode()
serialized_vote = utils.serialize(vote_doc['vote']).encode()
assert vote_doc['node_pubkey'] == b.me
assert crypto.PublicKey(b.me).verify(serialized_vote,
vote_doc['signature']) is True
@ -377,7 +377,7 @@ def test_unsigned_tx_in_block_voting(monkeypatch, b, user_pk, genesis_block):
@pytest.mark.bdb
def test_invalid_id_tx_in_block_voting(monkeypatch, b, user_pk, genesis_block):
from bigchaindb.backend import query
from bigchaindb.common import crypto, util
from bigchaindb.common import crypto, utils
from bigchaindb.models import Transaction
from bigchaindb.pipelines import vote
@ -408,7 +408,7 @@ def test_invalid_id_tx_in_block_voting(monkeypatch, b, user_pk, genesis_block):
'invalid_reason': None,
'timestamp': '1111111111'}
serialized_vote = util.serialize(vote_doc['vote']).encode()
serialized_vote = utils.serialize(vote_doc['vote']).encode()
assert vote_doc['node_pubkey'] == b.me
assert crypto.PublicKey(b.me).verify(serialized_vote,
vote_doc['signature']) is True
@ -418,7 +418,7 @@ def test_invalid_id_tx_in_block_voting(monkeypatch, b, user_pk, genesis_block):
def test_invalid_content_in_tx_in_block_voting(monkeypatch, b,
user_pk, genesis_block):
from bigchaindb.backend import query
from bigchaindb.common import crypto, util
from bigchaindb.common import crypto, utils
from bigchaindb.models import Transaction
from bigchaindb.pipelines import vote
@ -449,7 +449,7 @@ def test_invalid_content_in_tx_in_block_voting(monkeypatch, b,
'invalid_reason': None,
'timestamp': '1111111111'}
serialized_vote = util.serialize(vote_doc['vote']).encode()
serialized_vote = utils.serialize(vote_doc['vote']).encode()
assert vote_doc['node_pubkey'] == b.me
assert crypto.PublicKey(b.me).verify(serialized_vote,
vote_doc['signature']) is True
@ -458,7 +458,7 @@ def test_invalid_content_in_tx_in_block_voting(monkeypatch, b,
@pytest.mark.bdb
def test_invalid_block_voting(monkeypatch, b, user_pk, genesis_block):
from bigchaindb.backend import query
from bigchaindb.common import crypto, util
from bigchaindb.common import crypto, utils
from bigchaindb.pipelines import vote
inpipe = Pipe()
@ -485,7 +485,7 @@ def test_invalid_block_voting(monkeypatch, b, user_pk, genesis_block):
'invalid_reason': None,
'timestamp': '1111111111'}
serialized_vote = util.serialize(vote_doc['vote']).encode()
serialized_vote = utils.serialize(vote_doc['vote']).encode()
assert vote_doc['node_pubkey'] == b.me
assert crypto.PublicKey(b.me).verify(serialized_vote,
vote_doc['signature']) is True

4
tests/test_consensus.py
View File

@ -2,7 +2,7 @@
def test_verify_vote_passes(b, structurally_valid_vote):
from bigchaindb.consensus import BaseConsensusRules
from bigchaindb.common import crypto
from bigchaindb.common.util import serialize
from bigchaindb.common.utils import serialize
vote_body = structurally_valid_vote['vote']
vote_data = serialize(vote_body)
signature = crypto.PrivateKey(b.me_private).sign(vote_data.encode())
@ -28,7 +28,7 @@ def test_verify_vote_fails_signature(b, structurally_valid_vote):
def test_verify_vote_fails_schema(b):
from bigchaindb.consensus import BaseConsensusRules
from bigchaindb.common import crypto
from bigchaindb.common.util import serialize
from bigchaindb.common.utils import serialize
vote_body = {}
vote_data = serialize(vote_body)
signature = crypto.PrivateKey(b.me_private).sign(vote_data.encode())

2
tests/test_core.py
View File

@ -82,7 +82,7 @@ def test_get_blocks_status_containing_tx(monkeypatch):
def test_has_previous_vote(monkeypatch):
from bigchaindb.core import Bigchain
monkeypatch.setattr(
'bigchaindb.util.verify_vote_signature', lambda voters, vote: False)
'bigchaindb.utils.verify_vote_signature', lambda voters, vote: False)
bigchain = Bigchain(public_key='pubkey', private_key='privkey')
block = {'votes': ({'node_pubkey': 'pubkey'},)}
with pytest.raises(Exception):

8
tests/test_models.py
View File

@ -38,7 +38,7 @@ class TestBlockModel(object):
def test_block_serialization(self, b):
from bigchaindb.common.crypto import hash_data
from bigchaindb.common.util import gen_timestamp, serialize
from bigchaindb.common.utils import gen_timestamp, serialize
from bigchaindb.models import Block, Transaction
transactions = [Transaction.create([b.me], [([b.me], 1)])]
@ -70,7 +70,7 @@ class TestBlockModel(object):
def test_block_deserialization(self, b):
from bigchaindb.common.crypto import hash_data
from bigchaindb.common.util import gen_timestamp, serialize
from bigchaindb.common.utils import gen_timestamp, serialize
from bigchaindb.models import Block, Transaction
transactions = [Transaction.create([b.me], [([b.me], 1)])]
@ -110,7 +110,7 @@ class TestBlockModel(object):
def test_block_invalid_signature_deserialization(self, b):
from bigchaindb.common.crypto import hash_data
from bigchaindb.common.exceptions import InvalidSignature
from bigchaindb.common.util import gen_timestamp, serialize
from bigchaindb.common.utils import gen_timestamp, serialize
from bigchaindb.models import Block, Transaction
transactions = [Transaction.create([b.me], [([b.me], 1)])]
@ -143,7 +143,7 @@ class TestBlockModel(object):
def test_sign_block(self, b):
from bigchaindb.common.crypto import PrivateKey, PublicKey
from bigchaindb.common.util import gen_timestamp, serialize
from bigchaindb.common.utils import gen_timestamp, serialize
from bigchaindb.models import Block, Transaction
transactions = [Transaction.create([b.me], [([b.me], 1)])]

16
tests/test_util.py → tests/test_utils.py
View File

@ -28,9 +28,9 @@ def mock_queue(monkeypatch):
def test_empty_pool_is_populated_with_instances(mock_queue):
from bigchaindb import util
from bigchaindb import utils
pool = util.pool(lambda: 'hello', 4)
pool = utils.pool(lambda: 'hello', 4)
assert len(mock_queue.items) == 0
@ -56,9 +56,9 @@ def test_empty_pool_is_populated_with_instances(mock_queue):
def test_pool_blocks_if_no_instances_available(mock_queue):
from bigchaindb import util
from bigchaindb import utils
pool = util.pool(lambda: 'hello', 4)
pool = utils.pool(lambda: 'hello', 4)
assert len(mock_queue.items) == 0
@ -94,9 +94,9 @@ def test_pool_blocks_if_no_instances_available(mock_queue):
def test_pool_raises_empty_exception_when_timeout(mock_queue):
from bigchaindb import util
from bigchaindb import utils
pool = util.pool(lambda: 'hello', 1, timeout=1)
pool = utils.pool(lambda: 'hello', 1, timeout=1)
assert len(mock_queue.items) == 0
@ -114,7 +114,7 @@ def test_pool_raises_empty_exception_when_timeout(mock_queue):
@patch('multiprocessing.Process')
def test_process_group_instantiates_and_start_processes(mock_process):
from bigchaindb.util import ProcessGroup
from bigchaindb.utils import ProcessGroup
def noop():
pass
@ -134,6 +134,6 @@ def test_process_group_instantiates_and_start_processes(mock_process):
def test_is_genesis_block_returns_true_if_genesis(b):
from bigchaindb.util import is_genesis_block
from bigchaindb.utils import is_genesis_block
genesis_block = b.prepare_genesis_block()
assert is_genesis_block(genesis_block)