From 27e8cc83cfdb9bd2f6f51a6417830885871ab225 Mon Sep 17 00:00:00 2001 From: Kieran Prasch Date: Thu, 6 Apr 2023 12:51:50 -0700 Subject: [PATCH] decrypt checkpoint --- nucypher/blockchain/eth/trackers/dkg.py | 7 ++++--- tests/acceptance/blockchain/actors/test_ritual.py | 4 ++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/nucypher/blockchain/eth/trackers/dkg.py b/nucypher/blockchain/eth/trackers/dkg.py index e99df0e25..95c3cf89c 100644 --- a/nucypher/blockchain/eth/trackers/dkg.py +++ b/nucypher/blockchain/eth/trackers/dkg.py @@ -57,6 +57,7 @@ class EventScannerTask(SimpleTask): def handle_errors(self, *args, **kwargs): self.log.warn("Error during ritual event scanning: {}".format(args[0].getTraceback())) + raise args[0] class RitualTracker: @@ -164,7 +165,7 @@ class RitualTracker: def __execute_round(self, event_type, timestamp: int, ritual_id, **kwargs): """Execute a round of a ritual asynchronously.""" def task(): - return self.actions[event_type](timestamp=timestamp, ritual_id=ritual_id, **kwargs) + self.actions[event_type](timestamp=timestamp, ritual_id=ritual_id, **kwargs) d = threads.deferToThread(task) d.addErrback(self.task.handle_errors) d.addCallback(self.refresh) @@ -215,8 +216,8 @@ class RitualTracker: end_block = self.scanner.get_suggested_scan_end_block() self.__scan(start_block, end_block, self.ritualist.transacting_power.account) - def get_node_index(self, ritual_id: int, node: ChecksumAddress) -> int: - return self.rituals[ritual_id].nodes.index(node) + # def get_node_index(self, ritual_id: int, node: ChecksumAddress) -> int: + # return self.rituals[ritual_id].nodes.index(node) def add_ritual(self, ritual): self.rituals[ritual.id] = ritual diff --git a/tests/acceptance/blockchain/actors/test_ritual.py b/tests/acceptance/blockchain/actors/test_ritual.py index 9e491b718..8ad0daea5 100644 --- a/tests/acceptance/blockchain/actors/test_ritual.py +++ b/tests/acceptance/blockchain/actors/test_ritual.py @@ -74,6 +74,8 @@ def test_ursula_ritualist(ursulas, agency, testerchain, test_registry, alice, co for ursula in cohort: ursula.ritual_tracker.scan() ursula.ritual_tracker.refresh() + testerchain.time_travel(seconds=60) + # ursula.ritual_tracker.refresh(fetch_rituals=[0]) def start_ursulas(): for ursula in cohort: @@ -95,6 +97,8 @@ def test_ursula_ritualist(ursulas, agency, testerchain, test_registry, alice, co # wait for the dkg to finalize d.addCallback(block_until_dkg_finalized) + d.addErrback(lambda e: print(e.getTraceback())) + d.addCallback(check_finality) # test encryption/decryption