chore: regenerate umbrella crate, fix feature propagation
This commit is contained in:
@@ -30,8 +30,8 @@ use chain_spec_builder::ChainSpecBuilder;
|
||||
use clap::{Command, CommandFactory, FromArgMatches, ValueEnum};
|
||||
use pezsc_chain_spec::ChainSpec;
|
||||
use pezsc_cli::{
|
||||
CliConfiguration, DefaultConfigurationValues, ImportParams, KeystoreParams, NetworkParams,
|
||||
RpcEndpoint, SharedParams, BizinikiwiCli,
|
||||
BizinikiwiCli, CliConfiguration, DefaultConfigurationValues, ImportParams, KeystoreParams,
|
||||
NetworkParams, RpcEndpoint, SharedParams,
|
||||
};
|
||||
use pezsc_service::{config::PrometheusConfig, BasePath};
|
||||
use pezsc_storage_monitor::StorageMonitorParams;
|
||||
|
||||
@@ -31,11 +31,11 @@ use crate::{
|
||||
runtime::BlockNumber,
|
||||
};
|
||||
use clap::{CommandFactory, FromArgMatches};
|
||||
use log::info;
|
||||
#[cfg(feature = "runtime-benchmarks")]
|
||||
use pezcumulus_client_service::storage_proof_size::HostFunctions as ReclaimHostFunctions;
|
||||
use pezframe_benchmarking_cli::{BenchmarkCmd, BIZINIKIWI_REFERENCE_HARDWARE};
|
||||
use log::info;
|
||||
use pezsc_cli::{Result, BizinikiwiCli};
|
||||
use pezsc_cli::{BizinikiwiCli, Result};
|
||||
#[cfg(feature = "runtime-benchmarks")]
|
||||
use pezsp_runtime::traits::HashingFor;
|
||||
|
||||
@@ -138,8 +138,8 @@ where
|
||||
}
|
||||
|
||||
// If matching on the extra subcommands fails, match on the rest of the node CLI as usual.
|
||||
let mut cli =
|
||||
Cli::<CliConfig>::from_arg_matches(&matches).map_err(|e| pezsc_cli::Error::Cli(e.into()))?;
|
||||
let mut cli = Cli::<CliConfig>::from_arg_matches(&matches)
|
||||
.map_err(|e| pezsc_cli::Error::Cli(e.into()))?;
|
||||
cli.chain_spec_loader = Some(cmd_config.chain_spec_loader);
|
||||
|
||||
#[allow(deprecated)]
|
||||
@@ -273,7 +273,8 @@ where
|
||||
// TODO: change `machine` subcommand to take instead a disk path we want to
|
||||
// benchmark?.
|
||||
let runner = cli.create_runner(cmd)?;
|
||||
runner.sync_run(|config| cmd.run(&config, BIZINIKIWI_REFERENCE_HARDWARE.clone()))
|
||||
runner
|
||||
.sync_run(|config| cmd.run(&config, BIZINIKIWI_REFERENCE_HARDWARE.clone()))
|
||||
},
|
||||
#[allow(unreachable_patterns)]
|
||||
_ => Err("Benchmarking sub-command unsupported or compilation feature missing. \
|
||||
|
||||
@@ -32,7 +32,6 @@ use crate::cli::AuthoringPolicy;
|
||||
use pezcumulus_primitives_core::{CollectCollationInfo, GetTeyrchainInfo, RelayParentOffsetApi};
|
||||
use pezsc_client_db::DbHash;
|
||||
use pezsc_offchain::OffchainWorkerApi;
|
||||
use serde::de::DeserializeOwned;
|
||||
use pezsp_api::{ApiExt, CallApiAt, ConstructRuntimeApi, Metadata};
|
||||
use pezsp_block_builder::BlockBuilder;
|
||||
use pezsp_runtime::{
|
||||
@@ -42,6 +41,7 @@ use pezsp_runtime::{
|
||||
use pezsp_session::SessionKeys;
|
||||
use pezsp_statement_store::runtime_api::ValidateStatement;
|
||||
use pezsp_transaction_pool::runtime_api::TaggedTransactionQueue;
|
||||
use serde::de::DeserializeOwned;
|
||||
use std::{fmt::Debug, path::PathBuf, str::FromStr};
|
||||
|
||||
pub trait NodeBlock:
|
||||
|
||||
@@ -22,6 +22,8 @@ use crate::common::{
|
||||
types::{AccountId, Balance, Nonce, TeyrchainBackend, TeyrchainClient},
|
||||
ConstructNodeRuntimeApi,
|
||||
};
|
||||
use bizinikiwi_frame_rpc_system::{System, SystemApiServer};
|
||||
use bizinikiwi_state_trie_migration_rpc::{StateMigration, StateMigrationApiServer};
|
||||
use pezpallet_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApiServer};
|
||||
use pezsc_rpc::{
|
||||
dev::{Dev, DevApiServer},
|
||||
@@ -29,8 +31,6 @@ use pezsc_rpc::{
|
||||
};
|
||||
use pezsp_runtime::traits::Block as BlockT;
|
||||
use std::{marker::PhantomData, sync::Arc};
|
||||
use bizinikiwi_frame_rpc_system::{System, SystemApiServer};
|
||||
use bizinikiwi_state_trie_migration_rpc::{StateMigration, StateMigrationApiServer};
|
||||
|
||||
/// A type representing all RPC extensions.
|
||||
pub type RpcExtension = jsonrpsee::RpcModule<()>;
|
||||
@@ -63,7 +63,10 @@ where
|
||||
client: Arc<TeyrchainClient<Block, RuntimeApi>>,
|
||||
backend: Arc<TeyrchainBackend<Block>>,
|
||||
pool: Arc<
|
||||
pezsc_transaction_pool::TransactionPoolHandle<Block, TeyrchainClient<Block, RuntimeApi>>,
|
||||
pezsc_transaction_pool::TransactionPoolHandle<
|
||||
Block,
|
||||
TeyrchainClient<Block, RuntimeApi>,
|
||||
>,
|
||||
>,
|
||||
statement_store: Option<Arc<pezsc_statement_store::Store>>,
|
||||
) -> pezsc_service::error::Result<RpcExtension> {
|
||||
|
||||
@@ -29,6 +29,8 @@ use crate::{
|
||||
},
|
||||
};
|
||||
use codec::Encode;
|
||||
use futures::FutureExt;
|
||||
use log::info;
|
||||
use pezcumulus_client_bootnodes::{start_bootnode_tasks, StartBootnodeTasksParams};
|
||||
use pezcumulus_client_cli::CollatorOptions;
|
||||
use pezcumulus_client_service::{
|
||||
@@ -38,10 +40,7 @@ use pezcumulus_client_service::{
|
||||
};
|
||||
use pezcumulus_primitives_core::{BlockT, GetTeyrchainInfo, ParaId};
|
||||
use pezcumulus_relay_chain_interface::{OverseerHandle, RelayChainInterface};
|
||||
use futures::FutureExt;
|
||||
use log::info;
|
||||
use pezkuwi_primitives::CollatorPair;
|
||||
use prometheus_endpoint::Registry;
|
||||
use pezsc_client_api::Backend;
|
||||
use pezsc_consensus::DefaultImportQueue;
|
||||
use pezsc_executor::{HeapAllocStrategy, DEFAULT_HEAP_ALLOC_STRATEGY};
|
||||
@@ -58,6 +57,7 @@ use pezsc_transaction_pool_api::OffchainTransactionPoolFactory;
|
||||
use pezsp_api::{ApiExt, ProvideRuntimeApi};
|
||||
use pezsp_keystore::KeystorePtr;
|
||||
use pezsp_runtime::traits::AccountIdConversion;
|
||||
use prometheus_endpoint::Registry;
|
||||
use std::{future::Future, pin::Pin, sync::Arc, time::Duration};
|
||||
use teyrchains_common::Hash;
|
||||
|
||||
|
||||
@@ -31,6 +31,7 @@ use crate::{
|
||||
},
|
||||
};
|
||||
use codec::Encode;
|
||||
use futures::{prelude::*, FutureExt};
|
||||
use pezcumulus_client_collator::service::{
|
||||
CollatorService, ServiceInterface as CollatorServiceInterface,
|
||||
};
|
||||
@@ -53,9 +54,7 @@ use pezcumulus_primitives_core::{
|
||||
relay_chain::ValidationCode, CollectCollationInfo, GetTeyrchainInfo, ParaId,
|
||||
};
|
||||
use pezcumulus_relay_chain_interface::{OverseerHandle, RelayChainInterface};
|
||||
use futures::{prelude::*, FutureExt};
|
||||
use pezkuwi_primitives::{CollatorPair, UpgradeGoAhead};
|
||||
use prometheus_endpoint::Registry;
|
||||
use pezsc_client_api::{Backend, BlockchainEvents};
|
||||
use pezsc_client_db::DbHash;
|
||||
use pezsc_consensus::{
|
||||
@@ -76,6 +75,7 @@ use pezsp_runtime::{
|
||||
app_crypto::AppCrypto,
|
||||
traits::{Block as BlockT, Header as HeaderT, UniqueSaturatedInto},
|
||||
};
|
||||
use prometheus_endpoint::Registry;
|
||||
use std::{marker::PhantomData, sync::Arc, time::Duration};
|
||||
|
||||
struct Verifier<Block, Client, AuraId> {
|
||||
@@ -127,8 +127,9 @@ where
|
||||
telemetry_handle: Option<TelemetryHandle>,
|
||||
task_manager: &TaskManager,
|
||||
) -> pezsc_service::error::Result<DefaultImportQueue<Block>> {
|
||||
let inherent_data_providers =
|
||||
move |_, _| async move { Ok(pezsp_timestamp::InherentDataProvider::from_system_time()) };
|
||||
let inherent_data_providers = move |_, _| async move {
|
||||
Ok(pezsp_timestamp::InherentDataProvider::from_system_time())
|
||||
};
|
||||
let registry = config.prometheus_registry();
|
||||
let spawner = task_manager.spawn_essential_handle();
|
||||
|
||||
@@ -229,10 +230,11 @@ where
|
||||
// Since this is a dev node, prevent it from connecting to peers.
|
||||
config.network.default_peers_set.in_peers = 0;
|
||||
config.network.default_peers_set.out_peers = 0;
|
||||
let net_config = FullNetworkConfiguration::<_, _, pezsc_network::Litep2pNetworkBackend>::new(
|
||||
&config.network,
|
||||
None,
|
||||
);
|
||||
let net_config =
|
||||
FullNetworkConfiguration::<_, _, pezsc_network::Litep2pNetworkBackend>::new(
|
||||
&config.network,
|
||||
None,
|
||||
);
|
||||
|
||||
let (network, system_rpc_tx, tx_handler_controller, sync_service) =
|
||||
pezsc_service::build_network(pezsc_service::BuildNetworkParams {
|
||||
@@ -319,12 +321,14 @@ where
|
||||
futures_timer::Delay::new(std::time::Duration::from_millis(block_time))
|
||||
.await;
|
||||
manual_seal_sink_clone
|
||||
.try_send(pezsc_consensus_manual_seal::EngineCommand::SealNewBlock {
|
||||
create_empty: true,
|
||||
finalize: true,
|
||||
parent_hash: None,
|
||||
sender: None,
|
||||
})
|
||||
.try_send(
|
||||
pezsc_consensus_manual_seal::EngineCommand::SealNewBlock {
|
||||
create_empty: true,
|
||||
finalize: true,
|
||||
parent_hash: None,
|
||||
sender: None,
|
||||
},
|
||||
)
|
||||
.unwrap();
|
||||
}
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user