1
0
mirror of https://github.com/bigchaindb/bigchaindb.git synced 2024-06-17 18:13:22 +02:00
This commit is contained in:
diminator 2017-03-31 11:24:06 +02:00
parent 2393a61726
commit 63e3d1753a
No known key found for this signature in database
GPG Key ID: C3D8590E6D0D439A
2 changed files with 6 additions and 6 deletions

View File

@ -40,4 +40,3 @@ class BaseConsensusRules():
def validate_block(bigchain, block):
"""See :meth:`bigchaindb.models.Block.validate` for documentation."""
return block.validate(bigchain)

View File

@ -28,7 +28,8 @@ class Bigchain(object):
# return if transaction is in backlog
TX_IN_BACKLOG = 'backlog'
def __init__(self, public_key=None, private_key=None, keyring=[], connection=None, backlog_reassign_delay=None, consensusPlugin=None):
def __init__(self, public_key=None, private_key=None, keyring=[], connection=None, backlog_reassign_delay=None,
consensus_plugin=None):
"""Initialize the Bigchain instance
A Bigchain instance has several configuration parameters (e.g. host).
@ -58,11 +59,11 @@ class Bigchain(object):
backlog_reassign_delay = bigchaindb.config['backlog_reassign_delay']
self.backlog_reassign_delay = backlog_reassign_delay
if consensusPlugin is None:
consensusPlugin = bigchaindb.config.get('consensus_plugin')
if consensus_plugin is None:
consensus_plugin = bigchaindb.config.get('consensus_plugin')
if consensusPlugin:
self.consensus = config_utils.load_consensus_plugin(consensusPlugin)
if consensus_plugin:
self.consensus = config_utils.load_consensus_plugin(consensus_plugin)
else:
self.consensus = BaseConsensusRules