Rename hashfield pack functions to bytes
This commit is contained in:
parent
a1a4a73260
commit
dee562437b
2 changed files with 7 additions and 7 deletions
|
@ -310,7 +310,7 @@ class Peer(object):
|
|||
res = self.request("getHashfield", {"site": self.site.address})
|
||||
if not res or "error" in res or "hashfield_raw" not in res:
|
||||
return False
|
||||
self.hashfield.replaceFromString(res["hashfield_raw"])
|
||||
self.hashfield.replaceFromBytes(res["hashfield_raw"])
|
||||
|
||||
return self.hashfield
|
||||
|
||||
|
@ -349,7 +349,7 @@ class Peer(object):
|
|||
if self.time_my_hashfield_sent and self.site.content_manager.hashfield.time_changed <= self.time_my_hashfield_sent:
|
||||
return False # Peer already has the latest hashfield
|
||||
|
||||
res = self.request("setHashfield", {"site": self.site.address, "hashfield_raw": self.site.content_manager.hashfield.tostring()})
|
||||
res = self.request("setHashfield", {"site": self.site.address, "hashfield_raw": self.site.content_manager.hashfield.tobytes()})
|
||||
if not res or "error" in res:
|
||||
return False
|
||||
else:
|
||||
|
|
|
@ -3,7 +3,7 @@ import time
|
|||
|
||||
|
||||
class PeerHashfield(object):
|
||||
__slots__ = ("storage", "time_changed", "append", "remove", "tostring", "fromstring", "__len__", "__iter__")
|
||||
__slots__ = ("storage", "time_changed", "append", "remove", "tobytes", "frombytes", "__len__", "__iter__")
|
||||
def __init__(self):
|
||||
self.storage = self.createStorage()
|
||||
self.time_changed = time.time()
|
||||
|
@ -12,8 +12,8 @@ class PeerHashfield(object):
|
|||
storage = array.array("H")
|
||||
self.append = storage.append
|
||||
self.remove = storage.remove
|
||||
self.tostring = storage.tostring
|
||||
self.fromstring = storage.fromstring
|
||||
self.tobytes = storage.tobytes
|
||||
self.frombytes = storage.frombytes
|
||||
self.__len__ = storage.__len__
|
||||
self.__iter__ = storage.__iter__
|
||||
return storage
|
||||
|
@ -58,9 +58,9 @@ class PeerHashfield(object):
|
|||
def hasHash(self, hash):
|
||||
return int(hash[0:4], 16) in self.storage
|
||||
|
||||
def replaceFromString(self, hashfield_raw):
|
||||
def replaceFromBytes(self, hashfield_raw):
|
||||
self.storage = self.createStorage()
|
||||
self.storage.fromstring(hashfield_raw)
|
||||
self.storage.frombytes(hashfield_raw)
|
||||
self.time_changed = time.time()
|
||||
|
||||
if __name__ == "__main__":
|
||||
|
|
Loading…
Reference in a new issue