Bitmessage/PyBitmessage-2024-11-30
Archived
2
0
Fork 0
Code Issues 168 Pull Requests 53 Actions Packages Projects Releases 5 Wiki Activity

Dandelion staticmethod fix

Browse Source
This commit is contained in:
Peter Šurda 2018-02-07 17:22:26 +01:00
parent c6834093ee
commit 08bb85a952
Signed by: PeterSurda
GPG Key ID: 0C5F50C0B5F37D87
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/network/dandelion.py
View File

@ -34,8 +34,7 @@ class Dandelion():
self.refresh = time() + REASSIGN_INTERVAL self.refresh = time() + REASSIGN_INTERVAL
self.lock = RLock() self.lock = RLock()
@staticmethod def poissonTimeout(self, start=None, average=0):
def poissonTimeout(start=None, average=0):
if start is None: if start is None:
start = time() start = time()
if average == 0: if average == 0:
@ -49,7 +48,7 @@ class Dandelion():
self.hashMap[hashId] = Stem( self.hashMap[hashId] = Stem(
self.getNodeStem(source), self.getNodeStem(source),
stream, stream,
Dandelion.poissonTimeout()) self.poissonTimeout())
def setHashStream(self, hashId, stream=1): def setHashStream(self, hashId, stream=1):
with self.lock: with self.lock:
@ -57,7 +56,7 @@ class Dandelion():
self.hashMap[hashId] = Stem( self.hashMap[hashId] = Stem(
self.hashMap[hashId].child, self.hashMap[hashId].child,
stream, stream,
Dandelion.poissonTimeout()) self.poissonTimeout())
def removeHash(self, hashId, reason="no reason specified"): def removeHash(self, hashId, reason="no reason specified"):
logging.debug("%s entering fluff mode due to %s.", ''.join('%02x'%ord(i) for i in hashId), reason) logging.debug("%s entering fluff mode due to %s.", ''.join('%02x'%ord(i) for i in hashId), reason)
@ -81,7 +80,7 @@ class Dandelion():
for k in (k for k, v in self.nodeMap.iteritems() if v is None): for k in (k for k, v in self.nodeMap.iteritems() if v is None):
self.nodeMap[k] = connection self.nodeMap[k] = connection
for k, v in {k: v for k, v in self.hashMap.iteritems() if v.child is None}.iteritems(): for k, v in {k: v for k, v in self.hashMap.iteritems() if v.child is None}.iteritems():
self.hashMap[k] = Stem(connection, v.stream, Dandelion.poissionTimeout()) self.hashMap[k] = Stem(connection, v.stream, self.poissionTimeout())
invQueue.put((v.stream, k, v.child)) invQueue.put((v.stream, k, v.child))
@ -94,7 +93,7 @@ class Dandelion():
for k in (k for k, v in self.nodeMap.iteritems() if v == connection): for k in (k for k, v in self.nodeMap.iteritems() if v == connection):
self.nodeMap[k] = None self.nodeMap[k] = None
for k, v in {k: v for k, v in self.hashMap.iteritems() if v.child == connection}.iteritems(): for k, v in {k: v for k, v in self.hashMap.iteritems() if v.child == connection}.iteritems():
self.hashMap[k] = Stem(None, v.stream, Dandelion.poissonTimeout()) self.hashMap[k] = Stem(None, v.stream, self.poissonTimeout())
def pickStem(self, parent=None): def pickStem(self, parent=None):
try: try: