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

Prevent Bob crashing in the event that he has a replete WorkOrder for a Capsule for an Ursula about which he hasn't learned (although obviously he had to have learned about it in a previous runtime or whatever). See #999.

pull/2712/head
jMyles 2019-08-15 12:17:44 +02:00
parent da2d2a0be1
commit 9d0a47175c
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
nucypher/characters/lawful.py
View File

@ -580,9 +580,12 @@ class Bob(Character):
return treasure_map
def work_orders_for_capsule(self, map_id: str, *capsules,
num_ursulas: int = None,
):
def work_orders_for_capsules(self,
*capsules,
map_id: str,
alice_verifying_key: UmbralPublicKey,
num_ursulas: int = None,
):
from nucypher.policy.collections import WorkOrder # Prevent circular import
@ -601,8 +604,6 @@ class Bob(Character):
capsules))
for node_id, arrangement_id in treasure_map_to_use:
# TODO: Bob crashes if he hasn't learned about this Ursula #999
ursula = self.known_nodes[node_id]
capsules_to_include = []
for capsule in capsules:
@ -614,8 +615,15 @@ class Bob(Character):
# Don't have a precedent completed WorkOrder for this Ursula for this Capsule. We need to make a new one.
capsules_to_include.append(capsule)
# TODO: Bob crashes if he hasn't learned about this Ursula #999
ursula = self.known_nodes[node_id]
if capsules_to_include:
work_order = WorkOrder.construct_by_bob(arrangement_id, capsules_to_include, ursula, self)
work_order = WorkOrder.construct_by_bob(arrangement_id=arrangement_id,
alice_verifying=alice_verifying_key,
capsules=capsules_to_include,
ursula=ursula,
bob=self)
incomplete_work_orders[node_id] = work_order
else:
self.log.debug(f"All of these Capsules already have WorkOrders for this node: {node_id}")