Apply PR feedback:

Only use pop method if error handling is in place
This commit is contained in:
NIC619 2019-11-23 16:04:22 +08:00
parent 501eef59de
commit e355cb2600
No known key found for this signature in database
GPG Key ID: 570C35F5C2D51B17
2 changed files with 4 additions and 4 deletions

View File

@ -292,7 +292,7 @@ class GossipSub(IPubsubRouter):
await self.emit_prune(topic, peer) await self.emit_prune(topic, peer)
# Forget mesh[topic] # Forget mesh[topic]
self.mesh.pop(topic, None) del self.mesh[topic]
# Heartbeat # Heartbeat
async def heartbeat(self) -> None: async def heartbeat(self) -> None:

View File

@ -282,7 +282,7 @@ class Pubsub:
await stream.write(encode_varint_prefixed(hello.SerializeToString())) await stream.write(encode_varint_prefixed(hello.SerializeToString()))
except StreamClosed: except StreamClosed:
logger.debug("Fail to add new peer %s: stream closed", peer_id) logger.debug("Fail to add new peer %s: stream closed", peer_id)
self.peers.pop(peer_id, None) del self.peers[peer_id]
return return
# TODO: Check EOF of this stream. # TODO: Check EOF of this stream.
# TODO: Check if the peer in black list. # TODO: Check if the peer in black list.
@ -290,7 +290,7 @@ class Pubsub:
self.router.add_peer(peer_id, stream.get_protocol()) self.router.add_peer(peer_id, stream.get_protocol())
except Exception as error: except Exception as error:
logger.debug("fail to add new peer %s, error %s", peer_id, error) logger.debug("fail to add new peer %s, error %s", peer_id, error)
self.peers.pop(peer_id, None) del self.peers[peer_id]
return return
logger.debug("added new peer %s", peer_id) logger.debug("added new peer %s", peer_id)
@ -410,7 +410,7 @@ class Pubsub:
if topic_id not in self.my_topics: if topic_id not in self.my_topics:
return return
# Remove topic_id from map if present # Remove topic_id from map if present
self.my_topics.pop(topic_id, None) del self.my_topics[topic_id]
# Create unsubscribe message # Create unsubscribe message
packet: rpc_pb2.RPC = rpc_pb2.RPC() packet: rpc_pb2.RPC = rpc_pb2.RPC()