Companion for removal of execution strategies (#2836)

* Companion for removal of execution strategies

https://github.com/paritytech/substrate/pull/14387

* Update Cargo.lock

* Remove patches

* Delete file again

* update lockfile for {"polkadot", "substrate"}

* Fix

* FMT

---------

Co-authored-by: parity-processbot <>
This commit is contained in:
Bastian Köcher
2023-07-12 00:48:51 +02:00
committed by GitHub
parent 9e68861cad
commit ae0210c1cc
10 changed files with 317 additions and 310 deletions
@@ -79,8 +79,7 @@ fn benchmark_block_validation(c: &mut Criterion) {
// Each account should only be included in one transfer.
let (src_accounts, dst_accounts, account_ids) = utils::create_benchmark_accounts();
let mut test_client_builder = TestClientBuilder::with_default_backend()
.set_execution_strategy(sc_client_api::ExecutionStrategy::AlwaysWasm);
let mut test_client_builder = TestClientBuilder::with_default_backend();
let genesis_init = test_client_builder.genesis_init_mut();
*genesis_init = cumulus_test_client::GenesisParameters { endowed_accounts: account_ids };
let client = test_client_builder.build_with_native_executor(None).0;
@@ -61,8 +61,7 @@ fn benchmark_block_validation(c: &mut Criterion) {
let runtime = tokio::runtime::Runtime::new().expect("creating tokio runtime doesn't fail; qed");
let endowed_accounts = vec![AccountId::from(Alice.public())];
let mut test_client_builder = TestClientBuilder::with_default_backend()
.set_execution_strategy(sc_client_api::ExecutionStrategy::NativeElseWasm);
let mut test_client_builder = TestClientBuilder::with_default_backend();
let genesis_init = test_client_builder.genesis_init_mut();
*genesis_init = cumulus_test_client::GenesisParameters { endowed_accounts };
-8
View File
@@ -55,7 +55,6 @@ use polkadot_node_subsystem::{errors::RecoveryError, messages::AvailabilityRecov
use polkadot_overseer::Handle as OverseerHandle;
use polkadot_primitives::{CollatorPair, Hash as PHash, PersistedValidationData};
use polkadot_service::ProvideRuntimeApi;
use sc_client_api::execution_extensions::ExecutionStrategies;
use sc_consensus::ImportQueue;
use sc_network::{
config::{FullNetworkConfiguration, TransportConfig},
@@ -758,13 +757,6 @@ pub fn node_config(
wasm_method: WasmExecutionMethod::Compiled {
instantiation_strategy: sc_executor_wasmtime::InstantiationStrategy::PoolingCopyOnWrite,
},
execution_strategies: ExecutionStrategies {
syncing: sc_client_api::ExecutionStrategy::AlwaysWasm,
importing: sc_client_api::ExecutionStrategy::AlwaysWasm,
block_construction: sc_client_api::ExecutionStrategy::AlwaysWasm,
offchain_worker: sc_client_api::ExecutionStrategy::AlwaysWasm,
other: sc_client_api::ExecutionStrategy::AlwaysWasm,
},
rpc_addr: None,
rpc_max_connections: Default::default(),
rpc_cors: None,