From 94c7a0bca472b7c0756565ba755a68a4ba44240c Mon Sep 17 00:00:00 2001 From: NIC619 Date: Tue, 26 Nov 2019 14:04:28 +0800 Subject: [PATCH] Apply PR feedback and fix --- libp2p/peer/peerdata.py | 2 ++ tests/libp2p/test_libp2p.py | 7 ++++--- tests/peer/test_peerstore.py | 9 +++++---- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/libp2p/peer/peerdata.py b/libp2p/peer/peerdata.py index f26ddd6..02df07e 100644 --- a/libp2p/peer/peerdata.py +++ b/libp2p/peer/peerdata.py @@ -16,6 +16,8 @@ class PeerData(IPeerData): addrs: List[Multiaddr] def __init__(self) -> None: + self.pubkey = None + self.privkey = None self.metadata = {} self.protocols = [] self.addrs = [] diff --git a/tests/libp2p/test_libp2p.py b/tests/libp2p/test_libp2p.py index 330250c..541c173 100644 --- a/tests/libp2p/test_libp2p.py +++ b/tests/libp2p/test_libp2p.py @@ -328,18 +328,19 @@ async def test_host_connect(): transport_opt_list = [["/ip4/127.0.0.1/tcp/0"], ["/ip4/127.0.0.1/tcp/0"]] (node_a, node_b) = await set_up_nodes_by_transport_opt(transport_opt_list) - assert not node_a.get_peerstore().peer_ids() + # Only our peer ID is stored in peer store + assert len(node_a.get_peerstore().peer_ids()) == 1 addr = node_b.get_addrs()[0] info = info_from_p2p_addr(addr) await node_a.connect(info) - assert len(node_a.get_peerstore().peer_ids()) == 1 + assert len(node_a.get_peerstore().peer_ids()) == 2 await node_a.connect(info) # make sure we don't do double connection - assert len(node_a.get_peerstore().peer_ids()) == 1 + assert len(node_a.get_peerstore().peer_ids()) == 2 assert node_b.get_id() in node_a.get_peerstore().peer_ids() ma_node_b = multiaddr.Multiaddr("/p2p/%s" % node_b.get_id().pretty()) diff --git a/tests/peer/test_peerstore.py b/tests/peer/test_peerstore.py index ffb7b2d..4a45651 100644 --- a/tests/peer/test_peerstore.py +++ b/tests/peer/test_peerstore.py @@ -1,13 +1,14 @@ -from libp2p.peer.peerstore import PeerStore +import pytest + +from libp2p.peer.peerstore import PeerStore, PeerStoreError # Testing methods from IPeerStore base class. def test_peer_info_empty(): store = PeerStore() - info = store.peer_info("peer") - - assert not info + with pytest.raises(PeerStoreError): + store.peer_info("peer") def test_peer_info_basic():