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

Moving _consider_arrangements up to Policy.

pull/318/head
jMyles 2018-06-22 18:02:59 -07:00
parent 97d1abc598
commit f5f6ef00f6
2 changed files with 17 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
nucypher/blockchain/eth/policies.py
View File

@ -140,35 +140,10 @@ class BlockchainPolicy(Policy):
# TODO: Figure out how to handle spare addresses.
# else:
# spare_addresses = ether_addresses # Successfully collected and/or found n ursulas
# self.alice.nodes_to_seek.update((a for a in spare_addresses if a not in self.alice.known_nodes))
# self.alice.nodes_to_seek.update((a for a in spare_addresses if a not in self.alice._known_nodes))
return found_ursulas
def __consider_arrangements(self, network_middleware, candidate_ursulas: Set[Ursula],
deposit: int, expiration: maya.MayaDT) -> tuple:
accepted, rejected = set(), set()
for selected_ursula in candidate_ursulas:
delta = expiration - maya.now()
hours = (delta.total_seconds() / 60) / 60
periods = int(math.ceil(hours / int(constants.HOURS_PER_PERIOD)))
blockchain_arrangement = BlockchainArrangement(author=self.alice, miner=selected_ursula,
value=deposit, lock_periods=periods,
expiration=expiration, hrac=self.hrac)
ursula_accepts = self.consider_arrangement(ursula=selected_ursula,
arrangement=blockchain_arrangement,
network_middleware=network_middleware)
if ursula_accepts: # TODO: Read the negotiation results from REST
accepted.add(blockchain_arrangement)
else:
rejected.add(blockchain_arrangement)
return accepted, rejected
def make_arrangements(self, network_middleware: RestMiddleware,
deposit: int, expiration: maya.MayaDT,
handpicked_ursulas: Set[Ursula] = set()) -> None:
@ -203,7 +178,7 @@ class BlockchainPolicy(Policy):
#
# Attempt 1
accepted, rejected = self.__consider_arrangements(network_middleware, candidate_ursulas=candidates,
accepted, rejected = self._consider_arrangements(network_middleware, candidate_ursulas=candidates,
deposit=deposit, expiration=expiration)
# After all is said and done...
@ -215,7 +190,7 @@ class BlockchainPolicy(Policy):
# TODO: Handle spare Ursulas and try to claw back up to n.
assert False
found_spare_ursulas, remaining_spare_addresses = self.__find_ursulas(spare_addresses, remaining_quantity)
accepted_spares, rejected_spares = self.__consider_arrangements(network_middleware,
accepted_spares, rejected_spares = self._consider_arrangements(network_middleware,
candidate_ursulas=found_spare_ursulas,
deposit=deposit, expiration=expiration)
accepted.update(accepted_spares)

14
nucypher/policy/models.py
View File

@ -266,6 +266,20 @@ class Policy:
"""
raise NotImplementedError
def _consider_arrangements(self, network_middleware, candidate_ursulas: Set[Ursula],
deposit: int, expiration: maya.MayaDT) -> tuple:
for selected_ursula in candidate_ursulas:
arrangement = self._arrangement_class(alice=self.alice,
ursula=selected_ursula,
value=deposit,
expiration=expiration,
hrac=self.hrac)
self.consider_arrangement(ursula=selected_ursula,
arrangement=arrangement,
network_middleware=network_middleware)
class FederatedPolicy(Policy):
_arrangement_class = Arrangement