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,> Network(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::(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, D> Peer { .send(ProtocolMsg::GossipConsensusMessage(topic, data, broadcast)); } - pub fn consensus_gossip_collect_garbage_for(&self, topic: ::Hash) { - self.with_gossip(move |gossip, _| gossip.collect_garbage(|t| t == &topic)) + pub fn consensus_gossip_collect_garbage_for_topic(&self, topic: ::Hash) { + self.with_gossip(move |gossip, _| gossip.collect_garbage_for_topic(topic)) } /// access the underlying consensus gossip handler