From e594ff5e8c0474666faa655cb23f99466ec73afd Mon Sep 17 00:00:00 2001 From: Kieran Prasch Date: Thu, 6 Aug 2020 17:06:16 -0700 Subject: [PATCH] Test fixes: another manual tpower activation and attempt to fix tmap reference. --- nucypher/characters/lawful.py | 2 +- tests/acceptance/cli/test_worklock_cli.py | 5 +++++ tests/acceptance/network/test_network_actors.py | 2 +- tests/integration/network/test_federated_actors.py | 4 +++- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/nucypher/characters/lawful.py b/nucypher/characters/lawful.py index 61dd0a494..9e7b4fd54 100644 --- a/nucypher/characters/lawful.py +++ b/nucypher/characters/lawful.py @@ -1033,7 +1033,7 @@ class Ursula(Teacher, Character, Worker): if is_me: # In-Memory TreasureMap tracking - self._stored_treasure_maps = dict() + self._stored_treasure_maps = dict() # TODO: Something more persistent (See PR #2132) # Learner self._start_learning_now = start_learning_now diff --git a/tests/acceptance/cli/test_worklock_cli.py b/tests/acceptance/cli/test_worklock_cli.py index aaf800c25..fe4d26871 100644 --- a/tests/acceptance/cli/test_worklock_cli.py +++ b/tests/acceptance/cli/test_worklock_cli.py @@ -23,6 +23,7 @@ import pytest from eth_utils import to_wei from web3 import Web3 +from nucypher.crypto.powers import TransactingPower from nucypher.blockchain.eth.actors import Bidder, Staker from nucypher.blockchain.eth.agents import ( ContractAgency, @@ -238,6 +239,10 @@ def test_refund(click_runner, testerchain, agency_local_registry, token_economic remaining_work = worklock_agent.get_remaining_work(checksum_address=bidder) assert remaining_work > 0 + # Unlock + transacting_power = worker._crypto_power.power_ups(TransactingPower) + transacting_power.activate(password=INSECURE_DEVELOPMENT_PASSWORD) + # Do some work for i in range(3): receipt = worker.commit_to_next_period() diff --git a/tests/acceptance/network/test_network_actors.py b/tests/acceptance/network/test_network_actors.py index 617fc2c11..49314d3fb 100644 --- a/tests/acceptance/network/test_network_actors.py +++ b/tests/acceptance/network/test_network_actors.py @@ -178,7 +178,7 @@ def test_treasure_map_cannot_be_duplicated(blockchain_ursulas, blockchain_alice, expiration=policy_end_datetime) u = blockchain_bob.matching_nodes_among(blockchain_alice.known_nodes)[0] - saved_map = u.treasure_maps[bytes.fromhex(policy.treasure_map.public_id())] + saved_map = u._stored_treasure_maps[bytes.fromhex(policy.treasure_map.public_id())] assert saved_map == policy.treasure_map # This Ursula was actually a Vladimir. # Thus, he has access to the (encrypted) TreasureMap and can use its details to diff --git a/tests/integration/network/test_federated_actors.py b/tests/integration/network/test_federated_actors.py index 50f5d446c..cbbc6cfd1 100644 --- a/tests/integration/network/test_federated_actors.py +++ b/tests/integration/network/test_federated_actors.py @@ -47,7 +47,9 @@ def test_alice_sets_treasure_map(enacted_federated_policy, federated_ursulas): assert found -def test_treasure_map_stored_by_ursula_is_the_correct_one_for_bob(federated_alice, federated_bob, federated_ursulas, +def test_treasure_map_stored_by_ursula_is_the_correct_one_for_bob(federated_alice, + federated_bob, + federated_ursulas, enacted_federated_policy): """ The TreasureMap given by Alice to Ursula is the correct one for Bob; he can decrypt and read it.