From 86398eb43a3e53631a581af02ac1b5151ffd68d5 Mon Sep 17 00:00:00 2001 From: jMyles Date: Thu, 9 Jul 2020 20:42:27 -0700 Subject: [PATCH] Don't ship blockchain_bob with known_nodes; he can use his domain hardcoded nodes. Also, don't start his learning loop after the fact. This caused this test to pass even when he was unable to actually find the nodes in join_policy. --- .../cli/ursula/test_stake_via_allocation_contract.py | 1 - tests/fixtures.py | 2 +- tests/mock/performance_mocks.py | 1 - tests/utils/middleware.py | 4 ++-- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/tests/acceptance/cli/ursula/test_stake_via_allocation_contract.py b/tests/acceptance/cli/ursula/test_stake_via_allocation_contract.py index 6843fcb53..7d6800130 100644 --- a/tests/acceptance/cli/ursula/test_stake_via_allocation_contract.py +++ b/tests/acceptance/cli/ursula/test_stake_via_allocation_contract.py @@ -555,7 +555,6 @@ def test_collect_rewards_integration(click_runner, assert arrangement.ursula == ursula # Bob learns about the new staker and joins the policy - blockchain_bob.start_learning_loop() blockchain_bob.remember_node(node=ursula) blockchain_bob.join_policy(random_policy_label, bytes(blockchain_alice.stamp)) diff --git a/tests/fixtures.py b/tests/fixtures.py index c26c59cd5..6ec3bb1ed 100644 --- a/tests/fixtures.py +++ b/tests/fixtures.py @@ -211,7 +211,7 @@ def bob_blockchain_test_config(blockchain_ursulas, testerchain, test_registry): provider_uri=TEST_PROVIDER_URI, test_registry=test_registry, checksum_address=testerchain.bob_account, - known_nodes=blockchain_ursulas) + ) yield config config.cleanup() diff --git a/tests/mock/performance_mocks.py b/tests/mock/performance_mocks.py index 058927e83..dd6610e40 100644 --- a/tests/mock/performance_mocks.py +++ b/tests/mock/performance_mocks.py @@ -20,7 +20,6 @@ from unittest.mock import patch from nucypher.network.server import make_rest_app from tests.mock.serials import good_serials -from tests.utils.ursula import MOCK_KNOWN_URSULAS_CACHE from umbral.config import default_params from umbral.keys import UmbralPublicKey from umbral.signing import Signature diff --git a/tests/utils/middleware.py b/tests/utils/middleware.py index 6e22cb73e..437ea5f12 100644 --- a/tests/utils/middleware.py +++ b/tests/utils/middleware.py @@ -93,9 +93,9 @@ class MockRestMiddleware(RestMiddleware): class TEACHER_NODES: @classmethod - def get(_cls, item, default): + def get(_cls, item, _default): if item is TEMPORARY_DOMAIN: - nodes = tuple(u.rest_url() for u in MOCK_KNOWN_URSULAS_CACHE.values()) + nodes = tuple(u.rest_url() for u in MOCK_KNOWN_URSULAS_CACHE.values())[0:2] else: nodes = tuple() return nodes