From 6e4d75a6eb98ed2836641c92d137911fd83d2f1d Mon Sep 17 00:00:00 2001 From: zixuanzh Date: Thu, 20 Dec 2018 18:13:31 -0500 Subject: [PATCH] replace ipfs with p2p --- host/basic_host.py | 2 +- peer/peerinfo.py | 4 ++-- tests/libp2p/test_libp2p.py | 2 +- tests/peer/test_peerinfo.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/host/basic_host.py b/host/basic_host.py index 1568b74..0c3bf0e 100644 --- a/host/basic_host.py +++ b/host/basic_host.py @@ -42,7 +42,7 @@ class BasicHost(IHost): """ :return: all the multiaddr addresses this host is listening too """ - p2p_part = multiaddr.Multiaddr('/ipfs/{}'.format(self.get_id().pretty())) + p2p_part = multiaddr.Multiaddr('/p2p/{}'.format(self.get_id().pretty())) addrs = [] for transport in self.network.listeners.values(): diff --git a/peer/peerinfo.py b/peer/peerinfo.py index fc23261..9b8b939 100644 --- a/peer/peerinfo.py +++ b/peer/peerinfo.py @@ -20,11 +20,11 @@ def info_from_p2p_addr(addr): raise InvalidAddrError() ipfspart = parts[-1] - if ipfspart.protocols()[0].code != multiaddr.protocols.P_IPFS: + if ipfspart.protocols()[0].code != multiaddr.protocols.P_P2P: raise InvalidAddrError() # make sure the /ipfs value parses as a peer.ID - peer_id_str = ipfspart.value_for_protocol(multiaddr.protocols.P_IPFS) + peer_id_str = ipfspart.value_for_protocol(multiaddr.protocols.P_P2P) peer_id = id_b58_decode(peer_id_str) # we might have received just an / ipfs part, which means there's no addr. diff --git a/tests/libp2p/test_libp2p.py b/tests/libp2p/test_libp2p.py index 863d4c2..796b3ce 100644 --- a/tests/libp2p/test_libp2p.py +++ b/tests/libp2p/test_libp2p.py @@ -147,6 +147,6 @@ async def test_host_connect(): assert len(node_a.get_peerstore().peers()) == 1 assert node_b.get_id() in node_a.get_peerstore().peers() - ma_node_b = multiaddr.Multiaddr('/ipfs/%s' % node_b.get_id().pretty()) + ma_node_b = multiaddr.Multiaddr('/p2p/%s' % node_b.get_id().pretty()) for addr in node_a.get_peerstore().addrs(node_b.get_id()): assert addr.encapsulate(ma_node_b) in node_b.get_addrs() diff --git a/tests/peer/test_peerinfo.py b/tests/peer/test_peerinfo.py index 284d001..cbed83d 100644 --- a/tests/peer/test_peerinfo.py +++ b/tests/peer/test_peerinfo.py @@ -4,7 +4,7 @@ from peer.peerinfo import info_from_p2p_addr def test_info_from_p2p_addr(): # pylint: disable=line-too-long - m_addr = multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/8000/ipfs/3YgLAeMKSAPcGqZkAt8mREqhQXmJT8SN8VCMN4T6ih4GNX9wvK8mWJnWZ1qA2mLdCQ') + m_addr = multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/8000/p2p/3YgLAeMKSAPcGqZkAt8mREqhQXmJT8SN8VCMN4T6ih4GNX9wvK8mWJnWZ1qA2mLdCQ') info = info_from_p2p_addr(m_addr) assert info.peer_id.pretty() == '3YgLAeMKSAPcGqZkAt8mREqhQXmJT8SN8VCMN4T6ih4GNX9wvK8mWJnWZ1qA2mLdCQ' assert len(info.addrs) == 1