Merge branch 'main' into gprusak-or-canceled

matter-labs · Nov 30, 2023 · e55d355 · e55d355
2 parents 70d422b + 4acf065
commit e55d355
Show file tree

Hide file tree

Showing 11 changed files with 1,570 additions and 170 deletions.
diff --git a/node/Cargo.lock b/node/Cargo.lock
diff --git a/node/actors/bft/Cargo.toml b/node/actors/bft/Cargo.toml
@@ -24,3 +24,4 @@ vise.workspace = true
 
 [dev-dependencies]
 tokio.workspace = true
+assert_matches.workspace = true
diff --git a/node/actors/bft/src/leader/mod.rs b/node/actors/bft/src/leader/mod.rs
@@ -8,4 +8,8 @@ mod state_machine;
 #[cfg(test)]
 mod tests;
 
-pub(crate) use state_machine::StateMachine;
+#[cfg(test)]
+pub(crate) use self::replica_commit::Error as ReplicaCommitError;
+#[cfg(test)]
+pub(crate) use self::replica_prepare::Error as ReplicaPrepareError;
+pub(crate) use self::state_machine::StateMachine;