varun-r-mallya/py-libp2p
1
0
Fork 0
mirror of https://github.com/varun-r-mallya/py-libp2p.git synced 2025-12-31 20:36:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Convert from base58/pubkey/privkey to class method

Browse Source
This commit is contained in:
NIC619
2019-07-31 19:31:58 +08:00
parent 80481252ca
commit b928bdb356
7 changed files with 46 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libp2p/pubsub/floodsub.py
View File

@ -1,6 +1,6 @@
from typing import Iterable, List, Sequence
from libp2p.peer.id import ID, id_b58_decode
from libp2p.peer.id import ID
from .pb import rpc_pb2
from .pubsub import Pubsub
@ -106,7 +106,7 @@ class FloodSub(IPubsubRouter):
if topic not in self.pubsub.peer_topics:
continue
for peer_id_str in self.pubsub.peer_topics[topic]:
peer_id = id_b58_decode(peer_id_str)
peer_id = ID.from_base58(peer_id_str)
if peer_id in (msg_forwarder, origin):
continue
# FIXME: Should change `self.pubsub.peers` to Dict[PeerID, ...]

15
libp2p/pubsub/gossipsub.py
View File

@ -1,9 +1,16 @@
from ast import literal_eval
import asyncio
import random
from typing import Any, Dict, Iterable, List, Set, Sequence
from typing import (
Any,
Dict,
Iterable,
List,
Set,
Sequence,
)
from libp2p.peer.id import ID, id_b58_decode
from libp2p.peer.id import ID
from .mcache import MessageCache
from .pb import rpc_pb2
@ -201,7 +208,7 @@ class GossipSub(IPubsubRouter):
# FIXME: `gossipsub.peers_floodsub` can be changed to `gossipsub.peers` in go.
# This will improve the efficiency when searching for a peer's protocol id.
if peer_id_str in self.peers_floodsub:
peer_id = id_b58_decode(peer_id_str)
peer_id = ID.from_base58(peer_id_str)
send_to.add(peer_id)
# gossipsub peers
@ -223,7 +230,7 @@ class GossipSub(IPubsubRouter):
)
in_topic_gossipsub_peers = self.fanout[topic]
for peer_id_str in in_topic_gossipsub_peers:
send_to.add(id_b58_decode(peer_id_str))
send_to.add(ID.from_base58(peer_id_str))
# Excludes `msg_forwarder` and `origin`
yield from send_to.difference([msg_forwarder, origin])