From 75e10463a7ea833e09db84509f38e60942768035 Mon Sep 17 00:00:00 2001 From: Peter Schwarz Date: Thu, 26 Apr 2018 09:53:20 -0500 Subject: [PATCH] Update use of leaves as iterator Signed-off-by: Peter Schwarz --- .../validator_registry_view/validator_registry_view.py | 2 +- common/tests/test_validator_registry_view/mocks.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/sawtooth_poet_common/validator_registry_view/validator_registry_view.py b/common/sawtooth_poet_common/validator_registry_view/validator_registry_view.py index 4f778ec5..a9d94d20 100644 --- a/common/sawtooth_poet_common/validator_registry_view/validator_registry_view.py +++ b/common/sawtooth_poet_common/validator_registry_view/validator_registry_view.py @@ -51,7 +51,7 @@ def get_validators(self): leaves = self._state_view.leaves(_NAMESPACE) infos = [ ValidatorRegistryView._parse_validator_info(state_data) - for address, state_data in leaves.items() + for address, state_data in leaves if address != validator_map_addr ] return {info.id: info for info in infos} diff --git a/common/tests/test_validator_registry_view/mocks.py b/common/tests/test_validator_registry_view/mocks.py index 969fe6a2..cf42f02c 100644 --- a/common/tests/test_validator_registry_view/mocks.py +++ b/common/tests/test_validator_registry_view/mocks.py @@ -36,8 +36,8 @@ def addresses(self): def leaves(self, prefix): """See sawtooth_validator.state.state_view.StateView.leaves""" - return { + return ({ address: data for address, data in self._state.items() if address.startswith(prefix) - } + }).items()