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

Problem: New validator set stored at every height

Browse Source 
Solution: Store new validator set only when its updated
This commit is contained in:
Vanshdeep Singh 2018-08-08 12:04:43 +02:00
parent ae8f494396
commit 1d34a172f6
4 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bigchaindb/backend/localmongodb/query.py
View File

@ -4,7 +4,6 @@ from pymongo import DESCENDING
from bigchaindb import backend from bigchaindb import backend
from bigchaindb.backend.exceptions import DuplicateKeyError from bigchaindb.backend.exceptions import DuplicateKeyError
from bigchaindb.common.exceptions import MultipleValidatorOperationError
from bigchaindb.backend.utils import module_dispatch_registrar from bigchaindb.backend.utils import module_dispatch_registrar
from bigchaindb.backend.localmongodb.connection import LocalMongoDBConnection from bigchaindb.backend.localmongodb.connection import LocalMongoDBConnection
from bigchaindb.common.transaction import Transaction from bigchaindb.common.transaction import Transaction
@ -111,7 +110,8 @@ def get_spent(conn, transaction_id, output):
def get_latest_block(conn): def get_latest_block(conn):
return conn.run( return conn.run(
conn.collection('blocks') conn.collection('blocks')
.find_one(sort=[('height', DESCENDING)])) .find_one(projection={'_id': False},
sort=[('height', DESCENDING)]))
@register_query(LocalMongoDBConnection) @register_query(LocalMongoDBConnection)
@ -281,9 +281,9 @@ def get_pre_commit_state(conn, commit_id):
def store_validator_set(conn, validators_update): def store_validator_set(conn, validators_update):
height = validators_update['height'] height = validators_update['height']
return conn.run( return conn.run(
conn.collection('validators').update_one( conn.collection('validators').replace_one(
{"height": height}, {'height': height},
{"$set": validators_update}, validators_update,
upsert=True upsert=True
) )
) )

3
bigchaindb/core.py
View File

@ -136,8 +136,11 @@ class App(BaseApplication):
# TODO: calculate if an election has concluded # TODO: calculate if an election has concluded
# NOTE: ensure the local validator set is updated # NOTE: ensure the local validator set is updated
validator_updates = self.bigchaindb.get_validator_update(self.block_transactions) validator_updates = self.bigchaindb.get_validator_update(self.block_transactions)
if validator_updates:
validator_set = new_validator_set(self.bigchaindb, self.new_height, validator_updates) validator_set = new_validator_set(self.bigchaindb, self.new_height, validator_updates)
self.bigchaindb.store_validator_set(self.new_height+1, validator_set) self.bigchaindb.store_validator_set(self.new_height+1, validator_set)
validator_updates = [encode_validator(v) for v in validator_updates] validator_updates = [encode_validator(v) for v in validator_updates]
# Store pre-commit state to recover in case there is a crash # Store pre-commit state to recover in case there is a crash

1
tests/tendermint/test_integration.py
View File

@ -7,7 +7,6 @@ import pytest
from abci.server import ProtocolHandler from abci.server import ProtocolHandler
from abci.encoding import read_messages from abci.encoding import read_messages
from copy import deepcopy
from io import BytesIO from io import BytesIO

10
tests/upsert_validator/test_validator_election_vote.py
View File

@ -218,25 +218,19 @@ def test_get_validator_update(b_mock, valid_election, ed25519_node_keys):
@pytest.mark.abci @pytest.mark.abci
def test_upsert_validator(b, node_key, node_keys, new_validator, ed25519_node_keys): def test_upsert_validator(b, node_key, node_keys, new_validator, ed25519_node_keys):
from bigchaindb.backend import connect
from bigchaindb.tendermint_utils import public_key_to_base64 from bigchaindb.tendermint_utils import public_key_to_base64
import time import time
import requests import requests
conn = connect()
(node_pub, _) = list(node_keys.items())[0] (node_pub, _) = list(node_keys.items())[0]
validators = [{'pub_key': {'type': 'ed25519', validators = [{'pub_key': {'type': 'ed25519',
'data': node_pub}, 'data': node_pub},
'voting_power': 10}] 'voting_power': 10}]
latest_block = b.get_latest_block()
# reset the validator set # reset the validator set
conn.run( b.store_validator_set(latest_block['height'], validators)
conn.collection('validators').find_one_and_update(
{"height": 1},
{"$set": {"validators": validators}}
)
)
power = 1 power = 1
public_key = '9B3119650DF82B9A5D8A12E38953EA47475C09F0C48A4E6A0ECE182944B24403' public_key = '9B3119650DF82B9A5D8A12E38953EA47475C09F0C48A4E6A0ECE182944B24403'