diff --git a/substrate/core/finality-grandpa/src/lib.rs b/substrate/core/finality-grandpa/src/lib.rs
index fc928b7491cec1dc5ae3fd46e683531b067e6a67..54e01822d79fbbbdc1d389ffe3d7bdddac03e059 100644
--- a/substrate/core/finality-grandpa/src/lib.rs
+++ b/substrate/core/finality-grandpa/src/lib.rs
@@ -319,12 +319,12 @@ impl<B: BlockT, S: network::specialization::NetworkSpecialization<B>,> Network<B
 
 	fn drop_round_messages(&self, round: u64, set_id: u64) {
 		let topic = message_topic::<B>(round, set_id);
-		self.service.with_gossip(move |gossip, _| gossip.collect_garbage(|t| t == &topic));
+		self.service.with_gossip(move |gossip, _| gossip.collect_garbage_for_topic(topic));
 	}
 
 	fn drop_set_messages(&self, set_id: u64) {
 		let topic = commit_topic::<B>(set_id);
-		self.service.with_gossip(move |gossip, _| gossip.collect_garbage(|t| t == &topic));
+		self.service.with_gossip(move |gossip, _| gossip.collect_garbage_for_topic(topic));
 	}
 
 	fn commit_messages(&self, set_id: u64) -> Self::In {
diff --git a/substrate/core/finality-grandpa/src/tests.rs b/substrate/core/finality-grandpa/src/tests.rs
index 119bd11d1cd752b239b0a9515b66471103ddc451..552e553bf5bc4e8d38357a16a857c410700f7c20 100644
--- a/substrate/core/finality-grandpa/src/tests.rs
+++ b/substrate/core/finality-grandpa/src/tests.rs
@@ -152,7 +152,7 @@ impl MessageRouting {
 	fn drop_messages(&self, topic: Hash) {
 		let inner = self.inner.lock();
 		let peer = inner.peer(self.peer_id);
-        peer.consensus_gossip_collect_garbage_for(topic);
+		peer.consensus_gossip_collect_garbage_for_topic(topic);
 	}
 }
 
diff --git a/substrate/core/network/src/test/mod.rs b/substrate/core/network/src/test/mod.rs
index 0c35dcfee3401a06a5e06f6c471eb33faf42afed..838e6141461f2ed235b18d801a405f61b8a7da28 100644
--- a/substrate/core/network/src/test/mod.rs
+++ b/substrate/core/network/src/test/mod.rs
@@ -372,8 +372,8 @@ impl<V: 'static + Verifier<Block>, D> Peer<V, D> {
 			.send(ProtocolMsg::GossipConsensusMessage(topic, data, broadcast));
 	}
 
-	pub fn consensus_gossip_collect_garbage_for(&self, topic: <Block as BlockT>::Hash) {
-		self.with_gossip(move |gossip, _| gossip.collect_garbage(|t| t == &topic))
+	pub fn consensus_gossip_collect_garbage_for_topic(&self, topic: <Block as BlockT>::Hash) {
+		self.with_gossip(move |gossip, _| gossip.collect_garbage_for_topic(topic))
 	}
 
 	/// access the underlying consensus gossip handler