commit b1c0f0d0a5d6e1648b8ef024880853b0d9d43d00 Author: juga0 juga@riseup.net Date: Sat Mar 21 14:59:11 2020 +0000
chg: resultdump: Remove `_count` from attributes
Tests wont' pass with this commit, they'll be fixed in the next commits --- sbws/lib/resultdump.py | 113 ++++++++++++++++++++++++------------------------- 1 file changed, 56 insertions(+), 57 deletions(-)
diff --git a/sbws/lib/resultdump.py b/sbws/lib/resultdump.py index 02952f9..a7c971f 100644 --- a/sbws/lib/resultdump.py +++ b/sbws/lib/resultdump.py @@ -225,9 +225,9 @@ class Result: consensus_bandwidth_is_unmeasured=None, # Counters to be stored by relay and not per measurement, # since the measurements might fail. - relay_in_recent_consensus_count=None, - relay_recent_measurement_attempt_count=None, - relay_recent_priority_list_count=None): + relay_in_recent_consensus=None, + relay_recent_measurement_attempt=None, + relay_recent_priority_list=None): """ Initializes a ``Result.Relay``.
@@ -247,15 +247,14 @@ class Result: self.consensus_bandwidth = consensus_bandwidth self.consensus_bandwidth_is_unmeasured = \ consensus_bandwidth_is_unmeasured - self.relay_in_recent_consensus_count = \ - relay_in_recent_consensus_count - self.relay_recent_measurement_attempt_count = \ - relay_recent_measurement_attempt_count - self.relay_recent_priority_list_count = \ - relay_recent_priority_list_count - - def __init__(self, relay, circ, dest_url, scanner_nick, t=None, - relay_in_recent_consensus_count=None): + self.relay_in_recent_consensus = \ + relay_in_recent_consensus + self.relay_recent_measurement_attempt = \ + relay_recent_measurement_attempt + self.relay_recent_priority_list = \ + relay_recent_priority_list + + def __init__(self, relay, circ, dest_url, scanner_nick, t=None): """ Initilizes the measurement and the relay with all the relay attributes. """ @@ -267,9 +266,9 @@ class Result: relay.observed_bandwidth, relay.consensus_bandwidth, relay.consensus_bandwidth_is_unmeasured, - relay.relay_in_recent_consensus_count, - relay.relay_recent_measurement_attempt_count, - relay.relay_recent_priority_list_count + relay.relay_in_recent_consensus, + relay.relay_recent_measurement_attempt, + relay.relay_recent_priority_list ) self._circ = circ self._dest_url = dest_url @@ -317,27 +316,27 @@ class Result: return self._relay.master_key_ed25519
@property - def relay_in_recent_consensus_count(self): + def relay_in_recent_consensus(self): """Number of times the relay was in a consensus.""" - return self._relay.relay_in_recent_consensus_count + return self._relay.relay_in_recent_consensus
@property - def relay_recent_measurement_attempt_count(self): + def relay_recent_measurement_attempt(self): """Returns the relay recent measurements attemps.
It is initialized in :class:`~sbws.lib.relaylist.Relay` and incremented in :func:`~sbws.core.scanner.main_loop`. """ - return self._relay.relay_recent_measurement_attempt_count + return self._relay.relay_recent_measurement_attempt
@property - def relay_recent_priority_list_count(self): + def relay_recent_priority_list(self): """Returns the relay recent "prioritization"s to be measured.
It is initialized in :class:`~sbws.lib.relaylist.Relay` and incremented in :func:`~sbws.core.scanner.main_loop`. """ - return self._relay.relay_recent_priority_list_count + return self._relay.relay_recent_priority_list
@property def circ(self): @@ -371,12 +370,12 @@ class Result: 'type': self.type, 'scanner': self.scanner, 'version': self.version, - 'relay_in_recent_consensus_count': - self.relay_in_recent_consensus_count, - 'relay_recent_measurement_attempt_count': - self.relay_recent_measurement_attempt_count, - 'relay_recent_priority_list_count': - self.relay_recent_priority_list_count, + 'relay_in_recent_consensus': + self.relay_in_recent_consensus, + 'relay_recent_measurement_attempt': + self.relay_recent_measurement_attempt, + 'relay_recent_priority_list': + self.relay_recent_priority_list, }
@staticmethod @@ -459,12 +458,12 @@ class ResultError(Result): Result.Relay( d['fingerprint'], d['nickname'], d['address'], d['master_key_ed25519'], - relay_in_recent_consensus_count= # noqa - d.get('relay_in_recent_consensus_count', None), # noqa - relay_recent_measurement_attempt_count= # noqa - d.get('relay_recent_measurement_attempt_count', None), # noqa - relay_recent_priority_list_count= # noqa - d.get('relay_recent_priority_list_count', None), # noqa + relay_in_recent_consensus= # noqa + d.get('relay_in_recent_consensus', None), # noqa + relay_recent_measurement_attempt= # noqa + d.get('relay_recent_measurement_attempt', None), # noqa + relay_recent_priority_list= # noqa + d.get('relay_recent_priority_list', None), # noqa ), d['circ'], d['dest_url'], d['scanner'], msg=d['msg'], t=d['time']) @@ -507,12 +506,12 @@ class ResultErrorCircuit(ResultError): Result.Relay( d['fingerprint'], d['nickname'], d['address'], d['master_key_ed25519'], - relay_in_recent_consensus_count= # noqa - d.get('relay_in_recent_consensus_count', None), # noqa - relay_recent_measurement_attempt_count= # noqa - d.get('relay_recent_measurement_attempt_count', None), # noqa - relay_recent_priority_list_count= # noqa - d.get('relay_recent_priority_list_count', None), # noqa + relay_in_recent_consensus= # noqa + d.get('relay_in_recent_consensus', None), # noqa + relay_recent_measurement_attempt= # noqa + d.get('relay_recent_measurement_attempt', None), # noqa + relay_recent_priority_list= # noqa + d.get('relay_recent_priority_list', None), # noqa ), d['circ'], d['dest_url'], d['scanner'], msg=d['msg'], t=d['time']) @@ -537,12 +536,12 @@ class ResultErrorStream(ResultError): Result.Relay( d['fingerprint'], d['nickname'], d['address'], d['master_key_ed25519'], - relay_in_recent_consensus_count= # noqa - d.get('relay_in_recent_consensus_count', None), # noqa - relay_recent_measurement_attempt_count= # noqa - d.get('relay_recent_measurement_attempt_count', None), # noqa - relay_recent_priority_list_count= # noqa - d.get('relay_recent_priority_list_count', None), # noqa + relay_in_recent_consensus= # noqa + d.get('relay_in_recent_consensus', None), # noqa + relay_recent_measurement_attempt= # noqa + d.get('relay_recent_measurement_attempt', None), # noqa + relay_recent_priority_list= # noqa + d.get('relay_recent_priority_list', None), # noqa ), d['circ'], d['dest_url'], d['scanner'], msg=d['msg'], t=d['time']) @@ -657,12 +656,12 @@ class ResultErrorAuth(ResultError): Result.Relay( d['fingerprint'], d['nickname'], d['address'], d['master_key_ed25519'], - relay_in_recent_consensus_count= # noqa - d.get('relay_in_recent_consensus_count', None), # noqa - relay_recent_measurement_attempt_count= # noqa - d.get('relay_recent_measurement_attempt_count', None), # noqa - relay_recent_priority_list_count= # noqa - d.get('relay_recent_priority_list_count', None), # noqa + relay_in_recent_consensus= # noqa + d.get('relay_in_recent_consensus', None), # noqa + relay_recent_measurement_attempt= # noqa + d.get('relay_recent_measurement_attempt', None), # noqa + relay_recent_priority_list= # noqa + d.get('relay_recent_priority_list', None), # noqa ), d['circ'], d['dest_url'], d['scanner'], msg=d['msg'], t=d['time']) @@ -701,12 +700,12 @@ class ResultSuccess(Result): d.get('relay_burst_bandwidth'), d['relay_observed_bandwidth'], d.get('consensus_bandwidth'), d.get('consensus_bandwidth_is_unmeasured'), - relay_in_recent_consensus_count= # noqa - d.get('relay_in_recent_consensus_count', None), # noqa - relay_recent_measurement_attempt_count= # noqa - d.get('relay_recent_measurement_attempt_count', None), # noqa - relay_recent_priority_list_count= # noqa - d.get('relay_recent_priority_list_count', None), # noqa + relay_in_recent_consensus= # noqa + d.get('relay_in_recent_consensus', None), # noqa + relay_recent_measurement_attempt= # noqa + d.get('relay_recent_measurement_attempt', None), # noqa + relay_recent_priority_list= # noqa + d.get('relay_recent_priority_list', None), # noqa ), d['circ'], d['dest_url'], d['scanner'], t=d['time'])