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

Merge pull request #2378 from fjarri/status-page-fixes 

Status page fixes
pull/2382/head
K Prasch 2020-10-17 21:05:23 -07:00 committed by GitHub
parent 4de394bedd c8ccda6473
commit 2abdbf11bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nucypher/acumen/perception.py
View File

@ -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

2
nucypher/network/nodes.py
View File

@ -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,

30
nucypher/network/templates/basic_status.mako
View File

@ -20,7 +20,7 @@ def contrast_color(color_hex):
return "white"
def character_span(character):
return f'<span style="color: {contrast_color(character.color_hex)}; background-color: {character.color_hex}">{character.symbol}</span>'
return f'<span class="symbol" style="color: {contrast_color(character.color_hex)}; background-color: {character.color_hex}">{character.symbol}</span>'
%>
<%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))}
</tr>
<tr>
<td><i>Running:</i></td>
<td><span class="version">v${ version }</span></td>
<td>v${ version }</td>
</tr>
<tr>
<td><i>Domain:</i></td>
<td><span class="domain">${ domain }</span></td>
<td>${ domain }</td>
</tr>
<tr>
<td><i>Fleet state:</i></td>
<td> ${fleet_state_icon(this_node.fleet_state_checksum,
this_node.fleet_state_nickname,
this_node.fleet_state_population)}</td>
<td>${fleet_state_icon_from_known_nodes(this_node.known_nodes)}</td>
</tr>
<tr>
<td><i>Previous states:</i></td>
@ -184,7 +196,7 @@ ${fleet_state_icon(state.checksum, state.nickname, len(state))}
</tr>
</table>
<h3>Known nodes</h3>
<h3>${len(known_nodes)} ${"known node" if len(known_nodes) == 1 else "known nodes"}:</h3>
<table class="known-nodes">
<thead>