refactor KadPeerInfo construction

This commit is contained in:
zixuanzh
2019-04-19 20:44:17 -04:00
parent 1512ae27a1
commit 69f9aa5f0e
4 changed files with 31 additions and 58 deletions

View File

@ -1,10 +1,7 @@
from collections import Counter
import logging
from multiaddr import Multiaddr
from libp2p.peer.id import ID
from libp2p.peer.peerdata import PeerData
from .kad_peerinfo import KadPeerInfo, KadPeerHeap
from .kad_peerinfo import KadPeerHeap, create_kad_peerinfo
from .utils import gather_dict
@ -186,14 +183,4 @@ class RPCFindResponse:
be set.
"""
nodelist = self.response[1] or []
output = []
for nodeple in nodelist:
#TODO check if nodeple is of the right format
# node_id, ip, port
node_id = ID(nodeple[0])
peer_data = PeerData() #pylint: disable=no-value-for-parameter
addr = [Multiaddr("/ip4/" + str(nodeple[1]) + "/udp/" + str(nodeple[2]))]
peer_data.add_addrs(addr)
output.append(KadPeerInfo(node_id, peer_data))
return output
return [create_kad_peerinfo(*nodeple) for nodeple in nodelist]