cleanup

Author: patrick-ogrady

Cargo.lock

@@ -20,22 +20,22 @@ license = "MIT OR Apache-2.0"
 alto-chain = { version = "2026.3.0", path = "chain" }
 alto-client = { version = "2026.3.0", path = "client" }
 alto-types = { version = "2026.3.0", path = "types" }
-commonware-actor = { git = "https://github.com/commonwarexyz/monorepo", rev = "86f9be7c6339339b37a420eed7ef640164999124" }
-commonware-broadcast = { git = "https://github.com/commonwarexyz/monorepo", rev = "86f9be7c6339339b37a420eed7ef640164999124" }
-commonware-codec = { git = "https://github.com/commonwarexyz/monorepo", rev = "86f9be7c6339339b37a420eed7ef640164999124" }
-commonware-consensus = { git = "https://github.com/commonwarexyz/monorepo", rev = "86f9be7c6339339b37a420eed7ef640164999124" }
-commonware-cryptography = { git = "https://github.com/commonwarexyz/monorepo", rev = "86f9be7c6339339b37a420eed7ef640164999124" }
-commonware-deployer = { git = "https://github.com/commonwarexyz/monorepo", rev = "86f9be7c6339339b37a420eed7ef640164999124", default-features = false }
-commonware-formatting = { git = "https://github.com/commonwarexyz/monorepo", rev = "86f9be7c6339339b37a420eed7ef640164999124" }
-commonware-macros = { git = "https://github.com/commonwarexyz/monorepo", rev = "86f9be7c6339339b37a420eed7ef640164999124" }
-commonware-p2p = { git = "https://github.com/commonwarexyz/monorepo", rev = "86f9be7c6339339b37a420eed7ef640164999124" }
-commonware-resolver = { git = "https://github.com/commonwarexyz/monorepo", rev = "86f9be7c6339339b37a420eed7ef640164999124" }
-commonware-runtime = { git = "https://github.com/commonwarexyz/monorepo", rev = "86f9be7c6339339b37a420eed7ef640164999124" }
-commonware-storage = { git = "https://github.com/commonwarexyz/monorepo", rev = "86f9be7c6339339b37a420eed7ef640164999124" }
-commonware-stream = { git = "https://github.com/commonwarexyz/monorepo", rev = "86f9be7c6339339b37a420eed7ef640164999124" }
-commonware-utils = { git = "https://github.com/commonwarexyz/monorepo", rev = "86f9be7c6339339b37a420eed7ef640164999124" }
-commonware-math = { git = "https://github.com/commonwarexyz/monorepo", rev = "86f9be7c6339339b37a420eed7ef640164999124" }
-commonware-parallel = { git = "https://github.com/commonwarexyz/monorepo", rev = "86f9be7c6339339b37a420eed7ef640164999124" }
+commonware-actor = { git = "https://github.com/commonwarexyz/monorepo", rev = "325c42c643b8a43ee2d14387d8bc9771d7a40985" }
+commonware-broadcast = { git = "https://github.com/commonwarexyz/monorepo", rev = "325c42c643b8a43ee2d14387d8bc9771d7a40985" }
+commonware-codec = { git = "https://github.com/commonwarexyz/monorepo", rev = "325c42c643b8a43ee2d14387d8bc9771d7a40985" }
+commonware-consensus = { git = "https://github.com/commonwarexyz/monorepo", rev = "325c42c643b8a43ee2d14387d8bc9771d7a40985" }
+commonware-cryptography = { git = "https://github.com/commonwarexyz/monorepo", rev = "325c42c643b8a43ee2d14387d8bc9771d7a40985" }
+commonware-deployer = { git = "https://github.com/commonwarexyz/monorepo", rev = "325c42c643b8a43ee2d14387d8bc9771d7a40985", default-features = false }
+commonware-formatting = { git = "https://github.com/commonwarexyz/monorepo", rev = "325c42c643b8a43ee2d14387d8bc9771d7a40985" }
+commonware-macros = { git = "https://github.com/commonwarexyz/monorepo", rev = "325c42c643b8a43ee2d14387d8bc9771d7a40985" }
+commonware-p2p = { git = "https://github.com/commonwarexyz/monorepo", rev = "325c42c643b8a43ee2d14387d8bc9771d7a40985" }
+commonware-resolver = { git = "https://github.com/commonwarexyz/monorepo", rev = "325c42c643b8a43ee2d14387d8bc9771d7a40985" }
+commonware-runtime = { git = "https://github.com/commonwarexyz/monorepo", rev = "325c42c643b8a43ee2d14387d8bc9771d7a40985" }
+commonware-storage = { git = "https://github.com/commonwarexyz/monorepo", rev = "325c42c643b8a43ee2d14387d8bc9771d7a40985" }
+commonware-stream = { git = "https://github.com/commonwarexyz/monorepo", rev = "325c42c643b8a43ee2d14387d8bc9771d7a40985" }
+commonware-utils = { git = "https://github.com/commonwarexyz/monorepo", rev = "325c42c643b8a43ee2d14387d8bc9771d7a40985" }
+commonware-math = { git = "https://github.com/commonwarexyz/monorepo", rev = "325c42c643b8a43ee2d14387d8bc9771d7a40985" }
+commonware-parallel = { git = "https://github.com/commonwarexyz/monorepo", rev = "325c42c643b8a43ee2d14387d8bc9771d7a40985" }
 thiserror = "2.0.12"
 bytes = "1.7.1"
 rand = "0.8.5"

