style: Migrate to stable-only rustfmt configuration
- Remove nightly-only features from .rustfmt.toml and vendor/ss58-registry/rustfmt.toml - Removed features: imports_granularity, wrap_comments, comment_width, reorder_impl_items, spaces_around_ranges, binop_separator, match_arm_blocks, trailing_semicolon, trailing_comma - Format all 898 affected files with stable rustfmt - Ensures long-term reliability without nightly toolchain dependency
This commit is contained in:
@@ -421,8 +421,9 @@ async fn handle_active_leaves_update<Sender>(
|
||||
|
||||
if let Some(activated) = update.activated {
|
||||
let maybe_new_session_index = match (prepare_state.session_index, maybe_session_index) {
|
||||
(Some(existing_index), Some(new_index)) =>
|
||||
(new_index > existing_index).then_some(new_index),
|
||||
(Some(existing_index), Some(new_index)) => {
|
||||
(new_index > existing_index).then_some(new_index)
|
||||
},
|
||||
(None, Some(new_index)) => Some(new_index),
|
||||
_ => None,
|
||||
};
|
||||
@@ -837,12 +838,13 @@ where
|
||||
|
||||
match validation_backend.precheck_pvf(pvf).await {
|
||||
Ok(_) => PreCheckOutcome::Valid,
|
||||
Err(prepare_err) =>
|
||||
Err(prepare_err) => {
|
||||
if prepare_err.is_deterministic() {
|
||||
PreCheckOutcome::Invalid
|
||||
} else {
|
||||
PreCheckOutcome::Failed
|
||||
},
|
||||
}
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
@@ -875,10 +877,11 @@ async fn validate_candidate_exhaustive(
|
||||
|
||||
// We only check the session index for backing.
|
||||
match (exec_kind, candidate_receipt.descriptor.session_index()) {
|
||||
(PvfExecKind::Backing(_) | PvfExecKind::BackingSystemParas(_), Some(session_index)) =>
|
||||
(PvfExecKind::Backing(_) | PvfExecKind::BackingSystemParas(_), Some(session_index)) => {
|
||||
if session_index != expected_session_index {
|
||||
return Ok(ValidationResult::Invalid(InvalidCandidate::InvalidSessionIndex));
|
||||
},
|
||||
}
|
||||
},
|
||||
(_, _) => {},
|
||||
};
|
||||
|
||||
@@ -918,7 +921,7 @@ async fn validate_candidate_exhaustive(
|
||||
)
|
||||
.await
|
||||
},
|
||||
PvfExecKind::Approval | PvfExecKind::Dispute =>
|
||||
PvfExecKind::Approval | PvfExecKind::Dispute => {
|
||||
validation_backend
|
||||
.validate_candidate_with_retry(
|
||||
validation_code.0,
|
||||
@@ -931,7 +934,8 @@ async fn validate_candidate_exhaustive(
|
||||
exec_kind,
|
||||
validation_code_bomb_limit,
|
||||
)
|
||||
.await,
|
||||
.await
|
||||
},
|
||||
};
|
||||
|
||||
if let Err(ref error) = result {
|
||||
@@ -949,27 +953,35 @@ async fn validate_candidate_exhaustive(
|
||||
);
|
||||
Err(ValidationFailed(e.to_string()))
|
||||
},
|
||||
Err(ValidationError::Invalid(WasmInvalidCandidate::HardTimeout)) =>
|
||||
Ok(ValidationResult::Invalid(InvalidCandidate::Timeout)),
|
||||
Err(ValidationError::Invalid(WasmInvalidCandidate::WorkerReportedInvalid(e))) =>
|
||||
Ok(ValidationResult::Invalid(InvalidCandidate::ExecutionError(e))),
|
||||
Err(ValidationError::Invalid(WasmInvalidCandidate::PoVDecompressionFailure)) =>
|
||||
Ok(ValidationResult::Invalid(InvalidCandidate::PoVDecompressionFailure)),
|
||||
Err(ValidationError::PossiblyInvalid(PossiblyInvalidError::AmbiguousWorkerDeath)) =>
|
||||
Err(ValidationError::Invalid(WasmInvalidCandidate::HardTimeout)) => {
|
||||
Ok(ValidationResult::Invalid(InvalidCandidate::Timeout))
|
||||
},
|
||||
Err(ValidationError::Invalid(WasmInvalidCandidate::WorkerReportedInvalid(e))) => {
|
||||
Ok(ValidationResult::Invalid(InvalidCandidate::ExecutionError(e)))
|
||||
},
|
||||
Err(ValidationError::Invalid(WasmInvalidCandidate::PoVDecompressionFailure)) => {
|
||||
Ok(ValidationResult::Invalid(InvalidCandidate::PoVDecompressionFailure))
|
||||
},
|
||||
Err(ValidationError::PossiblyInvalid(PossiblyInvalidError::AmbiguousWorkerDeath)) => {
|
||||
Ok(ValidationResult::Invalid(InvalidCandidate::ExecutionError(
|
||||
"ambiguous worker death".to_string(),
|
||||
))),
|
||||
Err(ValidationError::PossiblyInvalid(PossiblyInvalidError::JobError(err))) =>
|
||||
Ok(ValidationResult::Invalid(InvalidCandidate::ExecutionError(err))),
|
||||
Err(ValidationError::PossiblyInvalid(PossiblyInvalidError::RuntimeConstruction(err))) =>
|
||||
Ok(ValidationResult::Invalid(InvalidCandidate::ExecutionError(err))),
|
||||
Err(ValidationError::PossiblyInvalid(err @ PossiblyInvalidError::CorruptedArtifact)) =>
|
||||
Ok(ValidationResult::Invalid(InvalidCandidate::ExecutionError(err.to_string()))),
|
||||
)))
|
||||
},
|
||||
Err(ValidationError::PossiblyInvalid(PossiblyInvalidError::JobError(err))) => {
|
||||
Ok(ValidationResult::Invalid(InvalidCandidate::ExecutionError(err)))
|
||||
},
|
||||
Err(ValidationError::PossiblyInvalid(PossiblyInvalidError::RuntimeConstruction(err))) => {
|
||||
Ok(ValidationResult::Invalid(InvalidCandidate::ExecutionError(err)))
|
||||
},
|
||||
Err(ValidationError::PossiblyInvalid(err @ PossiblyInvalidError::CorruptedArtifact)) => {
|
||||
Ok(ValidationResult::Invalid(InvalidCandidate::ExecutionError(err.to_string())))
|
||||
},
|
||||
|
||||
Err(ValidationError::PossiblyInvalid(PossiblyInvalidError::AmbiguousJobDeath(err))) =>
|
||||
Err(ValidationError::PossiblyInvalid(PossiblyInvalidError::AmbiguousJobDeath(err))) => {
|
||||
Ok(ValidationResult::Invalid(InvalidCandidate::ExecutionError(format!(
|
||||
"ambiguous job death: {err}"
|
||||
)))),
|
||||
))))
|
||||
},
|
||||
Err(ValidationError::Preparation(e)) => {
|
||||
gum::warn!(
|
||||
target: LOG_TARGET,
|
||||
@@ -1005,8 +1017,8 @@ async fn validate_candidate_exhaustive(
|
||||
},
|
||||
};
|
||||
|
||||
if candidate_receipt.commitments_hash !=
|
||||
committed_candidate_receipt.commitments.hash()
|
||||
if candidate_receipt.commitments_hash
|
||||
!= committed_candidate_receipt.commitments.hash()
|
||||
{
|
||||
gum::info!(
|
||||
target: LOG_TARGET,
|
||||
@@ -1158,8 +1170,8 @@ trait ValidationBackend {
|
||||
let mut retry_immediately = false;
|
||||
match validation_result {
|
||||
Err(ValidationError::PossiblyInvalid(
|
||||
PossiblyInvalidError::AmbiguousWorkerDeath |
|
||||
PossiblyInvalidError::AmbiguousJobDeath(_),
|
||||
PossiblyInvalidError::AmbiguousWorkerDeath
|
||||
| PossiblyInvalidError::AmbiguousJobDeath(_),
|
||||
)) => break_if_no_retries_left!(num_death_retries_left),
|
||||
|
||||
Err(ValidationError::PossiblyInvalid(PossiblyInvalidError::JobError(_))) => {
|
||||
@@ -1171,8 +1183,8 @@ trait ValidationBackend {
|
||||
},
|
||||
|
||||
Err(ValidationError::PossiblyInvalid(
|
||||
PossiblyInvalidError::RuntimeConstruction(_) |
|
||||
PossiblyInvalidError::CorruptedArtifact,
|
||||
PossiblyInvalidError::RuntimeConstruction(_)
|
||||
| PossiblyInvalidError::CorruptedArtifact,
|
||||
)) => {
|
||||
break_if_no_retries_left!(num_execution_error_retries_left);
|
||||
self.precheck_pvf(pvf.clone()).await?;
|
||||
@@ -1183,11 +1195,11 @@ trait ValidationBackend {
|
||||
retry_immediately = true;
|
||||
},
|
||||
|
||||
Ok(_) |
|
||||
Err(
|
||||
ValidationError::Invalid(_) |
|
||||
ValidationError::Preparation(_) |
|
||||
ValidationError::ExecutionDeadline,
|
||||
Ok(_)
|
||||
| Err(
|
||||
ValidationError::Invalid(_)
|
||||
| ValidationError::Preparation(_)
|
||||
| ValidationError::ExecutionDeadline,
|
||||
) => break,
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user