Unverified Commit 28b11f59 authored by Sergey Pepyakin's avatar Sergey Pepyakin Committed by GitHub
Browse files

Fix typo: ambigious -> ambiguous (#4380)

* Do not log PVF prunning every hour

This lowers the level of the PVF pruning.

Closes https://github.com/paritytech/polkadot/issues/4361

* Fix typo: ambigious -> ambiguous

The correct spelling is ambiguous
([dictionary](https://dictionary.cambridge.org/dictionary/english/ambiguous))
parent e83aebaf
Pipeline #168251 passed with stages
in 44 minutes and 8 seconds
...@@ -455,9 +455,9 @@ async fn validate_candidate_exhaustive( ...@@ -455,9 +455,9 @@ async fn validate_candidate_exhaustive(
Ok(ValidationResult::Invalid(InvalidCandidate::Timeout)), Ok(ValidationResult::Invalid(InvalidCandidate::Timeout)),
Err(ValidationError::InvalidCandidate(WasmInvalidCandidate::WorkerReportedError(e))) => Err(ValidationError::InvalidCandidate(WasmInvalidCandidate::WorkerReportedError(e))) =>
Ok(ValidationResult::Invalid(InvalidCandidate::ExecutionError(e))), Ok(ValidationResult::Invalid(InvalidCandidate::ExecutionError(e))),
Err(ValidationError::InvalidCandidate(WasmInvalidCandidate::AmbigiousWorkerDeath)) => Err(ValidationError::InvalidCandidate(WasmInvalidCandidate::AmbiguousWorkerDeath)) =>
Ok(ValidationResult::Invalid(InvalidCandidate::ExecutionError( Ok(ValidationResult::Invalid(InvalidCandidate::ExecutionError(
"ambigious worker death".to_string(), "ambiguous worker death".to_string(),
))), ))),
Ok(res) => Ok(res) =>
......
...@@ -422,7 +422,7 @@ fn candidate_validation_bad_return_is_invalid() { ...@@ -422,7 +422,7 @@ fn candidate_validation_bad_return_is_invalid() {
let v = executor::block_on(validate_candidate_exhaustive( let v = executor::block_on(validate_candidate_exhaustive(
MockValidatorBackend::with_hardcoded_result(Err(ValidationError::InvalidCandidate( MockValidatorBackend::with_hardcoded_result(Err(ValidationError::InvalidCandidate(
WasmInvalidCandidate::AmbigiousWorkerDeath, WasmInvalidCandidate::AmbiguousWorkerDeath,
))), ))),
validation_data, validation_data,
validation_code, validation_code,
......
...@@ -71,7 +71,7 @@ pub enum InvalidCandidate { ...@@ -71,7 +71,7 @@ pub enum InvalidCandidate {
/// thrown at it and hopefully the operator notices it by decreased reward performance of the /// thrown at it and hopefully the operator notices it by decreased reward performance of the
/// validator. On the other hand, if the worker died because of (b) we would have better chances /// validator. On the other hand, if the worker died because of (b) we would have better chances
/// to stop the attack. /// to stop the attack.
AmbigiousWorkerDeath, AmbiguousWorkerDeath,
/// PVF execution (compilation is not included) took more time than was allotted. /// PVF execution (compilation is not included) took more time than was allotted.
HardTimeout, HardTimeout,
} }
......
...@@ -240,7 +240,7 @@ fn handle_job_finish( ...@@ -240,7 +240,7 @@ fn handle_job_finish(
Outcome::HardTimeout => Outcome::HardTimeout =>
(None, Err(ValidationError::InvalidCandidate(InvalidCandidate::HardTimeout))), (None, Err(ValidationError::InvalidCandidate(InvalidCandidate::HardTimeout))),
Outcome::IoErr => Outcome::IoErr =>
(None, Err(ValidationError::InvalidCandidate(InvalidCandidate::AmbigiousWorkerDeath))), (None, Err(ValidationError::InvalidCandidate(InvalidCandidate::AmbiguousWorkerDeath))),
}; };
queue.metrics.execute_finished(); queue.metrics.execute_finished();
......
...@@ -1039,27 +1039,27 @@ mod tests { ...@@ -1039,27 +1039,27 @@ mod tests {
); );
result_tx_pvf_1_1 result_tx_pvf_1_1
.send(Err(ValidationError::InvalidCandidate(InvalidCandidate::AmbigiousWorkerDeath))) .send(Err(ValidationError::InvalidCandidate(InvalidCandidate::AmbiguousWorkerDeath)))
.unwrap(); .unwrap();
assert_matches!( assert_matches!(
result_rx_pvf_1_1.now_or_never().unwrap().unwrap(), result_rx_pvf_1_1.now_or_never().unwrap().unwrap(),
Err(ValidationError::InvalidCandidate(InvalidCandidate::AmbigiousWorkerDeath)) Err(ValidationError::InvalidCandidate(InvalidCandidate::AmbiguousWorkerDeath))
); );
result_tx_pvf_1_2 result_tx_pvf_1_2
.send(Err(ValidationError::InvalidCandidate(InvalidCandidate::AmbigiousWorkerDeath))) .send(Err(ValidationError::InvalidCandidate(InvalidCandidate::AmbiguousWorkerDeath)))
.unwrap(); .unwrap();
assert_matches!( assert_matches!(
result_rx_pvf_1_2.now_or_never().unwrap().unwrap(), result_rx_pvf_1_2.now_or_never().unwrap().unwrap(),
Err(ValidationError::InvalidCandidate(InvalidCandidate::AmbigiousWorkerDeath)) Err(ValidationError::InvalidCandidate(InvalidCandidate::AmbiguousWorkerDeath))
); );
result_tx_pvf_2 result_tx_pvf_2
.send(Err(ValidationError::InvalidCandidate(InvalidCandidate::AmbigiousWorkerDeath))) .send(Err(ValidationError::InvalidCandidate(InvalidCandidate::AmbiguousWorkerDeath)))
.unwrap(); .unwrap();
assert_matches!( assert_matches!(
result_rx_pvf_2.now_or_never().unwrap().unwrap(), result_rx_pvf_2.now_or_never().unwrap().unwrap(),
Err(ValidationError::InvalidCandidate(InvalidCandidate::AmbigiousWorkerDeath)) Err(ValidationError::InvalidCandidate(InvalidCandidate::AmbiguousWorkerDeath))
); );
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment