fix

Author: patrick-ogrady

consensus/src/marshal/ancestry.rs

@@ -26,7 +26,7 @@ pub trait Ancestry<B: Block>: Stream<Item = B> + Send + Unpin + 'static {
 /// Creates an ancestry stream from a fixed sequence of blocks.
 ///
 /// Blocks are yielded in iterator order and no parent fetching is performed. This is useful when
-/// the caller already has the complete ancestry needed by an application.
+/// the caller wants to bound the ancestry available to the application.
 pub fn from_iter<B>(blocks: impl IntoIterator<Item = B>) -> impl Ancestry<B>
 where
     B: Block,

consensus/src/marshal/core/subscriptions.rs

@@ -153,7 +153,10 @@ mod tests {
             Some(receiver)
         }
 
-        fn subscribe_by_commitment(&self, _commitment: Digest) -> Option<oneshot::Receiver<TestBlock>> {
+        fn subscribe_by_commitment(
+            &self,
+            _commitment: Digest,
+        ) -> Option<oneshot::Receiver<TestBlock>> {
             let (sender, receiver) = oneshot::channel();
             self.commitment_subscribers.lock().push(sender);
             Some(receiver)

examples/reshare/src/engine.rs

@@ -404,9 +404,9 @@ where
             callback,
         );
         let buffer_handle = self.buffer.start(broadcast);
-        let marshal_handle =
-            self.marshal
-                .start(self.dkg_mailbox, Some(self.buffered_mailbox), marshal);
+        let marshal_handle = self
+            .marshal
+            .start(self.dkg_mailbox, self.buffered_mailbox, marshal);
         let orchestrator_handle = self.orchestrator.start(votes, certificates, resolver);
 
         if let Err(e) = try_join_all(vec![