Cargo.toml

@@ -155,42 +155,8 @@ impl<E: Clock + Storage + Metrics + Spawner> Reporter for Application<E> {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use commonware_consensus::marshal::ancestry;
     use commonware_runtime::{deterministic, Runner as _, Supervisor as _};
-    use futures::Stream;
-    use std::{
-        collections::VecDeque,
-        pin::Pin,
-        task::{Context as TaskContext, Poll},
-    };
-
-    struct TestAncestry {
-        blocks: VecDeque<Block>,
-    }
-
-    impl TestAncestry {
-        fn new(blocks: impl IntoIterator<Item = Block>) -> Self {
-            Self {
-                blocks: blocks.into_iter().collect(),
-            }
-        }
-    }
-
-    impl Stream for TestAncestry {
-        type Item = Block;
-
-        fn poll_next(
-            mut self: Pin<&mut Self>,
-            _: &mut TaskContext<'_>,
-        ) -> Poll<Option<Self::Item>> {
-            Poll::Ready(self.blocks.pop_front())
-        }
-    }
-
-    impl Ancestry<Block> for TestAncestry {
-        fn peek(&self) -> Option<&Block> {
-            self.blocks.front()
-        }
-    }
 
     fn test_context(view: u64, parent: (View, sha256::Digest)) -> Context {
         Context {
@@ -212,7 +178,7 @@ mod tests {
         block: &Block,
         parent: &Block,
     ) -> bool {
-        let ancestry = TestAncestry::new([block.clone(), parent.clone()]);
+        let ancestry = ancestry::from_iter([block.clone(), parent.clone()]);
         commonware_consensus::Application::verify(
             application,
             (context, block.context.clone()),
@@ -227,7 +193,7 @@ mod tests {
         child_context: Context,
         parent: &Block,
     ) -> Block {
-        let ancestry = TestAncestry::new([parent.clone()]);
+        let ancestry = ancestry::from_iter([parent.clone()]);
         commonware_consensus::Application::propose(application, (context, child_context), ancestry)
             .await
             .expect("expected proposal")

chain/src/application.rs

@@ -430,7 +430,7 @@ where
         // Start marshal
         let marshal_handle = self
             .marshal
-            .start(self.marshaled, Some(self.buffer_mailbox), marshal);
+            .start(self.marshaled, self.buffer_mailbox, marshal);
 
         // Start draining queued block uploads before consensus so recovered work
         // resumes immediately on startup.

chain/src/engine.rs

@@ -8,15 +8,13 @@ description = "Run a follower node for alto."
 [dependencies]
 alto-client = { workspace = true }
 alto-types = { workspace = true }
-commonware-broadcast = { workspace = true }
 commonware-actor = { workspace = true }
 commonware-codec = { workspace = true }
 commonware-consensus = { workspace = true }
 commonware-cryptography = { workspace = true }
 commonware-formatting = { workspace = true }
 commonware-macros = { workspace = true }
 commonware-math = { workspace = true }
-commonware-p2p = { workspace = true }
 commonware-resolver = { workspace = true }
 commonware-runtime = { workspace = true }
 commonware-storage = { workspace = true }

follower/Cargo.toml

@@ -6,7 +6,6 @@ use crate::{
     resolver::Resolver,
 };
 use alto_types::{Block, Context, Scheme, EPOCH, EPOCH_LENGTH};
-use commonware_broadcast::buffered;
 use commonware_consensus::{
     marshal::{
         self,
@@ -18,7 +17,7 @@ use commonware_consensus::{
 };
 use commonware_cryptography::{
     certificate::ConstantProvider,
-    ed25519::{PrivateKey, PublicKey},
+    ed25519::PrivateKey,
     sha256::{self, Digest, Sha256},
     Digest as _, Hasher, Signer,
 };
@@ -111,7 +110,11 @@ where
         max_repair: NonZero<usize>,
         strategy: T,
         pruning_depth: Option<u64>,
-    ) -> (Self, MarshalMailbox<Scheme, Standard<Block>>, Height) {
+    ) -> (
+        Self,
+        MarshalMailbox<Scheme, Standard<Block>>,
+        Option<Height>,
+    ) {
         // Initialize the finalized certificate and block archives. Uses
         // prunable archives when pruning is enabled, immutable otherwise.
         let (finalizations_by_height, finalized_blocks, page_cache) =
@@ -171,11 +174,7 @@ where
         let app_handle = app.start();
 
         // Start marshal
-        let marshal_handle = self.marshal.start(
-            mailbox,
-            None::<buffered::Mailbox<PublicKey, Block>>,
-            marshal,
-        );
+        let marshal_handle = self.marshal.start_unbuffered(mailbox, marshal);
 
         // Wait for any actor to finish
         if let Err(e) = try_join_all(vec![marshal_handle, app_handle]).await {

follower/src/engine.rs

@@ -209,7 +209,7 @@ fn main() {
         // On the first run (no previously synced data), optionally skip to the
         // latest finalized height so the follower starts near tip instead of
         // backfilling from genesis.
-        if config.tip && last_processed_height == Height::zero() {
+        if config.tip && last_processed_height.is_none_or(|height| height == Height::zero()) {
             match client.finalized_get(IndexQuery::Latest).await {
                 Ok(finalized) => {
                     assert!(