Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.
Open
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
b6b9f8e
Undo v4 changes, move them to vstaging
Apr 19, 2023
c76ce40
Merge branch 'alex/parathreads_review' into alex/parathreads_vstaging
Apr 19, 2023
e2d5869
minor
Apr 19, 2023
fc276d6
Merge branch 'alex/parathreads_review' into alex/parathreads_vstaging
Apr 25, 2023
7baa04f
Merge branch 'alex/parathreads_review' into alex/parathreads_vstaging
May 19, 2023
94d24d5
Fix imports
May 19, 2023
f943c1a
Merge branch 'alex/parathreads_review' into alex/parathreads_vstaging
May 19, 2023
59f6bc2
Merge branch 'alex/parathreads_review' into alex/parathreads_vstaging
May 29, 2023
d65d96e
include version dispatch on availablity_cores() call
May 30, 2023
cbfa7a1
ifmt
May 30, 2023
2471334
Fix test-runtime
May 30, 2023
678b1d8
fix node runtime api test
May 30, 2023
13fa655
Undo RuntimeDebug -> Debug changes in v4
May 30, 2023
2cf57a8
runtime-api tests fix
May 30, 2023
4d01e65
Merge branch 'alex/parathreads_review' into alex/parathreads_vstaging
May 31, 2023
af57dd0
Fix removing api version by accident
May 31, 2023
b413cc7
Merge branch 'alex/parathreads_review' into alex/parathreads_vstaging
Jun 1, 2023
6fae5a3
Remove naked unwrap()s
Jun 1, 2023
a665df0
Add availability_cores_on_demand to mock and use that in tests
Jun 1, 2023
42bc527
Merge branch 'alex/parathreads_review' into alex/parathreads_vstaging
Jun 2, 2023
ea8a0c6
Merge branch 'alex/parathreads_review' into alex/parathreads_vstaging
Jun 5, 2023
a198b95
Merge branch 'alex/parathreads_review' into alex/parathreads_vstaging
Jun 6, 2023
918243e
Address PR comments
Jun 8, 2023
49ebc7d
Rename availability_cores_on_demand to ..._vstaging
Jun 8, 2023
c49582c
pebkac
Jun 8, 2023
6273880
minor refactor
Jun 8, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
ifmt
  • Loading branch information
alexgparity committed May 30, 2023
commit cbfa7a19f9edf82cefff5f9936eddcc451a84bcf
101 changes: 50 additions & 51 deletions node/core/dispute-coordinator/src/initialized.rs
Original file line number Diff line number Diff line change
Expand Up @@ -214,62 +214,61 @@ impl Initialized {
gum::trace!(target: LOG_TARGET, "Waiting for message");
let mut overlay_db = OverlayedBackend::new(backend);
let default_confirm = Box::new(|| Ok(()));
let confirm_write = match MuxedMessage::receive(ctx, &mut self.participation_receiver)
.await?
{
MuxedMessage::Participation(msg) => {
gum::trace!(target: LOG_TARGET, "MuxedMessage::Participation");
let ParticipationStatement {
session,
candidate_hash,
candidate_receipt,
outcome,
} = self.participation.get_participation_result(ctx, msg).await?;
if let Some(valid) = outcome.validity() {
gum::trace!(
target: LOG_TARGET,
?session,
?candidate_hash,
?valid,
"Issuing local statement based on participation outcome."
);
self.issue_local_statement(
ctx,
&mut overlay_db,
let confirm_write =
match MuxedMessage::receive(ctx, &mut self.participation_receiver).await? {
MuxedMessage::Participation(msg) => {
gum::trace!(target: LOG_TARGET, "MuxedMessage::Participation");
let ParticipationStatement {
session,
candidate_hash,
candidate_receipt,
session,
valid,
clock.now(),
)
.await?;
} else {
gum::warn!(target: LOG_TARGET, ?outcome, "Dispute participation failed");
}
default_confirm
},
MuxedMessage::Subsystem(msg) => match msg {
FromOrchestra::Signal(OverseerSignal::Conclude) => return Ok(()),
FromOrchestra::Signal(OverseerSignal::ActiveLeaves(update)) => {
gum::trace!(target: LOG_TARGET, "OverseerSignal::ActiveLeaves");
self.process_active_leaves_update(
ctx,
&mut overlay_db,
update,
clock.now(),
)
.await?;
outcome,
} = self.participation.get_participation_result(ctx, msg).await?;
if let Some(valid) = outcome.validity() {
gum::trace!(
target: LOG_TARGET,
?session,
?candidate_hash,
?valid,
"Issuing local statement based on participation outcome."
);
self.issue_local_statement(
ctx,
&mut overlay_db,
candidate_hash,
candidate_receipt,
session,
valid,
clock.now(),
)
.await?;
} else {
gum::warn!(target: LOG_TARGET, ?outcome, "Dispute participation failed");
}
default_confirm
},
FromOrchestra::Signal(OverseerSignal::BlockFinalized(_, n)) => {
gum::trace!(target: LOG_TARGET, "OverseerSignal::BlockFinalized");
self.scraper.process_finalized_block(&n);
default_confirm
MuxedMessage::Subsystem(msg) => match msg {
FromOrchestra::Signal(OverseerSignal::Conclude) => return Ok(()),
FromOrchestra::Signal(OverseerSignal::ActiveLeaves(update)) => {
gum::trace!(target: LOG_TARGET, "OverseerSignal::ActiveLeaves");
self.process_active_leaves_update(
ctx,
&mut overlay_db,
update,
clock.now(),
)
.await?;
default_confirm
},
FromOrchestra::Signal(OverseerSignal::BlockFinalized(_, n)) => {
gum::trace!(target: LOG_TARGET, "OverseerSignal::BlockFinalized");
self.scraper.process_finalized_block(&n);
default_confirm
},
FromOrchestra::Communication { msg } =>
self.handle_incoming(ctx, &mut overlay_db, msg, clock.now()).await?,
},
FromOrchestra::Communication { msg } =>
self.handle_incoming(ctx, &mut overlay_db, msg, clock.now()).await?,
},
};
};

if !overlay_db.is_empty() {
let ops = overlay_db.into_write_ops();
Expand Down