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: Schema still refers to ValidatorElectionVote instead of Vote

Browse Source 
Solution:  Renamed `TX_SCHEMA_VALIDATOR_ELECTION_VOTE` as `TX_SCHEMA_VOTE`
This commit is contained in:
z-bowen 2018-09-05 10:36:44 +02:00
parent 7d756bf1a9
commit 331b52cc4c
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bigchaindb/common/election.py
View File

@ -162,7 +162,7 @@ class Election(Transaction):
def count_votes(cls, election_pk, transactions, getter=getattr): def count_votes(cls, election_pk, transactions, getter=getattr):
votes = 0 votes = 0
for txn in transactions: for txn in transactions:
if getter(txn, 'operation') == cls.VOTE_TYPE: if getter(txn, 'operation') == cls.VOTE_TYPE.VOTE:
for output in getter(txn, 'outputs'): for output in getter(txn, 'outputs'):
# NOTE: We enforce that a valid vote to election id will have only # NOTE: We enforce that a valid vote to election id will have only
# election_pk in the output public keys, including any other public key # election_pk in the output public keys, including any other public key

3
bigchaindb/common/schema/__init__.py
View File

@ -37,8 +37,7 @@ _, TX_SCHEMA_TRANSFER = _load_schema('transaction_transfer_' +
_, TX_SCHEMA_VALIDATOR_ELECTION = _load_schema('transaction_validator_election_' + _, TX_SCHEMA_VALIDATOR_ELECTION = _load_schema('transaction_validator_election_' +
TX_SCHEMA_VERSION) TX_SCHEMA_VERSION)
_, TX_SCHEMA_VALIDATOR_ELECTION_VOTE = _load_schema('transaction_validator_election_vote_' + _, TX_SCHEMA_VOTE = _load_schema('transaction_vote_' + TX_SCHEMA_VERSION)
TX_SCHEMA_VERSION)
def _validate_schema(schema, body): def _validate_schema(schema, body):

2
bigchaindb/common/schema/transaction_validator_election_vote_v2.0.yaml → bigchaindb/common/schema/transaction_vote_v2.0.yaml
View File

@ -12,7 +12,7 @@ required:
properties: properties:
operation: operation:
type: string type: string
value: "VOTE" value: "OPERATION"
outputs: outputs:
type: array type: array
items: items:

6
bigchaindb/common/vote.py
View File

@ -6,7 +6,7 @@ from bigchaindb.common.transaction import Transaction
from bigchaindb.common.schema import (_validate_schema, from bigchaindb.common.schema import (_validate_schema,
TX_SCHEMA_COMMON, TX_SCHEMA_COMMON,
TX_SCHEMA_TRANSFER, TX_SCHEMA_TRANSFER,
TX_SCHEMA_VALIDATOR_ELECTION_VOTE) TX_SCHEMA_VOTE)
class Vote(Transaction): class Vote(Transaction):
@ -45,14 +45,14 @@ class Vote(Transaction):
@classmethod @classmethod
def validate_schema(cls, tx, skip_id=False): def validate_schema(cls, tx, skip_id=False):
"""Validate the validator election vote transaction. Since `VALIDATOR_ELECTION_VOTE` extends `TRANFER` """Validate the validator election vote transaction. Since `VOTE` extends `TRANSFER`
transaction, all the validations for `CREATE` transaction should be inherited transaction, all the validations for `CREATE` transaction should be inherited
""" """
if not skip_id: if not skip_id:
cls.validate_id(tx) cls.validate_id(tx)
_validate_schema(TX_SCHEMA_COMMON, tx) _validate_schema(TX_SCHEMA_COMMON, tx)
_validate_schema(TX_SCHEMA_TRANSFER, tx) _validate_schema(TX_SCHEMA_TRANSFER, tx)
_validate_schema(TX_SCHEMA_VALIDATOR_ELECTION_VOTE, tx) _validate_schema(TX_SCHEMA_VOTE, tx)
@classmethod @classmethod
def create(cls, tx_signers, recipients, metadata=None, asset=None): def create(cls, tx_signers, recipients, metadata=None, asset=None):