From c4135b520f958d4c35416eab184e71304f66389d Mon Sep 17 00:00:00 2001 From: jMyles Date: Thu, 14 Dec 2017 11:22:20 -0800 Subject: [PATCH] Alice passes uri and kFrags to make a Policy. --- nkms/policy/models.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/nkms/policy/models.py b/nkms/policy/models.py index 4ae1d3a7c..b59a8ed5b 100644 --- a/nkms/policy/models.py +++ b/nkms/policy/models.py @@ -202,8 +202,9 @@ class Policy(object): self.alice = alice self.bob = bob self.alices_signature = alices_signature - self.kfrag = kfrag + self.kfrags = kfrags self.pfrag = pfrag + self.uri = uri self.random_id_portion = api.secure_random(32) # TOOD: Where do we actually want this to live? self.challenge_size = challenge_size self.treasure_map = [] @@ -235,13 +236,13 @@ class Policy(object): self._ursula = ursula_object @staticmethod - def from_alice(kfrag, + def from_alice(kfrags, pfrag, alice, bob, + uri, ): - policy = Policy(alice, bob, kfrag, pfrag) - policy.generate_challenge_pack() + policy = Policy(alice, bob, kfrags, pfrag, uri) return policy @@ -323,8 +324,8 @@ class WorkOrder(object): def __repr__(self): return "WorkOrder (pfrags: {}) {} for {}".format([binascii.hexlify(bytes(p))[:6] for p in self.pfrags], - binascii.hexlify(self.receipt_bytes)[:6], - binascii.hexlify(self.ursula_id)[:6]) + binascii.hexlify(self.receipt_bytes)[:6], + binascii.hexlify(self.ursula_id)[:6]) def __eq__(self, other): return (self.receipt_bytes, self.receipt_signature) == (other.receipt_bytes, other.receipt_signature)