Madiator2011/lbry-sdk
1
0
Fork 0
forked from LBRYCommunity/lbry-sdk
Code Pull requests Activity

Merge pull request #1639 from lbryio/fix-1638

Browse source 
fix bytes/str in iterativeFindValue
This commit is contained in:
Jack Robison 2018-11-14 16:22:30 -05:00 committed by GitHub
commit 3a27a4509a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lbrynet/dht/iterativefind.py
View file

@ -67,7 +67,7 @@ class _IterativeFind:
def getContactTriples(self, result): def getContactTriples(self, result):
if self.is_find_value_request: if self.is_find_value_request:
contact_triples = result['contacts'] contact_triples = result[b'contacts']
else: else:
contact_triples = result contact_triples = result
for contact_tup in contact_triples: for contact_tup in contact_triples:
@ -112,11 +112,11 @@ class _IterativeFind:
# We are looking for a value, and the remote node didn't have it # We are looking for a value, and the remote node didn't have it
# - mark it as the closest "empty" node, if it is # - mark it as the closest "empty" node, if it is
# TODO: store to this peer after finding the value as per the kademlia spec # TODO: store to this peer after finding the value as per the kademlia spec
if 'closestNodeNoValue' in self.find_value_result: if b'closestNodeNoValue' in self.find_value_result:
if self.is_closer(contact): if self.is_closer(contact):
self.find_value_result['closestNodeNoValue'] = contact self.find_value_result[b'closestNodeNoValue'] = contact
else: else:
self.find_value_result['closestNodeNoValue'] = contact self.find_value_result[b'closestNodeNoValue'] = contact
contactTriples = self.getContactTriples(result) contactTriples = self.getContactTriples(result)
for contactTriple in contactTriples: for contactTriple in contactTriples:
if (contactTriple[1], contactTriple[2]) in ((c.address, c.port) for c in self.already_contacted): if (contactTriple[1], contactTriple[2]) in ((c.address, c.port) for c in self.already_contacted):