chore: regenerate umbrella crate, fix feature propagation
This commit is contained in:
@@ -20,8 +20,8 @@ use pezkuwi_sdk::*;
|
||||
|
||||
use criterion::{criterion_group, criterion_main, BatchSize, Criterion, Throughput};
|
||||
|
||||
use pez_kitchensink_runtime::{constants::currency::*, BalancesCall};
|
||||
use node_cli::service::{create_extrinsic, FullClient};
|
||||
use pez_kitchensink_runtime::{constants::currency::*, BalancesCall};
|
||||
use pezkuwi_sdk::pezsc_service::config::{ExecutorConfiguration, RpcConfiguration};
|
||||
use pezsc_block_builder::{BlockBuilderBuilder, BuiltBlock};
|
||||
use pezsc_consensus::{
|
||||
|
||||
@@ -20,13 +20,13 @@ use pezkuwi_sdk::*;
|
||||
|
||||
use codec::{Decode, Encode};
|
||||
use criterion::{criterion_group, criterion_main, BatchSize, Criterion};
|
||||
use pezframe_support::Hashable;
|
||||
use pez_kitchensink_runtime::{
|
||||
constants::currency::*, Block, BuildStorage, CheckedExtrinsic, Header, RuntimeCall,
|
||||
RuntimeGenesisConfig, UncheckedExtrinsic,
|
||||
};
|
||||
use pez_node_primitives::{BlockNumber, Hash};
|
||||
use pez_node_testing::keyring::*;
|
||||
use pezframe_support::Hashable;
|
||||
use pezsc_executor::{Externalities, RuntimeVersionOf};
|
||||
use pezsp_core::{
|
||||
storage::well_known_keys,
|
||||
|
||||
@@ -18,8 +18,8 @@
|
||||
|
||||
use criterion::{criterion_group, criterion_main, BatchSize, Criterion, Throughput};
|
||||
use futures::{future, StreamExt};
|
||||
use pez_kitchensink_runtime::{constants::currency::*, BalancesCall, SudoCall};
|
||||
use node_cli::service::{create_extrinsic, fetch_nonce, FullClient, TransactionPool};
|
||||
use pez_kitchensink_runtime::{constants::currency::*, BalancesCall, SudoCall};
|
||||
use pez_node_primitives::AccountId;
|
||||
use pezkuwi_sdk::{
|
||||
pezsc_service::config::{ExecutorConfiguration, RpcConfiguration},
|
||||
|
||||
@@ -30,13 +30,13 @@ use pezpallet_revive::is_eth_derived;
|
||||
use pezsc_chain_spec::ChainSpecExtension;
|
||||
use pezsc_service::ChainType;
|
||||
use pezsc_telemetry::TelemetryEndpoints;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use pezsp_authority_discovery::AuthorityId as AuthorityDiscoveryId;
|
||||
use pezsp_consensus_babe::AuthorityId as BabeId;
|
||||
use pezsp_consensus_beefy::ecdsa_crypto::AuthorityId as BeefyId;
|
||||
use pezsp_consensus_grandpa::AuthorityId as GrandpaId;
|
||||
use pezsp_core::crypto::UncheckedInto;
|
||||
use pezsp_mixnet::types::AuthorityId as MixnetId;
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
pub use pez_kitchensink_runtime::RuntimeGenesisConfig;
|
||||
pub use pez_node_primitives::{AccountId, Balance, Signature};
|
||||
@@ -466,17 +466,25 @@ pub(crate) mod tests {
|
||||
fn test_connectivity() {
|
||||
pezsp_tracing::try_init_simple();
|
||||
|
||||
pezsc_service_test::connectivity(integration_test_config_with_two_authorities(), |config| {
|
||||
let NewFullBase { task_manager, client, network, sync, transaction_pool, .. } =
|
||||
new_full_base::<pezsc_network::NetworkWorker<_, _>>(config, None, false, |_, _| ())?;
|
||||
Ok(pezsc_service_test::TestNetComponents::new(
|
||||
task_manager,
|
||||
client,
|
||||
network,
|
||||
sync,
|
||||
transaction_pool,
|
||||
))
|
||||
});
|
||||
pezsc_service_test::connectivity(
|
||||
integration_test_config_with_two_authorities(),
|
||||
|config| {
|
||||
let NewFullBase { task_manager, client, network, sync, transaction_pool, .. } =
|
||||
new_full_base::<pezsc_network::NetworkWorker<_, _>>(
|
||||
config,
|
||||
None,
|
||||
false,
|
||||
|_, _| (),
|
||||
)?;
|
||||
Ok(pezsc_service_test::TestNetComponents::new(
|
||||
task_manager,
|
||||
client,
|
||||
network,
|
||||
sync,
|
||||
transaction_pool,
|
||||
))
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
||||
@@ -24,10 +24,10 @@ use crate::{
|
||||
service::{new_partial, FullClient},
|
||||
Cli, Subcommand,
|
||||
};
|
||||
use pezframe_benchmarking_cli::*;
|
||||
use pez_kitchensink_runtime::{ExistentialDeposit, RuntimeApi};
|
||||
use pez_node_primitives::Block;
|
||||
use pezsc_cli::{Result, BizinikiwiCli};
|
||||
use pezframe_benchmarking_cli::*;
|
||||
use pezsc_cli::{BizinikiwiCli, Result};
|
||||
use pezsc_service::PartialComponents;
|
||||
use pezsp_keyring::Sr25519Keyring;
|
||||
use pezsp_runtime::traits::HashingFor;
|
||||
@@ -59,7 +59,10 @@ impl BizinikiwiCli for Cli {
|
||||
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> {
|
||||
let spec = match id {
|
||||
"" =>
|
||||
return Err(
|
||||
|
||||
@@ -28,18 +28,20 @@ use pezkuwi_sdk::{
|
||||
|
||||
use crate::Cli;
|
||||
use codec::Encode;
|
||||
use pezframe_benchmarking_cli::BIZINIKIWI_REFERENCE_HARDWARE;
|
||||
use pezframe_system_rpc_runtime_api::AccountNonceApi;
|
||||
use futures::prelude::*;
|
||||
use pez_kitchensink_runtime::RuntimeApi;
|
||||
use pez_node_primitives::Block;
|
||||
use pezframe_benchmarking_cli::BIZINIKIWI_REFERENCE_HARDWARE;
|
||||
use pezframe_system_rpc_runtime_api::AccountNonceApi;
|
||||
use pezsc_client_api::{Backend, BlockBackend};
|
||||
use pezsc_consensus_babe::{self, SlotProportion};
|
||||
use pezsc_network::{
|
||||
event::Event, service::traits::NetworkService, NetworkBackend, NetworkEventStream,
|
||||
};
|
||||
use pezsc_network_sync::{strategy::warp::WarpSyncConfig, SyncingService};
|
||||
use pezsc_service::{config::Configuration, error::Error as ServiceError, RpcHandlers, TaskManager};
|
||||
use pezsc_service::{
|
||||
config::Configuration, error::Error as ServiceError, RpcHandlers, TaskManager,
|
||||
};
|
||||
use pezsc_statement_store::Store as StatementStore;
|
||||
use pezsc_telemetry::{Telemetry, TelemetryWorker};
|
||||
use pezsc_transaction_pool::TransactionPoolHandle;
|
||||
@@ -121,28 +123,28 @@ pub fn create_extrinsic(
|
||||
.map(|c| c / 2)
|
||||
.unwrap_or(2) as u64;
|
||||
let tip = 0;
|
||||
let tx_ext: pez_kitchensink_runtime::TxExtension =
|
||||
(
|
||||
pezframe_system::AuthorizeCall::<pez_kitchensink_runtime::Runtime>::new(),
|
||||
pezframe_system::CheckNonZeroSender::<pez_kitchensink_runtime::Runtime>::new(),
|
||||
pezframe_system::CheckSpecVersion::<pez_kitchensink_runtime::Runtime>::new(),
|
||||
pezframe_system::CheckTxVersion::<pez_kitchensink_runtime::Runtime>::new(),
|
||||
pezframe_system::CheckGenesis::<pez_kitchensink_runtime::Runtime>::new(),
|
||||
pezframe_system::CheckEra::<pez_kitchensink_runtime::Runtime>::from(generic::Era::mortal(
|
||||
period,
|
||||
best_block.saturated_into(),
|
||||
)),
|
||||
pezframe_system::CheckNonce::<pez_kitchensink_runtime::Runtime>::from(nonce),
|
||||
pezframe_system::CheckWeight::<pez_kitchensink_runtime::Runtime>::new(),
|
||||
pezpallet_skip_feeless_payment::SkipCheckIfFeeless::from(
|
||||
pezpallet_asset_conversion_tx_payment::ChargeAssetTxPayment::<
|
||||
pez_kitchensink_runtime::Runtime,
|
||||
>::from(tip, None),
|
||||
),
|
||||
pezframe_metadata_hash_extension::CheckMetadataHash::new(false),
|
||||
pezpallet_revive::evm::tx_extension::SetOrigin::<pez_kitchensink_runtime::Runtime>::default(),
|
||||
pezframe_system::WeightReclaim::<pez_kitchensink_runtime::Runtime>::new(),
|
||||
);
|
||||
let tx_ext: pez_kitchensink_runtime::TxExtension = (
|
||||
pezframe_system::AuthorizeCall::<pez_kitchensink_runtime::Runtime>::new(),
|
||||
pezframe_system::CheckNonZeroSender::<pez_kitchensink_runtime::Runtime>::new(),
|
||||
pezframe_system::CheckSpecVersion::<pez_kitchensink_runtime::Runtime>::new(),
|
||||
pezframe_system::CheckTxVersion::<pez_kitchensink_runtime::Runtime>::new(),
|
||||
pezframe_system::CheckGenesis::<pez_kitchensink_runtime::Runtime>::new(),
|
||||
pezframe_system::CheckEra::<pez_kitchensink_runtime::Runtime>::from(generic::Era::mortal(
|
||||
period,
|
||||
best_block.saturated_into(),
|
||||
)),
|
||||
pezframe_system::CheckNonce::<pez_kitchensink_runtime::Runtime>::from(nonce),
|
||||
pezframe_system::CheckWeight::<pez_kitchensink_runtime::Runtime>::new(),
|
||||
pezpallet_skip_feeless_payment::SkipCheckIfFeeless::from(
|
||||
pezpallet_asset_conversion_tx_payment::ChargeAssetTxPayment::<
|
||||
pez_kitchensink_runtime::Runtime,
|
||||
>::from(tip, None),
|
||||
),
|
||||
pezframe_metadata_hash_extension::CheckMetadataHash::new(false),
|
||||
pezpallet_revive::evm::tx_extension::SetOrigin::<pez_kitchensink_runtime::Runtime>::default(
|
||||
),
|
||||
pezframe_system::WeightReclaim::<pez_kitchensink_runtime::Runtime>::new(),
|
||||
);
|
||||
|
||||
let raw_payload = pez_kitchensink_runtime::SignedPayload::from_raw(
|
||||
function.clone(),
|
||||
@@ -934,7 +936,13 @@ mod tests {
|
||||
config,
|
||||
None,
|
||||
false,
|
||||
|block_import: &pezsc_consensus_babe::BabeBlockImport<Block, _, _, _, _>,
|
||||
|block_import: &pezsc_consensus_babe::BabeBlockImport<
|
||||
Block,
|
||||
_,
|
||||
_,
|
||||
_,
|
||||
_,
|
||||
>,
|
||||
babe_link: &pezsc_consensus_babe::BabeLink<Block>| {
|
||||
setup_handles = Some((block_import.clone(), babe_link.clone()));
|
||||
},
|
||||
|
||||
@@ -176,11 +176,15 @@ fn block_with_size(time: u64, nonce: u32, size: usize) -> (Vec<u8>, Hash) {
|
||||
vec![
|
||||
CheckedExtrinsic {
|
||||
format: pezsp_runtime::generic::ExtrinsicFormat::Bare,
|
||||
function: RuntimeCall::Timestamp(pezpallet_timestamp::Call::set { now: time * 1000 }),
|
||||
function: RuntimeCall::Timestamp(pezpallet_timestamp::Call::set {
|
||||
now: time * 1000,
|
||||
}),
|
||||
},
|
||||
CheckedExtrinsic {
|
||||
format: pezsp_runtime::generic::ExtrinsicFormat::Signed(alice(), tx_ext(nonce, 0)),
|
||||
function: RuntimeCall::System(pezframe_system::Call::remark { remark: vec![0; size] }),
|
||||
function: RuntimeCall::System(pezframe_system::Call::remark {
|
||||
remark: vec![0; size],
|
||||
}),
|
||||
},
|
||||
],
|
||||
(time * 1000 / SLOT_DURATION).into(),
|
||||
@@ -700,8 +704,12 @@ fn deploying_wasm_contract_should_work() {
|
||||
let transfer_code = wat::parse_str(CODE_TRANSFER).unwrap();
|
||||
let transfer_ch = <Runtime as pezframe_system::Config>::Hashing::hash(&transfer_code);
|
||||
|
||||
let addr =
|
||||
pezpallet_contracts::Pezpallet::<Runtime>::contract_address(&charlie(), &transfer_ch, &[], &[]);
|
||||
let addr = pezpallet_contracts::Pezpallet::<Runtime>::contract_address(
|
||||
&charlie(),
|
||||
&transfer_ch,
|
||||
&[],
|
||||
&[],
|
||||
);
|
||||
|
||||
let time = 42 * 1000;
|
||||
let b = construct_block(
|
||||
@@ -715,16 +723,16 @@ fn deploying_wasm_contract_should_work() {
|
||||
},
|
||||
CheckedExtrinsic {
|
||||
format: pezsp_runtime::generic::ExtrinsicFormat::Signed(charlie(), tx_ext(0, 0)),
|
||||
function: RuntimeCall::Contracts(pezpallet_contracts::Call::instantiate_with_code::<
|
||||
Runtime,
|
||||
> {
|
||||
value: 0,
|
||||
gas_limit: Weight::from_parts(500_000_000, 0),
|
||||
storage_deposit_limit: None,
|
||||
code: transfer_code,
|
||||
data: Vec::new(),
|
||||
salt: Vec::new(),
|
||||
}),
|
||||
function: RuntimeCall::Contracts(
|
||||
pezpallet_contracts::Call::instantiate_with_code::<Runtime> {
|
||||
value: 0,
|
||||
gas_limit: Weight::from_parts(500_000_000, 0),
|
||||
storage_deposit_limit: None,
|
||||
code: transfer_code,
|
||||
data: Vec::new(),
|
||||
salt: Vec::new(),
|
||||
},
|
||||
),
|
||||
},
|
||||
CheckedExtrinsic {
|
||||
format: pezsp_runtime::generic::ExtrinsicFormat::Signed(charlie(), tx_ext(1, 0)),
|
||||
|
||||
@@ -42,11 +42,21 @@ fn benchmark_pallet_args_work() {
|
||||
true,
|
||||
);
|
||||
benchmark_pallet_args(
|
||||
&["--list", "--pezpallet=pezpallet_balances", "--chain=dev", "--genesis-builder=spec-genesis"],
|
||||
&[
|
||||
"--list",
|
||||
"--pezpallet=pezpallet_balances",
|
||||
"--chain=dev",
|
||||
"--genesis-builder=spec-genesis",
|
||||
],
|
||||
true,
|
||||
);
|
||||
benchmark_pallet_args(
|
||||
&["--list", "--pezpallet=pezpallet_balances", "--chain=dev", "--genesis-builder=spec-runtime"],
|
||||
&[
|
||||
"--list",
|
||||
"--pezpallet=pezpallet_balances",
|
||||
"--chain=dev",
|
||||
"--genesis-builder=spec-runtime",
|
||||
],
|
||||
true,
|
||||
);
|
||||
// Error because no runtime is provided:
|
||||
|
||||
@@ -42,11 +42,21 @@ fn benchmark_pezpallet_args_work() {
|
||||
true,
|
||||
);
|
||||
benchmark_pezpallet_args(
|
||||
&["--list", "--pezpallet=pezpallet_balances", "--chain=dev", "--genesis-builder=spec-genesis"],
|
||||
&[
|
||||
"--list",
|
||||
"--pezpallet=pezpallet_balances",
|
||||
"--chain=dev",
|
||||
"--genesis-builder=spec-genesis",
|
||||
],
|
||||
true,
|
||||
);
|
||||
benchmark_pezpallet_args(
|
||||
&["--list", "--pezpallet=pezpallet_balances", "--chain=dev", "--genesis-builder=spec-runtime"],
|
||||
&[
|
||||
"--list",
|
||||
"--pezpallet=pezpallet_balances",
|
||||
"--chain=dev",
|
||||
"--genesis-builder=spec-runtime",
|
||||
],
|
||||
true,
|
||||
);
|
||||
// Error because no runtime is provided:
|
||||
|
||||
@@ -17,11 +17,6 @@
|
||||
// along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
use codec::{Encode, Joiner};
|
||||
use pezframe_support::{
|
||||
dispatch::GetDispatchInfo,
|
||||
traits::Currency,
|
||||
weights::{constants::ExtrinsicBaseWeight, IdentityFee, WeightToFee},
|
||||
};
|
||||
use pez_kitchensink_runtime::{
|
||||
constants::{currency::*, time::SLOT_DURATION},
|
||||
Balances, CheckedExtrinsic, Multiplier, Runtime, RuntimeCall, TransactionByteFee,
|
||||
@@ -29,6 +24,11 @@ use pez_kitchensink_runtime::{
|
||||
};
|
||||
use pez_node_primitives::Balance;
|
||||
use pez_node_testing::keyring::*;
|
||||
use pezframe_support::{
|
||||
dispatch::GetDispatchInfo,
|
||||
traits::Currency,
|
||||
weights::{constants::ExtrinsicBaseWeight, IdentityFee, WeightToFee},
|
||||
};
|
||||
use pezkuwi_sdk::*;
|
||||
use pezsp_runtime::{traits::One, Perbill};
|
||||
|
||||
@@ -63,7 +63,9 @@ fn fee_multiplier_increases_and_decreases_on_big_weight() {
|
||||
format: pezsp_runtime::generic::ExtrinsicFormat::Signed(charlie(), tx_ext(0, 0)),
|
||||
function: RuntimeCall::Sudo(pezpallet_sudo::Call::sudo {
|
||||
call: Box::new(RuntimeCall::RootTesting(
|
||||
pezpallet_root_testing::Call::fill_block { ratio: Perbill::from_percent(60) },
|
||||
pezpallet_root_testing::Call::fill_block {
|
||||
ratio: Perbill::from_percent(60),
|
||||
},
|
||||
)),
|
||||
}),
|
||||
},
|
||||
|
||||
@@ -17,8 +17,10 @@
|
||||
// along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
use codec::Decode;
|
||||
use pez_kitchensink_runtime::{
|
||||
Executive, ExistentialDeposit, Indices, Runtime, UncheckedExtrinsic,
|
||||
};
|
||||
use pezframe_system::offchain::{SendSignedTransaction, Signer, SubmitTransaction};
|
||||
use pez_kitchensink_runtime::{Executive, ExistentialDeposit, Indices, Runtime, UncheckedExtrinsic};
|
||||
use pezkuwi_sdk::*;
|
||||
use pezsp_application_crypto::AppCrypto;
|
||||
use pezsp_core::offchain::{testing::TestTransactionPoolExt, TransactionPoolExt};
|
||||
|
||||
@@ -27,7 +27,10 @@ fn expected_regex() -> Regex {
|
||||
#[test]
|
||||
fn version_is_full() {
|
||||
let expected = expected_regex();
|
||||
let output = Command::new(cargo_bin("bizinikiwi-node")).args(&["--version"]).output().unwrap();
|
||||
let output = Command::new(cargo_bin("bizinikiwi-node"))
|
||||
.args(&["--version"])
|
||||
.output()
|
||||
.unwrap();
|
||||
|
||||
assert!(output.status.success(), "command returned with non-success exit code");
|
||||
|
||||
|
||||
Reference in New Issue
Block a user