Store our pubkey/privkey info during

`initialize_default_swarm`
This commit is contained in:
NIC619 2019-11-25 16:55:55 +08:00
parent 144d93a023
commit a63f00d8f8
No known key found for this signature in database
GPG Key ID: 570C35F5C2D51B17
3 changed files with 9 additions and 9 deletions

View File

@ -105,6 +105,10 @@ def initialize_default_swarm(
) )
peerstore = peerstore_opt or PeerStore() peerstore = peerstore_opt or PeerStore()
# Store our key pair in peerstore
peerstore.add_pubkey(id_opt, key_pair.public_key)
peerstore.add_privkey(id_opt, key_pair.private_key)
# TODO: Initialize discovery if not presented # TODO: Initialize discovery if not presented
return Swarm(id_opt, peerstore, upgrader, transport) return Swarm(id_opt, peerstore, upgrader, transport)
@ -151,9 +155,9 @@ async def new_node(
# TODO routing unimplemented # TODO routing unimplemented
host: IHost # If not explicitly typed, MyPy raises error host: IHost # If not explicitly typed, MyPy raises error
if disc_opt: if disc_opt:
host = RoutedHost(key_pair.public_key, swarm_opt, disc_opt) host = RoutedHost(swarm_opt, disc_opt)
else: else:
host = BasicHost(key_pair.public_key, swarm_opt) host = BasicHost(swarm_opt)
# Kick off cleanup job # Kick off cleanup job
asyncio.ensure_future(cleanup_done_tasks()) asyncio.ensure_future(cleanup_done_tasks())

View File

@ -39,7 +39,6 @@ class BasicHost(IHost):
right after a stream is initialized. right after a stream is initialized.
""" """
_public_key: PublicKey
_network: INetwork _network: INetwork
peerstore: IPeerStore peerstore: IPeerStore
@ -48,11 +47,9 @@ class BasicHost(IHost):
def __init__( def __init__(
self, self,
public_key: PublicKey,
network: INetwork, network: INetwork,
default_protocols: "OrderedDict[TProtocol, StreamHandlerFn]" = None, default_protocols: "OrderedDict[TProtocol, StreamHandlerFn]" = None,
) -> None: ) -> None:
self._public_key = public_key
self._network = network self._network = network
self._network.set_stream_handler(self._swarm_stream_handler) self._network.set_stream_handler(self._swarm_stream_handler)
self.peerstore = self._network.peerstore self.peerstore = self._network.peerstore
@ -68,7 +65,7 @@ class BasicHost(IHost):
return self._network.get_peer_id() return self._network.get_peer_id()
def get_public_key(self) -> PublicKey: def get_public_key(self) -> PublicKey:
return self._public_key return self.peerstore.pubkey(self.get_id())
def get_network(self) -> INetwork: def get_network(self) -> INetwork:
""" """

View File

@ -1,4 +1,3 @@
from libp2p.crypto.keys import PublicKey
from libp2p.host.basic_host import BasicHost from libp2p.host.basic_host import BasicHost
from libp2p.host.exceptions import ConnectionFailure from libp2p.host.exceptions import ConnectionFailure
from libp2p.network.network_interface import INetwork from libp2p.network.network_interface import INetwork
@ -11,8 +10,8 @@ from libp2p.routing.interfaces import IPeerRouting
class RoutedHost(BasicHost): class RoutedHost(BasicHost):
_router: IPeerRouting _router: IPeerRouting
def __init__(self, public_key: PublicKey, network: INetwork, router: IPeerRouting): def __init__(self, network: INetwork, router: IPeerRouting):
super().__init__(public_key, network) super().__init__(network)
self._router = router self._router = router
async def connect(self, peer_info: PeerInfo) -> None: async def connect(self, peer_info: PeerInfo) -> None: