From e302a4b8f371e26e2051b4254c06e970bfd25c29 Mon Sep 17 00:00:00 2001 From: z-bowen Date: Mon, 10 Sep 2018 11:03:12 +0200 Subject: [PATCH] Problem: boolean `skip_id` parameter is always called with `True` Solution: Removed the parameter --- bigchaindb/elections/election.py | 6 ++---- bigchaindb/upsert_validator/validator_election.py | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/bigchaindb/elections/election.py b/bigchaindb/elections/election.py index 4587bf5e..0c0219bd 100644 --- a/bigchaindb/elections/election.py +++ b/bigchaindb/elections/election.py @@ -138,16 +138,14 @@ class Election(Transaction): (inputs, outputs) = cls.validate_create(initiator, voters, election_data, metadata) election = cls(cls.OPERATION, {'data': election_data}, inputs, outputs, metadata) - cls.validate_schema(election.to_dict(), skip_id=True) + cls.validate_schema(election.to_dict()) return election @classmethod - def validate_schema(cls, tx, skip_id=False): + def validate_schema(cls, tx): """Validate the election transaction. Since `ELECTION` extends `CREATE` transaction, all the validations for `CREATE` transaction should be inherited """ - if not skip_id: - cls.validate_id(tx) _validate_schema(TX_SCHEMA_COMMON, tx) _validate_schema(TX_SCHEMA_CREATE, tx) if cls.TX_SCHEMA_CUSTOM: diff --git a/bigchaindb/upsert_validator/validator_election.py b/bigchaindb/upsert_validator/validator_election.py index 7cb10fae..3daf22eb 100644 --- a/bigchaindb/upsert_validator/validator_election.py +++ b/bigchaindb/upsert_validator/validator_election.py @@ -32,8 +32,8 @@ class ValidatorElection(Election): return self @classmethod - def validate_schema(cls, tx, skip_id=False): - super(ValidatorElection, cls).validate_schema(tx, skip_id=skip_id) + def validate_schema(cls, tx): + super(ValidatorElection, cls).validate_schema(tx) validate_asset_public_key(tx['asset']['data']['public_key']) @classmethod