From 27278d0f10ebd9e43e6faabceab3bda478634ffb Mon Sep 17 00:00:00 2001 From: Vanshdeep Singh Date: Mon, 30 Jul 2018 12:41:15 +0200 Subject: [PATCH] Problem: ReadTheDocs build fails. Solution: Move the schema spec for validator election to common directory so that the yaml schema files can be found --- bigchaindb/common/schema/__init__.py | 3 +++ .../schema}/transaction_validator_election_v2.0.yaml | 0 bigchaindb/upsert_validator/validator_election.py | 9 ++------- 3 files changed, 5 insertions(+), 7 deletions(-) rename bigchaindb/{upsert_validator => common/schema}/transaction_validator_election_v2.0.yaml (100%) diff --git a/bigchaindb/common/schema/__init__.py b/bigchaindb/common/schema/__init__.py index cd2c55f5..59fac431 100644 --- a/bigchaindb/common/schema/__init__.py +++ b/bigchaindb/common/schema/__init__.py @@ -31,6 +31,9 @@ _, TX_SCHEMA_CREATE = _load_schema('transaction_create_' + _, TX_SCHEMA_TRANSFER = _load_schema('transaction_transfer_' + TX_SCHEMA_VERSION) +_, TX_SCHEMA_VALIDATOR_ELECTION = _load_schema('transaction_validator_election_' + + TX_SCHEMA_VERSION) + def _validate_schema(schema, body): """Validate data against a schema""" diff --git a/bigchaindb/upsert_validator/transaction_validator_election_v2.0.yaml b/bigchaindb/common/schema/transaction_validator_election_v2.0.yaml similarity index 100% rename from bigchaindb/upsert_validator/transaction_validator_election_v2.0.yaml rename to bigchaindb/common/schema/transaction_validator_election_v2.0.yaml diff --git a/bigchaindb/upsert_validator/validator_election.py b/bigchaindb/upsert_validator/validator_election.py index a1fd6996..4717e708 100644 --- a/bigchaindb/upsert_validator/validator_election.py +++ b/bigchaindb/upsert_validator/validator_election.py @@ -7,17 +7,12 @@ from bigchaindb.common.exceptions import (InvalidSignature, from bigchaindb.tendermint_utils import key_from_base64 from bigchaindb.common.crypto import (public_key_from_ed25519_key) from bigchaindb.common.transaction import Transaction -from bigchaindb.common.schema import (_load_schema, - _validate_schema, - TX_SCHEMA_VERSION, +from bigchaindb.common.schema import (_validate_schema, + TX_SCHEMA_VALIDATOR_ELECTION, TX_SCHEMA_COMMON, TX_SCHEMA_CREATE) -_, TX_SCHEMA_VALIDATOR_ELECTION = _load_schema('transaction_validator_election_' + - TX_SCHEMA_VERSION, __file__) - - class ValidatorElection(Transaction): VALIDATOR_ELECTION = 'VALIDATOR_ELECTION'