pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-05-30 10:31:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename ExecutionMode to IsolationStrategy (#1932)

Browse Source 
* Rename ExecutionMode to IsolationStrategy

Execution mode is too generic name and can imply a lot of different
aspects of execution. The notion of isolation better describes the
meant aspect.

And while I am at it, I also renamed mode -> strategy cause it seems a
bit more appropriate, although that is way more subjective.

* Fix compilation in wasm_executor tests.

* Add a comment to IsolationStrategy

* Update comments on IsolationStrategy

* Update node/core/candidate-validation/src/lib.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Accomodate the point on interruption

* Update parachain/src/wasm_executor/mod.rs

Co-authored-by: Andronik Ordian <write@reusable.software>

* Naming nits

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
Co-authored-by: Andronik Ordian <write@reusable.software>
This commit is contained in:
Sergei Shulepov
2020-11-09 16:39:37 +01:00
committed by GitHub
parent 2026228b77
commit 4018994ed5
7 changed files with 91 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
polkadot/parachain/test-parachains/adder/collator/src/lib.rs
+2 -2
View File
@@ -166,7 +166,7 @@ mod tests {
use super::*;
use futures::executor::block_on;
use polkadot_parachain::{primitives::ValidationParams, wasm_executor::ExecutionMode};
use polkadot_parachain::{primitives::ValidationParams, wasm_executor::IsolationStrategy};
use polkadot_primitives::v1::{ValidationData, PersistedValidationData};
use codec::Decode;
@@ -201,7 +201,7 @@ mod tests {
hrmp_mqc_heads: Vec::new(),
dmq_mqc_head: Default::default(),
},
&ExecutionMode::InProcess,
&IsolationStrategy::InProcess,
sp_core::testing::TaskExecutor::new(),
).unwrap();
polkadot/parachain/test-parachains/tests/adder/mod.rs
+13 -13
View File
@@ -25,13 +25,13 @@ use parachain::{
HeadData as GenericHeadData,
ValidationParams,
},
wasm_executor::{ValidationPool, ExecutionMode}
wasm_executor::{ValidationPool, IsolationStrategy}
};
use codec::{Decode, Encode};
use adder::{HeadData, BlockData, hash_state};
fn execution_mode() -> ExecutionMode {
ExecutionMode::ExternalProcessCustomHost {
fn isolation_strategy() -> IsolationStrategy {
IsolationStrategy::ExternalProcessCustomHost {
pool: ValidationPool::new(),
binary: std::env::current_exe().unwrap(),
args: WORKER_ARGS_TEST.iter().map(|x| x.to_string()).collect(),
@@ -40,17 +40,17 @@ fn execution_mode() -> ExecutionMode {
#[test]
fn execute_good_on_parent_with_inprocess_validation() {
let execution_mode = ExecutionMode::InProcess;
execute_good_on_parent(execution_mode);
let isolation_strategy = IsolationStrategy::InProcess;
execute_good_on_parent(isolation_strategy);
}
#[test]
pub fn execute_good_on_parent_with_external_process_validation() {
let execution_mode = execution_mode();
execute_good_on_parent(execution_mode);
let isolation_strategy = isolation_strategy();
execute_good_on_parent(isolation_strategy);
}
fn execute_good_on_parent(execution_mode: ExecutionMode) {
fn execute_good_on_parent(isolation_strategy: IsolationStrategy) {
let parent_head = HeadData {
number: 0,
parent_hash: [0; 32],
@@ -71,7 +71,7 @@ fn execute_good_on_parent(execution_mode: ExecutionMode) {
hrmp_mqc_heads: Vec::new(),
dmq_mqc_head: Default::default(),
},
&execution_mode,
&isolation_strategy,
sp_core::testing::TaskExecutor::new(),
).unwrap();
@@ -87,7 +87,7 @@ fn execute_good_chain_on_parent() {
let mut number = 0;
let mut parent_hash = [0; 32];
let mut last_state = 0;
let execution_mode = execution_mode();
let isolation_strategy = isolation_strategy();
for add in 0..10 {
let parent_head = HeadData {
@@ -110,7 +110,7 @@ fn execute_good_chain_on_parent() {
hrmp_mqc_heads: Vec::new(),
dmq_mqc_head: Default::default(),
},
&execution_mode,
&isolation_strategy,
sp_core::testing::TaskExecutor::new(),
).unwrap();
@@ -128,7 +128,7 @@ fn execute_good_chain_on_parent() {
#[test]
fn execute_bad_on_parent() {
let execution_mode = execution_mode();
let isolation_strategy = isolation_strategy();
let parent_head = HeadData {
number: 0,
@@ -150,7 +150,7 @@ fn execute_bad_on_parent() {
hrmp_mqc_heads: Vec::new(),
dmq_mqc_head: Default::default(),
},
&execution_mode,
&isolation_strategy,
sp_core::testing::TaskExecutor::new(),
).unwrap_err();
}
polkadot/parachain/test-parachains/tests/wasm_executor/mod.rs
+9 -10
View File
@@ -21,11 +21,11 @@ const WORKER_ARGS_TEST: &[&'static str] = &["--nocapture", "validation_worker"];
use crate::adder;
use parachain::{
primitives::{BlockData, ValidationParams},
wasm_executor::{ValidationError, InvalidCandidate, EXECUTION_TIMEOUT_SEC, ExecutionMode, ValidationPool},
wasm_executor::{ValidationError, InvalidCandidate, EXECUTION_TIMEOUT_SEC, IsolationStrategy, ValidationPool},
};
fn execution_mode() -> ExecutionMode {
ExecutionMode::ExternalProcessCustomHost {
fn isolation_strategy() -> IsolationStrategy {
IsolationStrategy::ExternalProcessCustomHost {
pool: ValidationPool::new(),
binary: std::env::current_exe().unwrap(),
args: WORKER_ARGS_TEST.iter().map(|x| x.to_string()).collect(),
@@ -34,7 +34,7 @@ fn execution_mode() -> ExecutionMode {
#[test]
fn terminates_on_timeout() {
let execution_mode = execution_mode();
let isolation_strategy = isolation_strategy();
let result = parachain::wasm_executor::validate_candidate(
halt::wasm_binary_unwrap(),
@@ -45,7 +45,7 @@ fn terminates_on_timeout() {
hrmp_mqc_heads: Vec::new(),
dmq_mqc_head: Default::default(),
},
&execution_mode,
&isolation_strategy,
sp_core::testing::TaskExecutor::new(),
);
match result {
@@ -59,11 +59,10 @@ fn terminates_on_timeout() {
#[test]
fn parallel_execution() {
let execution_mode = execution_mode();
let isolation_strategy = isolation_strategy();
let isolation_strategy_clone = isolation_strategy.clone();
let start = std::time::Instant::now();
let execution_mode2 = execution_mode.clone();
let thread = std::thread::spawn(move ||
parachain::wasm_executor::validate_candidate(
halt::wasm_binary_unwrap(),
@@ -74,7 +73,7 @@ fn parallel_execution() {
hrmp_mqc_heads: Vec::new(),
dmq_mqc_head: Default::default(),
},
&execution_mode,
&isolation_strategy,
sp_core::testing::TaskExecutor::new(),
).ok());
let _ = parachain::wasm_executor::validate_candidate(
@@ -86,7 +85,7 @@ fn parallel_execution() {
hrmp_mqc_heads: Vec::new(),
dmq_mqc_head: Default::default(),
},
&execution_mode2,
&isolation_strategy_clone,
sp_core::testing::TaskExecutor::new(),
);
thread.join().unwrap();