pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-09 20:11:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make candidate validation timeouts configurable (#4001)

Browse Source 
* pvf: make execution timeout configurable

* guide: add timeouts to candidate validation params

* add timeouts to candidate validation messages

* fmt

* port backing to use the backing pvf timeout

* port approval-voting to use the execution timeout

* port dispute participation to use the correct timeout

* fmt

* address grumbles & test failure
This commit is contained in:
Robert Habermeier
2021-10-04 16:53:36 +02:00
committed by GitHub
parent 114e757988
commit 6002865874
19 changed files with 192 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
polkadot/node/core/candidate-validation/src/lib.rs
+12 -2
View File
@@ -48,7 +48,7 @@ use parity_scale_codec::Encode;
use futures::{channel::oneshot, prelude::*};
use std::{path::PathBuf, sync::Arc};
use std::{path::PathBuf, sync::Arc, time::Duration};
use async_trait::async_trait;
@@ -135,6 +135,7 @@ where
CandidateValidationMessage::ValidateFromChainState(
descriptor,
pov,
timeout,
response_sender,
) => {
let bg = {
@@ -149,6 +150,7 @@ where
validation_host,
descriptor,
pov,
timeout,
&metrics,
)
.await;
@@ -165,6 +167,7 @@ where
validation_code,
descriptor,
pov,
timeout,
response_sender,
) => {
let bg = {
@@ -179,6 +182,7 @@ where
validation_code,
descriptor,
pov,
timeout,
&metrics,
)
.await;
@@ -322,6 +326,7 @@ async fn validate_from_chain_state<Sender>(
validation_host: ValidationHost,
descriptor: CandidateDescriptor,
pov: Arc<PoV>,
timeout: Duration,
metrics: &Metrics,
) -> Result<ValidationResult, ValidationFailed>
where
@@ -347,6 +352,7 @@ where
validation_code,
descriptor.clone(),
pov,
timeout,
metrics,
)
.await;
@@ -377,6 +383,7 @@ async fn validate_candidate_exhaustive(
validation_code: ValidationCode,
descriptor: CandidateDescriptor,
pov: Arc<PoV>,
timeout: Duration,
metrics: &Metrics,
) -> Result<ValidationResult, ValidationFailed> {
let _timer = metrics.time_validate_candidate_exhaustive();
@@ -430,7 +437,7 @@ async fn validate_candidate_exhaustive(
};
let result = validation_backend
.validate_candidate(raw_validation_code.to_vec(), params)
.validate_candidate(raw_validation_code.to_vec(), timeout, params)
.await;
if let Err(ref e) = result {
@@ -475,6 +482,7 @@ trait ValidationBackend {
async fn validate_candidate(
&mut self,
raw_validation_code: Vec<u8>,
timeout: Duration,
params: ValidationParams,
) -> Result<WasmValidationResult, ValidationError>;
}
@@ -484,12 +492,14 @@ impl ValidationBackend for ValidationHost {
async fn validate_candidate(
&mut self,
raw_validation_code: Vec<u8>,
timeout: Duration,
params: ValidationParams,
) -> Result<WasmValidationResult, ValidationError> {
let (tx, rx) = oneshot::channel();
if let Err(err) = self
.execute_pvf(
Pvf::from_code(raw_validation_code),
timeout,
params.encode(),
polkadot_node_core_pvf::Priority::Normal,
tx,
polkadot/node/core/candidate-validation/src/tests.rs
+8
View File
@@ -341,6 +341,7 @@ impl ValidationBackend for MockValidatorBackend {
async fn validate_candidate(
&mut self,
_raw_validation_code: Vec<u8>,
_timeout: Duration,
_params: ValidationParams,
) -> Result<WasmValidationResult, ValidationError> {
self.result.clone()
@@ -384,6 +385,7 @@ fn candidate_validation_ok_is_ok() {
validation_code,
descriptor,
Arc::new(pov),
Duration::from_secs(0),
&Default::default(),
))
.unwrap();
@@ -426,6 +428,7 @@ fn candidate_validation_bad_return_is_invalid() {
validation_code,
descriptor,
Arc::new(pov),
Duration::from_secs(0),
&Default::default(),
))
.unwrap();
@@ -461,6 +464,7 @@ fn candidate_validation_timeout_is_internal_error() {
validation_code,
descriptor,
Arc::new(pov),
Duration::from_secs(0),
&Default::default(),
));
@@ -495,6 +499,7 @@ fn candidate_validation_code_mismatch_is_invalid() {
validation_code,
descriptor,
Arc::new(pov),
Duration::from_secs(0),
&Default::default(),
))
.unwrap();
@@ -534,6 +539,7 @@ fn compressed_code_works() {
validation_code,
descriptor,
Arc::new(pov),
Duration::from_secs(0),
&Default::default(),
));
@@ -573,6 +579,7 @@ fn code_decompression_failure_is_invalid() {
validation_code,
descriptor,
Arc::new(pov),
Duration::from_secs(0),
&Default::default(),
));
@@ -613,6 +620,7 @@ fn pov_decompression_failure_is_invalid() {
validation_code,
descriptor,
Arc::new(pov),
Duration::from_secs(0),
&Default::default(),
));