diff --git a/nucypher/acumen/perception.py b/nucypher/acumen/perception.py index ce4e0b7f7..918d5d80b 100644 --- a/nucypher/acumen/perception.py +++ b/nucypher/acumen/perception.py @@ -77,6 +77,9 @@ class FleetSensor: def __repr__(self): return self._nodes.__repr__() + def population(self): + return len(self) + len(self.additional_nodes_to_track) + @property def checksum(self): return self._checksum diff --git a/nucypher/network/nodes.py b/nucypher/network/nodes.py index 7981c921f..cf8d799ea 100644 --- a/nucypher/network/nodes.py +++ b/nucypher/network/nodes.py @@ -855,7 +855,7 @@ class Learner: current_teacher.update_snapshot(checksum=checksum, updated=maya.MayaDT( int.from_bytes(fleet_state_updated_bytes, byteorder="big")), - number_of_known_nodes=len(self.known_nodes)) + number_of_known_nodes=self.known_nodes.population()) return FLEET_STATES_MATCH # Note: There was previously a version check here, but that required iterating through node bytestrings twice, diff --git a/nucypher/network/templates/basic_status.mako b/nucypher/network/templates/basic_status.mako index 9920b96fe..3e1e17c6f 100644 --- a/nucypher/network/templates/basic_status.mako +++ b/nucypher/network/templates/basic_status.mako @@ -20,7 +20,7 @@ def contrast_color(color_hex): return "white" def character_span(character): - return f'{character.symbol}' + return f'{character.symbol}' %> <%def name="fleet_state_icon(checksum, nickname, population)"> @@ -45,7 +45,12 @@ NO FLEET STATE AVAILABLE <%def name="fleet_state_icon_from_state(state)"> -${fleet_state_icon(state.checksum, state.nickname, len(state))} +${fleet_state_icon(state.checksum, state.nickname, len(state.nodes))} +%def> + + +<%def name="fleet_state_icon_from_known_nodes(state)"> +${fleet_state_icon(state.checksum, state.nickname, state.population())} %def> @@ -122,7 +127,11 @@ ${fleet_state_icon(state.checksum, state.nickname, len(state))} } .this-node-info { - margin-bottom: 1em; + margin-bottom: 2em; + } + + h3 { + margin-bottom: 0em; } .this-node { @@ -145,6 +154,11 @@ ${fleet_state_icon(state.checksum, state.nickname, len(state))} margin-right: 0.2em; } + .symbol { + padding-left: 0.05em; + padding-right: 0.05em; + } + .checksum { font-family: monospace; } @@ -162,17 +176,15 @@ ${fleet_state_icon(state.checksum, state.nickname, len(state))}