Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Commit 039d815

Browse files
bkchrbkchr
authored
Companion: Substrate#13869 (#7119)
* Companion: Substrate#13869 paritytech/substrate#13869 * update lockfile for {"substrate"} * ".git/.scripts/commands/fmt/fmt.sh" --------- Co-authored-by: parity-processbot <>
1 parent 41982b5 commit 039d815

File tree

25 files changed

+262
-265
lines changed

25 files changed

+262
-265
lines changed

‎Cargo.lock

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

‎node/core/dispute-coordinator/src/initialized.rs

Lines changed: 50 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -214,62 +214,61 @@ impl Initialized {
214214
gum::trace!(target: LOG_TARGET, "Waiting for message");
215215
let mut overlay_db = OverlayedBackend::new(backend);
216216
let default_confirm = Box::new(|| Ok(()));
217-
let confirm_write = match MuxedMessage::receive(ctx, &mut self.participation_receiver)
218-
.await?
219-
{
220-
MuxedMessage::Participation(msg) => {
221-
gum::trace!(target: LOG_TARGET, "MuxedMessage::Participation");
222-
let ParticipationStatement {
223-
session,
224-
candidate_hash,
225-
candidate_receipt,
226-
outcome,
227-
} = self.participation.get_participation_result(ctx, msg).await?;
228-
if let Some(valid) = outcome.validity() {
229-
gum::trace!(
230-
target: LOG_TARGET,
231-
?session,
232-
?candidate_hash,
233-
?valid,
234-
"Issuing local statement based on participation outcome."
235-
);
236-
self.issue_local_statement(
237-
ctx,
238-
&mut overlay_db,
217+
let confirm_write =
218+
match MuxedMessage::receive(ctx, &mut self.participation_receiver).await? {
219+
MuxedMessage::Participation(msg) => {
220+
gum::trace!(target: LOG_TARGET, "MuxedMessage::Participation");
221+
let ParticipationStatement {
222+
session,
239223
candidate_hash,
240224
candidate_receipt,
241-
session,
242-
valid,
243-
clock.now(),
244-
)
245-
.await?;
246-
} else {
247-
gum::warn!(target: LOG_TARGET, ?outcome, "Dispute participation failed");
248-
}
249-
default_confirm
250-
},
251-
MuxedMessage::Subsystem(msg) => match msg {
252-
FromOrchestra::Signal(OverseerSignal::Conclude) => return Ok(()),
253-
FromOrchestra::Signal(OverseerSignal::ActiveLeaves(update)) => {
254-
gum::trace!(target: LOG_TARGET, "OverseerSignal::ActiveLeaves");
255-
self.process_active_leaves_update(
256-
ctx,
257-
&mut overlay_db,
258-
update,
259-
clock.now(),
260-
)
261-
.await?;
225+
outcome,
226+
} = self.participation.get_participation_result(ctx, msg).await?;
227+
if let Some(valid) = outcome.validity() {
228+
gum::trace!(
229+
target: LOG_TARGET,
230+
?session,
231+
?candidate_hash,
232+
?valid,
233+
"Issuing local statement based on participation outcome."
234+
);
235+
self.issue_local_statement(
236+
ctx,
237+
&mut overlay_db,
238+
candidate_hash,
239+
candidate_receipt,
240+
session,
241+
valid,
242+
clock.now(),
243+
)
244+
.await?;
245+
} else {
246+
gum::warn!(target: LOG_TARGET, ?outcome, "Dispute participation failed");
247+
}
262248
default_confirm
263249
},
264-
FromOrchestra::Signal(OverseerSignal::BlockFinalized(_, n)) => {
265-
gum::trace!(target: LOG_TARGET, "OverseerSignal::BlockFinalized");
266-
self.scraper.process_finalized_block(&n);
267-
default_confirm
250+
MuxedMessage::Subsystem(msg) => match msg {
251+
FromOrchestra::Signal(OverseerSignal::Conclude) => return Ok(()),
252+
FromOrchestra::Signal(OverseerSignal::ActiveLeaves(update)) => {
253+
gum::trace!(target: LOG_TARGET, "OverseerSignal::ActiveLeaves");
254+
self.process_active_leaves_update(
255+
ctx,
256+
&mut overlay_db,
257+
update,
258+
clock.now(),
259+
)
260+
.await?;
261+
default_confirm
262+
},
263+
FromOrchestra::Signal(OverseerSignal::BlockFinalized(_, n)) => {
264+
gum::trace!(target: LOG_TARGET, "OverseerSignal::BlockFinalized");
265+
self.scraper.process_finalized_block(&n);
266+
default_confirm
267+
},
268+
FromOrchestra::Communication { msg } =>
269+
self.handle_incoming(ctx, &mut overlay_db, msg, clock.now()).await?,
268270
},
269-
FromOrchestra::Communication { msg } =>
270-
self.handle_incoming(ctx, &mut overlay_db, msg, clock.now()).await?,
271-
},
272-
};
271+
};
273272

274273
if !overlay_db.is_empty() {
275274
let ops = overlay_db.into_write_ops();

‎runtime/common/src/assigned_slots.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,7 @@ mod tests {
631631
type MaxLocks = ();
632632
type MaxReserves = ();
633633
type ReserveIdentifier = [u8; 8];
634-
type HoldIdentifier = ();
634+
type RuntimeHoldReason = RuntimeHoldReason;
635635
type FreezeIdentifier = ();
636636
type MaxHolds = ConstU32<1>;
637637
type MaxFreezes = ConstU32<1>;

‎runtime/common/src/auctions.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -748,7 +748,7 @@ mod tests {
748748
type MaxLocks = ();
749749
type MaxReserves = MaxReserves;
750750
type ReserveIdentifier = [u8; 8];
751-
type HoldIdentifier = ();
751+
type RuntimeHoldReason = RuntimeHoldReason;
752752
type FreezeIdentifier = ();
753753
type MaxHolds = ConstU32<1>;
754754
type MaxFreezes = ConstU32<1>;

‎runtime/common/src/claims.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -787,7 +787,7 @@ mod tests {
787787
type MaxReserves = ();
788788
type ReserveIdentifier = [u8; 8];
789789
type WeightInfo = ();
790-
type HoldIdentifier = ();
790+
type RuntimeHoldReason = RuntimeHoldReason;
791791
type FreezeIdentifier = ();
792792
type MaxHolds = ConstU32<1>;
793793
type MaxFreezes = ConstU32<1>;

‎runtime/common/src/crowdloan/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -945,7 +945,7 @@ mod tests {
945945
type MaxReserves = ();
946946
type ReserveIdentifier = [u8; 8];
947947
type WeightInfo = ();
948-
type HoldIdentifier = ();
948+
type RuntimeHoldReason = RuntimeHoldReason;
949949
type FreezeIdentifier = ();
950950
type MaxHolds = ConstU32<1>;
951951
type MaxFreezes = ConstU32<1>;

‎runtime/common/src/impls.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ mod tests {
186186
type MaxReserves = ();
187187
type ReserveIdentifier = [u8; 8];
188188
type WeightInfo = ();
189-
type HoldIdentifier = ();
189+
type RuntimeHoldReason = RuntimeHoldReason;
190190
type FreezeIdentifier = ();
191191
type MaxHolds = ConstU32<1>;
192192
type MaxFreezes = ConstU32<1>;

‎runtime/common/src/integration_tests.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ impl pallet_balances::Config for Test {
183183
type WeightInfo = ();
184184
type MaxReserves = MaxReserves;
185185
type ReserveIdentifier = [u8; 8];
186-
type HoldIdentifier = ();
186+
type RuntimeHoldReason = RuntimeHoldReason;
187187
type FreezeIdentifier = ();
188188
type MaxHolds = ConstU32<0>;
189189
type MaxFreezes = ConstU32<0>;

‎runtime/common/src/paras_registrar.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -755,7 +755,7 @@ mod tests {
755755
type MaxReserves = ();
756756
type ReserveIdentifier = [u8; 8];
757757
type WeightInfo = ();
758-
type HoldIdentifier = ();
758+
type RuntimeHoldReason = RuntimeHoldReason;
759759
type FreezeIdentifier = ();
760760
type MaxHolds = ConstU32<1>;
761761
type MaxFreezes = ConstU32<1>;

‎runtime/common/src/purchase.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,7 @@ mod tests {
553553
type MaxReserves = ();
554554
type ReserveIdentifier = [u8; 8];
555555
type WeightInfo = ();
556-
type HoldIdentifier = ();
556+
type RuntimeHoldReason = RuntimeHoldReason;
557557
type FreezeIdentifier = ();
558558
type MaxHolds = ConstU32<1>;
559559
type MaxFreezes = ConstU32<1>;

0 commit comments

Comments
 (0)