Nucypher
/
nucypher
mirror of https://github.com/nucypher/nucypher.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Logic for optional TreasureMaps when retrieving was flawed and unused

pull/2687/head
David Núñez 2021-01-19 19:10:47 +01:00 committed by Kieran R. Prasch
parent d2878aa124
commit 589703d4cc
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nucypher/characters/lawful.py
View File

@ -684,27 +684,19 @@ class Bob(Character):
def work_orders_for_capsules(self,
*capsules,
alice_verifying_key: PublicKey,
treasure_map: 'TreasureMap' = None,
treasure_map: 'TreasureMap',
num_ursulas: int = None,
) -> Tuple[Dict[ChecksumAddress, 'WorkOrder'], Dict['Capsule', 'WorkOrder']]:
from nucypher.policy.collections import WorkOrder # Prevent circular import
if treasure_map:
treasure_map_to_use = treasure_map
else:
try:
treasure_map_to_use = self.treasure_maps[map_id]
except KeyError:
raise KeyError(f"Bob doesn't have the TreasureMap {map_id}; can't generate work orders.")
if not treasure_map:
raise ValueError(f"Bob doesn't have a TreasureMap; can't generate work orders.")
incomplete_work_orders = OrderedDict()
complete_work_orders = defaultdict(list)
if not treasure_map_to_use:
raise ValueError(f"Bob doesn't have a TreasureMap to match any of these capsules: {capsules}")
random_walk = list(treasure_map_to_use)
random_walk = list(treasure_map)
shuffle(random_walk) # Mutates list in-place
for node_id, arrangement_id in random_walk: