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

Changing order of except clause to get InvalidNode first.

pull/2355/head
jMyles 2020-10-13 12:19:17 -07:00
parent 28212e4413
commit 722f01b557
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
nucypher/network/nodes.py
View File

@ -778,13 +778,7 @@ class Learner:
nodes_i_need=self._node_ids_to_learn_about_immediately,
announce_nodes=announce_nodes,
fleet_checksum=self.known_nodes.checksum)
except RuntimeError as e:
if canceller and canceller.stop_now:
# Race condition that seems limited to tests.
# TODO: Sort this out.
return RELAX
else:
raise
# These except clauses apply to the current_teacher itself, not the learned-about nodes.
except NodeSeemsToBeDown as e:
unresponsive_nodes.add(current_teacher)
self.log.info("Bad Response from teacher: {}:{}.".format(current_teacher, e))
@ -792,10 +786,18 @@ class Learner:
except current_teacher.InvalidNode as e:
# Ugh. The teacher is invalid. Rough.
# TODO: Bucket separately and report.
unresponsive_nodes.add(current_teacher)
self.log.info("Teacher is invalid: {}:{}.".format(current_teacher, e))
unresponsive_nodes.add(current_teacher) # This does nothing.
self.known_nodes.mark_as(current_teacher.InvalidNode, current_teacher)
self.log.warn(f"Teacher {str(current_teacher)} is invalid: {bytes(current_teacher)}:{e}.")
self.suspicious_activities_witnessed['vladimirs'].append(current_teacher)
return
except RuntimeError as e:
if canceller and canceller.stop_now:
# Race condition that seems limited to tests.
# TODO: Sort this out.
return RELAX
else:
raise
finally:
# Is cycling happening in the right order?
self.cycle_teacher_node()