LBRYCommunity/lbry-sdk
1
0
Fork 1
Code Issues Pull requests Projects Releases 282 Packages Wiki Activity

Merge pull request #1818 from lbryio/fix-find-value

Browse source 
fix error encoding find value response
This commit is contained in:
Jack Robison 2019-01-26 17:26:23 -05:00 committed by GitHub
commit f6e7700c4c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -86,7 +86,7 @@ class KademliaRPC:
has_other_peers = self.protocol.data_store.has_peers_for_blob(key) has_other_peers = self.protocol.data_store.has_peers_for_blob(key)
peers = [] peers = []
if has_other_peers: if has_other_peers:
peers.extend(self.protocol.data_store.get_peers_for_blob(key)) peers.extend([peer.compact_address_tcp() for peer in self.protocol.data_store.get_peers_for_blob(key)])
# if we don't have k storing peers to return and we have this hash locally, include our contact information # if we don't have k storing peers to return and we have this hash locally, include our contact information
if len(peers) < constants.k and binascii.hexlify(key).decode() in self.protocol.data_store.completed_blobs: if len(peers) < constants.k and binascii.hexlify(key).decode() in self.protocol.data_store.completed_blobs:

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

@ -1,6 +1,8 @@
import asyncio import asyncio
import binascii
from torba.testcase import AsyncioTestCase from torba.testcase import AsyncioTestCase
from tests import dht_mocks from tests import dht_mocks
from lbrynet.dht.serialization.bencoding import bencode, bdecode
from lbrynet.dht import constants from lbrynet.dht import constants
from lbrynet.dht.protocol.protocol import KademliaProtocol from lbrynet.dht.protocol.protocol import KademliaProtocol
from lbrynet.dht.peer import PeerManager from lbrynet.dht.peer import PeerManager
@ -67,6 +69,7 @@ class TestProtocol(AsyncioTestCase):
peer2_from_peer1 = peer1.peer_manager.get_kademlia_peer( peer2_from_peer1 = peer1.peer_manager.get_kademlia_peer(
peer2.node_id, peer2.external_ip, udp_port=peer2.udp_port peer2.node_id, peer2.external_ip, udp_port=peer2.udp_port
) )
peer2_from_peer1.update_tcp_port(3333)
peer3 = peer1.peer_manager.get_kademlia_peer( peer3 = peer1.peer_manager.get_kademlia_peer(
constants.generate_id(), '1.2.3.6', udp_port=4444 constants.generate_id(), '1.2.3.6', udp_port=4444
) )
@ -76,14 +79,14 @@ class TestProtocol(AsyncioTestCase):
self.assertEqual(True, peer1.data_store.has_peers_for_blob(b'2' * 48)) self.assertEqual(True, peer1.data_store.has_peers_for_blob(b'2' * 48))
self.assertEqual(False, peer1.data_store.has_peers_for_blob(b'3' * 48)) self.assertEqual(False, peer1.data_store.has_peers_for_blob(b'3' * 48))
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())
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.assertSetEqual( self.assertSetEqual(
{b'2' * 48, b'token', b'protocolVersion'}, set(find_value_response.keys()) {b'2' * 48, b'token', b'protocolVersion'}, set(find_value_response.keys())
) )
self.assertEqual(1, 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) self.assertEqual(find_value_response[b'2' * 48][0], peer2_from_peer1.compact_address_tcp())
# self.assertEqual(peer2_from_peer1.tcp_port, 3333) self.assertDictEqual(bdecode(bencode(find_value_response)), find_value_response)
peer1.stop() peer1.stop()
peer2.stop() peer2.stop()