Apply PR feedback:

Only use pop method if graceful failure handling is desired
This commit is contained in:
NIC619 2019-11-21 14:48:03 +08:00
parent 19907e18ec
commit 501eef59de
No known key found for this signature in database
GPG Key ID: 570C35F5C2D51B17
3 changed files with 6 additions and 4 deletions

View File

@ -270,9 +270,11 @@ class Swarm(INetwork):
"""Simply remove the connection from Swarm's records, without closing """Simply remove the connection from Swarm's records, without closing
the connection.""" the connection."""
peer_id = swarm_conn.muxed_conn.peer_id peer_id = swarm_conn.muxed_conn.peer_id
if peer_id not in self.connections:
return
# TODO: Should be changed to remove the exact connection, # TODO: Should be changed to remove the exact connection,
# if we have several connections per peer in the future. # if we have several connections per peer in the future.
self.connections.pop(peer_id, None) del self.connections[peer_id]
# Notifee # Notifee

View File

@ -353,8 +353,8 @@ class GossipSub(IPubsubRouter):
# TODO: there's no way time_since_last_publish gets set anywhere yet # TODO: there's no way time_since_last_publish gets set anywhere yet
if self.time_since_last_publish[topic] > self.time_to_live: if self.time_since_last_publish[topic] > self.time_to_live:
# Remove topic from fanout # Remove topic from fanout
self.fanout.pop(topic, None) del self.fanout[topic]
self.time_since_last_publish.pop(topic, None) del self.time_since_last_publish[topic]
else: else:
num_fanout_peers_in_topic = len(self.fanout[topic]) num_fanout_peers_in_topic = len(self.fanout[topic])

View File

@ -298,7 +298,7 @@ class Pubsub:
def _handle_dead_peer(self, peer_id: ID) -> None: def _handle_dead_peer(self, peer_id: ID) -> None:
if peer_id not in self.peers: if peer_id not in self.peers:
return return
self.peers.pop(peer_id, None) del self.peers[peer_id]
for topic in self.peer_topics: for topic in self.peer_topics:
if peer_id in self.peer_topics[topic]: if peer_id in self.peer_topics[topic]: