patbot

Author: clabby

consensus/src/marshal/coding/mod.rs

@@ -119,7 +119,6 @@ mod tests {
     #[test]
     fn mailbox_provides_application_blocks() {
         fn assert_provider<P: BlockProvider<Block = CodingB>>() {}
-
         assert_provider::<core::Mailbox<S, TestCodingVariant>>();
     }
 

consensus/src/marshal/standard/mod.rs

@@ -43,6 +43,7 @@ mod tests {
     use super::{Deferred, Inline, Standard};
     use crate::{
         marshal::{
+            ancestry::BlockProvider,
             config::Config,
             core::{cache, Actor, CommitmentFallback, Mailbox},
             mocks::{
@@ -105,6 +106,12 @@ mod tests {
         time::Duration,
     };
 
+    #[test]
+    fn mailbox_provides_application_blocks() {
+        fn assert_provider<P: BlockProvider<Block = B>>() {}
+        assert_provider::<Mailbox<S, Standard<B>>>();
+    }
+
     fn assert_finalize_deterministic<H: TestHarness>(
         seed: u64,
         link: commonware_p2p::simulated::Link,

consensus/src/marshal/standard/variant.rs

@@ -4,13 +4,16 @@
 //! receives the full block directly from the proposer or via gossip.
 
 use crate::{
-    marshal::core::{Buffer, Variant},
+    marshal::{
+        ancestry::BlockProvider,
+        core::{Buffer, DigestFallback, Mailbox, Variant},
+    },
     types::Round,
     Block,
 };
 use commonware_broadcast::{buffered, Broadcaster};
 use commonware_codec::Read;
-use commonware_cryptography::{Digestible, PublicKey};
+use commonware_cryptography::{certificate::Scheme, Digestible, PublicKey};
 use commonware_p2p::Recipients;
 use commonware_utils::channel::oneshot;
 
@@ -89,3 +92,17 @@ where
         Broadcaster::broadcast(self, recipients, block);
     }
 }
+
+impl<S, B> BlockProvider for Mailbox<S, Standard<B>>
+where
+    S: Scheme,
+    B: Block,
+{
+    type Block = B;
+
+    async fn subscribe(self, digest: B::Digest) -> Option<Self::Block> {
+        self.subscribe_by_digest(digest, DigestFallback::Wait)
+            .await
+            .ok()
+    }
+}