From d0a7df8d17e2bb023545d0fe89d874bd4254effc Mon Sep 17 00:00:00 2001 From: Lev Berman Date: Wed, 29 Aug 2018 12:37:08 +0200 Subject: [PATCH] Problem: No good way to check for val set absence. Solution: Make get_validator_set/get_validators return None/[] when there are no validators yet. --- bigchaindb/backend/localmongodb/query.py | 2 +- bigchaindb/lib.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/bigchaindb/backend/localmongodb/query.py b/bigchaindb/backend/localmongodb/query.py index 29993b30..757a61b7 100644 --- a/bigchaindb/backend/localmongodb/query.py +++ b/bigchaindb/backend/localmongodb/query.py @@ -296,7 +296,7 @@ def get_validator_set(conn, height=None): .limit(1) ) - return list(cursor)[0] + return next(cursor, None) @register_query(LocalMongoDBConnection) diff --git a/bigchaindb/lib.py b/bigchaindb/lib.py index 05ca3e69..8f0f80a8 100644 --- a/bigchaindb/lib.py +++ b/bigchaindb/lib.py @@ -426,8 +426,7 @@ class BigchainDB(object): def get_validators(self, height=None): result = self.get_validator_change(height) - validators = result['validators'] - return validators + return [] if result is None else result['validators'] def get_validators_by_election_id(self, election_id): result = backend.query.get_validator_set_by_election_id(self.connection, election_id)