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

always return close peers from findValue

Browse source
This commit is contained in:
Jack Robison 2019-02-04 13:33:06 -05:00
parent 6033399f05
commit f0b49fc153
No known key found for this signature in database
GPG key ID: DF25C68FE0239BB2
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lbrynet/dht/protocol/protocol.py
View file

@ -77,6 +77,7 @@ class KademliaRPC:
response = { response = {
b'token': self.make_token(rpc_contact.compact_ip()), b'token': self.make_token(rpc_contact.compact_ip()),
b'contacts': self.find_node(rpc_contact, key)
} }
if self.protocol.protocol_version: if self.protocol.protocol_version:
@ -93,8 +94,6 @@ class KademliaRPC:
peers.append(self.compact_address()) peers.append(self.compact_address())
if peers: if peers:
response[key] = peers response[key] = peers
else:
response[b'contacts'] = self.find_node(rpc_contact, key)
return response return response
def refresh_token(self): # TODO: this needs to be called periodically def refresh_token(self): # TODO: this needs to be called periodically

3
tests/unit/dht/protocol/test_protocol.py
View file

@ -81,8 +81,9 @@ class TestProtocol(AsyncioTestCase):
self.assertListEqual([peer2_from_peer1], peer1.data_store.get_storing_contacts()) self.assertListEqual([peer2_from_peer1], peer1.data_store.get_storing_contacts())
peer1.data_store.completed_blobs.add(binascii.hexlify(b'2' * 48).decode()) peer1.data_store.completed_blobs.add(binascii.hexlify(b'2' * 48).decode())
find_value_response = peer1.node_rpc.find_value(peer3, b'2' * 48) find_value_response = peer1.node_rpc.find_value(peer3, b'2' * 48)
self.assertEqual(len(find_value_response[b'contacts']), 0)
self.assertSetEqual( self.assertSetEqual(
{b'2' * 48, b'token', b'protocolVersion'}, set(find_value_response.keys()) {b'2' * 48, b'token', b'protocolVersion', b'contacts'}, set(find_value_response.keys())
) )
self.assertEqual(2, len(find_value_response[b'2' * 48])) self.assertEqual(2, len(find_value_response[b'2' * 48]))
self.assertEqual(find_value_response[b'2' * 48][0], peer2_from_peer1.compact_address_tcp()) self.assertEqual(find_value_response[b'2' * 48][0], peer2_from_peer1.compact_address_tcp())