chore: regenerate umbrella crate, fix feature propagation
This commit is contained in:
@@ -200,7 +200,8 @@ pub fn get_wasm_module() -> Box<dyn pezsc_executor_common::wasm_runtime::WasmMod
|
||||
cache_path: None,
|
||||
semantics: pezsc_executor_wasmtime::Semantics {
|
||||
heap_alloc_strategy: DEFAULT_HEAP_ALLOC_STRATEGY,
|
||||
instantiation_strategy: pezsc_executor::WasmtimeInstantiationStrategy::PoolingCopyOnWrite,
|
||||
instantiation_strategy:
|
||||
pezsc_executor::WasmtimeInstantiationStrategy::PoolingCopyOnWrite,
|
||||
deterministic_stack_limit: None,
|
||||
canonicalize_nans: false,
|
||||
parallel_compilation: true,
|
||||
|
||||
@@ -18,8 +18,8 @@ use clap::ValueEnum;
|
||||
use pezcumulus_client_cli::{ExportGenesisHeadCommand, ExportGenesisWasmCommand};
|
||||
use pezkuwi_service::{ChainSpec, ParaId, PrometheusConfig};
|
||||
use pezsc_cli::{
|
||||
CliConfiguration, DefaultConfigurationValues, ImportParams, KeystoreParams, NetworkParams,
|
||||
Result as CliResult, RpcEndpoint, SharedParams, BizinikiwiCli,
|
||||
BizinikiwiCli, CliConfiguration, DefaultConfigurationValues, ImportParams, KeystoreParams,
|
||||
NetworkParams, Result as CliResult, RpcEndpoint, SharedParams,
|
||||
};
|
||||
use pezsc_service::BasePath;
|
||||
use std::{
|
||||
@@ -282,11 +282,15 @@ impl BizinikiwiCli for TestCollatorCli {
|
||||
2017
|
||||
}
|
||||
|
||||
fn load_spec(&self, id: &str) -> std::result::Result<Box<dyn pezsc_service::ChainSpec>, String> {
|
||||
fn load_spec(
|
||||
&self,
|
||||
id: &str,
|
||||
) -> std::result::Result<Box<dyn pezsc_service::ChainSpec>, String> {
|
||||
Ok(match id {
|
||||
"" => {
|
||||
tracing::info!("Using default test service chain spec.");
|
||||
Box::new(pezcumulus_test_service::get_chain_spec(Some(ParaId::from(2000)))) as Box<_>
|
||||
Box::new(pezcumulus_test_service::get_chain_spec(Some(ParaId::from(2000))))
|
||||
as Box<_>
|
||||
},
|
||||
"elastic-scaling-mvp" => {
|
||||
tracing::info!("Using elastic-scaling mvp chain spec.");
|
||||
@@ -296,9 +300,9 @@ impl BizinikiwiCli for TestCollatorCli {
|
||||
},
|
||||
"elastic-scaling" => {
|
||||
tracing::info!("Using elastic-scaling chain spec.");
|
||||
Box::new(pezcumulus_test_service::get_elastic_scaling_chain_spec(Some(ParaId::from(
|
||||
2200,
|
||||
)))) as Box<_>
|
||||
Box::new(pezcumulus_test_service::get_elastic_scaling_chain_spec(Some(
|
||||
ParaId::from(2200),
|
||||
))) as Box<_>
|
||||
},
|
||||
"elastic-scaling-500ms" => {
|
||||
tracing::info!("Using elastic-scaling 500ms chain spec.");
|
||||
@@ -324,9 +328,10 @@ impl BizinikiwiCli for TestCollatorCli {
|
||||
2500,
|
||||
)))) as Box<_>
|
||||
},
|
||||
"relay-parent-offset" => Box::new(
|
||||
pezcumulus_test_service::get_relay_parent_offset_chain_spec(Some(ParaId::from(2600))),
|
||||
) as Box<_>,
|
||||
"relay-parent-offset" =>
|
||||
Box::new(pezcumulus_test_service::get_relay_parent_offset_chain_spec(Some(
|
||||
ParaId::from(2600),
|
||||
))) as Box<_>,
|
||||
path => {
|
||||
let chain_spec: pezsc_chain_spec::GenericChainSpec =
|
||||
pezsc_chain_spec::GenericChainSpec::from_json_file(path.into())?;
|
||||
@@ -367,7 +372,10 @@ impl BizinikiwiCli for RelayChainCli {
|
||||
2017
|
||||
}
|
||||
|
||||
fn load_spec(&self, id: &str) -> std::result::Result<Box<dyn pezsc_service::ChainSpec>, String> {
|
||||
fn load_spec(
|
||||
&self,
|
||||
id: &str,
|
||||
) -> std::result::Result<Box<dyn pezsc_service::ChainSpec>, String> {
|
||||
<pezkuwi_cli::Cli as BizinikiwiCli>::from_iter([RelayChainCli::executable_name()].iter())
|
||||
.load_spec(id)
|
||||
}
|
||||
|
||||
@@ -34,10 +34,10 @@ use pezcumulus_client_consensus_aura::{
|
||||
},
|
||||
ImportQueueParams,
|
||||
};
|
||||
use prometheus::Registry;
|
||||
use runtime::AccountId;
|
||||
use pezsc_executor::{HeapAllocStrategy, WasmExecutor, DEFAULT_HEAP_ALLOC_STRATEGY};
|
||||
use pezsp_consensus_aura::sr25519::AuthorityPair;
|
||||
use prometheus::Registry;
|
||||
use runtime::AccountId;
|
||||
use std::{
|
||||
collections::HashSet,
|
||||
future::Future,
|
||||
@@ -62,6 +62,9 @@ use pezcumulus_relay_chain_minimal_node::build_minimal_relay_chain_node_with_rpc
|
||||
|
||||
use pezcumulus_test_runtime::{Hash, NodeBlock as Block, RuntimeApi};
|
||||
|
||||
use bizinikiwi_test_client::{
|
||||
BlockchainEventsExt, RpcHandlersExt, RpcTransactionError, RpcTransactionOutput,
|
||||
};
|
||||
use pezframe_system_rpc_runtime_api::AccountNonceApi;
|
||||
use pezkuwi_node_subsystem::{errors::RecoveryError, messages::AvailabilityRecoveryMessage};
|
||||
use pezkuwi_overseer::Handle as OverseerHandle;
|
||||
@@ -90,9 +93,6 @@ use pezsp_keyring::Sr25519Keyring;
|
||||
use pezsp_runtime::{codec::Encode, generic, MultiAddress};
|
||||
use pezsp_state_machine::BasicExternalities;
|
||||
use std::sync::Arc;
|
||||
use bizinikiwi_test_client::{
|
||||
BlockchainEventsExt, RpcHandlersExt, RpcTransactionError, RpcTransactionOutput,
|
||||
};
|
||||
|
||||
pub use chain_spec::*;
|
||||
pub use pezcumulus_test_runtime as runtime;
|
||||
@@ -103,8 +103,10 @@ const LOG_TARGET: &str = "pezcumulus-test-service";
|
||||
/// The signature of the announce block fn.
|
||||
pub type AnnounceBlockFn = Arc<dyn Fn(Hash, Option<Vec<u8>>) + Send + Sync>;
|
||||
|
||||
type HostFunctions =
|
||||
(pezsp_io::BizinikiwiHostFunctions, pezcumulus_client_service::storage_proof_size::HostFunctions);
|
||||
type HostFunctions = (
|
||||
pezsp_io::BizinikiwiHostFunctions,
|
||||
pezcumulus_client_service::storage_proof_size::HostFunctions,
|
||||
);
|
||||
/// The client type being used by the test service.
|
||||
pub type Client = TFullClient<runtime::NodeBlock, runtime::RuntimeApi, WasmExecutor<HostFunctions>>;
|
||||
|
||||
@@ -215,26 +217,27 @@ pub fn new_partial(
|
||||
);
|
||||
|
||||
let slot_duration = pezsc_consensus_aura::slot_duration(&*client)?;
|
||||
let import_queue = pezcumulus_client_consensus_aura::import_queue::<AuthorityPair, _, _, _, _, _>(
|
||||
ImportQueueParams {
|
||||
block_import: block_import.clone(),
|
||||
client: client.clone(),
|
||||
create_inherent_data_providers: move |_, ()| async move {
|
||||
let timestamp = pezsp_timestamp::InherentDataProvider::from_system_time();
|
||||
let import_queue =
|
||||
pezcumulus_client_consensus_aura::import_queue::<AuthorityPair, _, _, _, _, _>(
|
||||
ImportQueueParams {
|
||||
block_import: block_import.clone(),
|
||||
client: client.clone(),
|
||||
create_inherent_data_providers: move |_, ()| async move {
|
||||
let timestamp = pezsp_timestamp::InherentDataProvider::from_system_time();
|
||||
|
||||
let slot =
|
||||
let slot =
|
||||
pezsp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_slot_duration(
|
||||
*timestamp,
|
||||
slot_duration,
|
||||
);
|
||||
|
||||
Ok((slot, timestamp))
|
||||
Ok((slot, timestamp))
|
||||
},
|
||||
spawner: &task_manager.spawn_essential_handle(),
|
||||
registry: None,
|
||||
telemetry: None,
|
||||
},
|
||||
spawner: &task_manager.spawn_essential_handle(),
|
||||
registry: None,
|
||||
telemetry: None,
|
||||
},
|
||||
)?;
|
||||
)?;
|
||||
|
||||
let params = PartialComponents {
|
||||
backend,
|
||||
|
||||
@@ -21,7 +21,7 @@ use std::sync::Arc;
|
||||
use cli::{AuthoringPolicy, RelayChainCli, Subcommand, TestCollatorCli};
|
||||
use pezcumulus_primitives_core::relay_chain::CollatorPair;
|
||||
use pezcumulus_test_service::{new_partial, AnnounceBlockFn};
|
||||
use pezsc_cli::{CliConfiguration, BizinikiwiCli};
|
||||
use pezsc_cli::{BizinikiwiCli, CliConfiguration};
|
||||
use pezsp_core::Pair;
|
||||
|
||||
pub fn wrap_announce_block() -> Box<dyn FnOnce(AnnounceBlockFn) -> AnnounceBlockFn> {
|
||||
|
||||
Reference in New Issue
Block a user