Skip to content

Commit d5874a1

Browse files
committed
update
1 parent e693d03 commit d5874a1

File tree

2 files changed

+25
-19
lines changed

2 files changed

+25
-19
lines changed

Cargo.lock

Lines changed: 13 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

chain/src/engine.rs

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,15 @@ use std::{num::NonZero, time::Duration};
3636
use tracing::{error, warn};
3737

3838
/// Reporter type for [threshold_simplex::Engine].
39-
type Reporter<E, I> =
40-
Reporters<Activity, marshal::Mailbox<MinSig, Block>, Option<indexer::Pusher<E, I>>>;
39+
type Reporter<E, I> = Reporters<
40+
Activity,
41+
Reporters<
42+
Activity,
43+
marshal::Mailbox<MinSig, Block>,
44+
coding::Mailbox<MinSig, Block, ReedSolomon<Sha256>, PublicKey>,
45+
>,
46+
Option<indexer::Pusher<E, I>>,
47+
>;
4148

4249
/// To better support peers near tip during network instability, we multiply
4350
/// the consensus activity timeout by this factor.
@@ -95,8 +102,8 @@ pub struct Engine<
95102

96103
application: Application<E>,
97104
buffer: buffered::Engine<E, PublicKey, Shard<ReedSolomon<Sha256>, Sha256>>,
98-
shard_mailbox: coding::Mailbox<Block, ReedSolomon<Sha256>, PublicKey>,
99-
coding: coding::Actor<E, ReedSolomon<Sha256>, Sha256, Block, PublicKey>,
105+
shard_mailbox: coding::Mailbox<MinSig, Block, ReedSolomon<Sha256>, PublicKey>,
106+
coding: coding::Actor<E, MinSig, ReedSolomon<Sha256>, Sha256, Block, PublicKey>,
100107
marshal: marshal::Actor<Block, E, MinSig, ReedSolomon<Sha256>>,
101108

102109
pub supervisor: Supervisor,
@@ -173,15 +180,14 @@ impl<
173180
let application = CodingAdapter::new(
174181
context.with_label("app"),
175182
AltoApp::default(),
176-
marshal_mailbox.clone(),
177183
shard_mailbox.clone(),
178184
cfg.signer.public_key(),
179185
supervisor.clone(),
180186
);
181187

182188
// Create the reporter
183189
let reporter = (
184-
marshal_mailbox.clone(),
190+
Reporters::from((marshal_mailbox.clone(), shard_mailbox.clone())),
185191
cfg.indexer.map(|indexer| {
186192
indexer::Pusher::new(context.with_label("indexer"), indexer, marshal_mailbox)
187193
}),

0 commit comments

Comments
 (0)