From f8246ebcdfe4a3b8e36ca8b6dc56d76e904c8fcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?= <andre.beat@gmail.com>
Date: Wed, 13 Feb 2019 14:37:44 +0000
Subject: [PATCH] core: grandpa: collect garbage for topic (#1780)

* core: grandpa: collect garbage for topic

* core: grandpa: use collect_garbage_for_topic in tests
---
 substrate/core/finality-grandpa/src/lib.rs   | 4 ++--
 substrate/core/finality-grandpa/src/tests.rs | 2 +-
 substrate/core/network/src/test/mod.rs       | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/substrate/core/finality-grandpa/src/lib.rs b/substrate/core/finality-grandpa/src/lib.rs
index fc928b7491..54e01822d7 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 119bd11d1c..552e553bf5 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 0c35dcfee3..838e614146 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