StarMirror/py-libp2p
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Allow the key pair to drive ID generation

Browse Source
This commit is contained in:
Alex Stokes 2019-09-03 13:26:58 -07:00
parent eaeb36c1d9
commit 350cc04c97
No known key found for this signature in database
GPG Key ID: 51CE1721B245C086
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libp2p/__init__.py
View File

@ -41,9 +41,7 @@ def generate_new_rsa_identity() -> KeyPair:
return create_new_key_pair() return create_new_key_pair()
def generate_peer_id_from_rsa_identity(key_pair: KeyPair = None) -> ID: def generate_peer_id_from(key_pair: KeyPair) -> ID:
if not key_pair:
key_pair = generate_new_rsa_identity()
public_key = key_pair.public_key public_key = key_pair.public_key
return ID.from_pubkey(public_key) return ID.from_pubkey(public_key)
@ -61,7 +59,8 @@ def initialize_default_kademlia_router(
:return: return a default kademlia instance :return: return a default kademlia instance
""" """
if not id_opt: if not id_opt:
id_opt = generate_peer_id_from_rsa_identity() key_pair = generate_new_rsa_identity()
id_opt = generate_peer_id_from(key_pair)
node_id = id_opt.to_bytes() node_id = id_opt.to_bytes()
# ignore type for Kademlia module # ignore type for Kademlia module
@ -92,7 +91,7 @@ def initialize_default_swarm(
""" """
if not id_opt: if not id_opt:
id_opt = generate_peer_id_from_rsa_identity(key_pair) id_opt = generate_peer_id_from(key_pair)
# TODO: Parse `transport_opt` to determine transport # TODO: Parse `transport_opt` to determine transport
transport = TCP() transport = TCP()
@ -114,7 +113,6 @@ def initialize_default_swarm(
async def new_node( async def new_node(
key_pair: KeyPair = None, key_pair: KeyPair = None,
swarm_opt: INetwork = None, swarm_opt: INetwork = None,
id_opt: ID = None,
transport_opt: Sequence[str] = None, transport_opt: Sequence[str] = None,
muxer_opt: Mapping[TProtocol, MuxerClassType] = None, muxer_opt: Mapping[TProtocol, MuxerClassType] = None,
sec_opt: Mapping[TProtocol, ISecureTransport] = None, sec_opt: Mapping[TProtocol, ISecureTransport] = None,
@ -137,8 +135,7 @@ async def new_node(
if not key_pair: if not key_pair:
key_pair = generate_new_rsa_identity() key_pair = generate_new_rsa_identity()
if not id_opt: id_opt = generate_peer_id_from(key_pair)
id_opt = generate_peer_id_from_rsa_identity(key_pair)
if not swarm_opt: if not swarm_opt:
swarm_opt = initialize_default_swarm( swarm_opt = initialize_default_swarm(