cis-kuldeep/PyBitmessage-2021-04-27
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Simplified addKnownNode() and added docstrings

Browse Source
This commit is contained in:
Dmitri Bogomolov 2018-05-07 13:08:25 +03:00
parent 67feb8fee9
commit 5e72fdba17
Signed by untrusted user: g1itch
GPG Key ID: 720A756F18DEED13
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/knownnodes.py
View File

@ -19,6 +19,9 @@ knownNodesForgetRating = -0.5
def json_serialize_knownnodes(output): def json_serialize_knownnodes(output):
"""
Reorganize knownnodes dict and write it as JSON to output
"""
_serialized = [] _serialized = []
for stream, peers in knownNodes.iteritems(): for stream, peers in knownNodes.iteritems():
for peer, info in peers.iteritems(): for peer, info in peers.iteritems():
@ -29,6 +32,9 @@ def json_serialize_knownnodes(output):
def json_deserialize_knownnodes(source): def json_deserialize_knownnodes(source):
"""
Read JSON from source and make knownnodes dict
"""
for node in json.load(source): for node in json.load(source):
peer = node['peer'] peer = node['peer']
peer['host'] = str(peer['host']) peer['host'] = str(peer['host'])
@ -36,9 +42,12 @@ def json_deserialize_knownnodes(source):
def pickle_deserialize_old_knownnodes(source): def pickle_deserialize_old_knownnodes(source):
"""
Unpickle source and reorganize knownnodes dict if it's in old format
the old format was {Peer:lastseen, ...}
the new format is {Peer:{"lastseen":i, "rating":f}}
"""
knownNodes = pickle.load(source) knownNodes = pickle.load(source)
# the old format was {Peer:lastseen, ...}
# the new format is {Peer:{"lastseen":i, "rating":f}}
for stream in knownNodes.keys(): for stream in knownNodes.keys():
for node, params in knownNodes[stream].items(): for node, params in knownNodes[stream].items():
if isinstance(params, (float, int)): if isinstance(params, (float, int)):
@ -54,10 +63,8 @@ def saveKnownNodes(dirName=None):
def addKnownNode(stream, peer, lastseen=None, is_self=False): def addKnownNode(stream, peer, lastseen=None, is_self=False):
if lastseen is None:
lastseen = time.time()
knownNodes[stream][peer] = { knownNodes[stream][peer] = {
"lastseen": lastseen, "lastseen": lastseen or time.time(),
"rating": 0, "rating": 0,
"self": is_self, "self": is_self,
} }