Revert "Refactory of Fork-Tree data structure (#11228)"

This reverts commit b9df248.
paritytech · May 25, 2022 · 30a1cb2 · 30a1cb2
1 parent ef66142
commit 30a1cb2
Show file tree

Hide file tree

Showing 2 changed files with 424 additions and 359 deletions.
diff --git a/client/finality-grandpa/src/authorities.rs b/client/finality-grandpa/src/authorities.rs
@@ -229,7 +229,7 @@ where
 	where
 		F: Fn(&H, &H) -> Result<bool, E>,
 	{
-		let filter = |node_hash: &H, node_num: &N, _: &PendingChange<H, N>| {
+		let mut filter = |node_hash: &H, node_num: &N, _: &PendingChange<H, N>| {
 			if number >= *node_num &&
 				(is_descendent_of(node_hash, &hash).unwrap_or_default() || *node_hash == hash)
 			{
@@ -245,7 +245,7 @@ where
 		};
 
 		// Remove standard changes.
-		let _ = self.pending_standard_changes.drain_filter(&filter);
+		let _ = self.pending_standard_changes.drain_filter(&mut filter);
 
 		// Remove forced changes.
 		self.pending_forced_changes