core: grandpa: collect garbage for topic (#1780)

* core: grandpa: collect garbage for topic

* core: grandpa: use collect_garbage_for_topic in tests
This commit is contained in:
André Silva
2019-02-13 14:37:44 +00:00
committed by Gav Wood
parent 380d17d989
commit f8246ebcdf
3 changed files with 5 additions and 5 deletions
+2 -2
View File
@@ -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 {
+1 -1
View File
@@ -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);
}
}
+2 -2
View File
@@ -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