Change pruning predicate to prune existing messages from the same val…

…idator
matter-labs · Jan 23, 2024 · 677b467 · 677b467
1 parent 500b17f
commit 677b467
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 13 deletions.
diff --git a/node/actors/bft/src/leader/state_machine.rs b/node/actors/bft/src/leader/state_machine.rs
@@ -227,14 +227,9 @@ impl StateMachine {
         if pending_req.msg.key != new_req.msg.key {
             return false;
         }
-
         match (&pending_req.msg.msg, &new_req.msg.msg) {
-            (ConsensusMsg::ReplicaPrepare(existing_msg), ConsensusMsg::ReplicaPrepare(new_msg)) => {
-                new_msg.view > existing_msg.view
-            }
-            (ConsensusMsg::ReplicaCommit(existing_msg), ConsensusMsg::ReplicaCommit(new_msg)) => {
-                new_msg.view > existing_msg.view
-            }
+            (ConsensusMsg::ReplicaPrepare(_), ConsensusMsg::ReplicaPrepare(_)) => true,
+            (ConsensusMsg::ReplicaCommit(_), ConsensusMsg::ReplicaCommit(_)) => true,
             _ => false,
         }
     }

diff --git a/node/actors/bft/src/replica/state_machine.rs b/node/actors/bft/src/replica/state_machine.rs
@@ -172,12 +172,8 @@ impl StateMachine {
             return false;
         }
         match (&pending_req.msg.msg, &new_req.msg.msg) {
-            (ConsensusMsg::LeaderPrepare(existing_msg), ConsensusMsg::LeaderPrepare(new_msg)) => {
-                new_msg.view > existing_msg.view
-            }
-            (ConsensusMsg::LeaderCommit(existing_msg), ConsensusMsg::LeaderCommit(new_msg)) => {
-                new_msg.justification.message.view > existing_msg.justification.message.view
-            }
+            (ConsensusMsg::LeaderPrepare(_), ConsensusMsg::LeaderPrepare(_)) => true,
+            (ConsensusMsg::LeaderCommit(_), ConsensusMsg::LeaderCommit(_)) => true,
             _ => false,
         }
     }