mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-04-26 15:47:58 +00:00
3aa4bfacfc
* Asyncify sign_with * Asyncify generate/get keys * Complete BareCryptoStore asyncification * Cleanup * Rebase * Add Proxy * Inject keystore proxy into extensions * Implement some methods * Await on send * Cleanup * Send result over the oneshot channel sender * Process one future at a time * Fix cargo stuff * Asyncify sr25519_vrf_sign * Cherry-pick and fix changes * Introduce SyncCryptoStore * SQUASH ME WITH THE first commit * Implement into SyncCryptoStore * Implement BareCryptoStore for KeystoreProxyAdapter * authority-discovery * AURA * BABE * finality-grandpa * offchain-workers * benchmarking-cli * sp_io * test-utils * application-crypto * Extensions and RPC * Client Service * bin * Update cargo.lock * Implement BareCryptoStore on proxy directly * Simplify proxy setup * Fix authority-discover * Pass async keystore to authority-discovery * Fix tests * Use async keystore in authority-discovery * Rename BareCryptoStore to CryptoStore * WIP * Remote mutable borrow in CryptoStore trait * Implement Keystore with backends * Remove Proxy implementation * Fix service builder and keystore user-crates * Fix tests * Rework authority-discovery after refactoring * futures::select! * Fix multiple mut borrows in authority-discovery * Merge fixes * Require sync * Restore Cargo.lock * PR feedback - round 1 * Remove Keystore and use LocalKeystore directly Also renamed KeystoreParams to KeystoreContainer * Join * Remove sync requirement * Fix keystore tests * Fix tests * client/authority-discovery: Remove event stream dynamic dispatching With authority-discovery moving from a poll based future to an `async` future Rust has difficulties propagating the `Sync` trade through the generated state machine. Instead of using dynamic dispatching, use a trait parameter to specify the DHT event stream. * Make it compile * Fix submit_transaction * Fix block_on issue * Use await in async context * Fix manual seal keystore * Fix authoring_blocks test * fix aura authoring_blocks * Try to fix tests for auth-discovery * client/authority-discovery: Fix lookup_throttling test * client/authority-discovery: Fix triggers_dht_get_query test * Fix epoch_authorship_works * client/authority-discovery: Remove timing assumption in unit test * client/authority-discovery: Revert changes to termination test * PR feedback * Remove deadcode and mark test code * Fix test_sync * Use the correct keyring type * Return when from_service stream is closed * Convert SyncCryptoStore to a trait * Fix line width * Fix line width - take 2 * Remove unused import * Fix keystore instantiation * PR feedback * Remove KeystoreContainer * Revert "Remove KeystoreContainer" This reverts commit ea4a37c7d74f9772b93d974e05e4498af6192730. * Take a ref of keystore * Move keystore to dev-dependencies * Address some PR feedback * Missed one * Pass keystore reference - take 2 * client/finality-grandpa: Use `Arc<dyn CryptoStore>` instead of SyncXXX Instead of using `SyncCryptoStorePtr` within `client/finality-grandpa`, which is a type alias for `Arc<dyn SyncCryptoStore>`, use `Arc<dyn CryptoStore>`. Benefits are: 1. No additional mental overhead of a `SyncCryptoStorePtr`. 2. Ability for new code to use the asynchronous methods of `CryptoStore` instead of the synchronous `SyncCryptoStore` methods within `client/finality-granpa` without the need for larger refactorings. Note: This commit uses `Arc<dyn CryptoStore>` instead of `CryptoStorePtr`, as I find the type signature more descriptive. This is subjective and in no way required. * Remove SyncCryptoStorePtr * Remove KeystoreContainer & SyncCryptoStorePtr * PR feedback * *: Use CryptoStorePtr whereever possible * *: Define SyncCryptoStore as a pure extension trait of CryptoStore * Follow up to SyncCryptoStore extension trait * Adjust docs for SyncCryptoStore as Ben suggested * Cleanup unnecessary requirements * sp-keystore * Use async_std::task::block_on in keystore * Fix block_on std requirement * Update primitives/keystore/src/lib.rs Co-authored-by: Max Inden <mail@max-inden.de> * Fix wasm build * Remove unused var * Fix wasm compilation - take 2 * Revert async-std in keystore * Fix indent * Fix version and copyright * Cleanup feature = "std" * Auth Discovery: Ignore if from_service is cloed * Max's suggestion * Revert async-std usage for block_on * Address PR feedback * Fix example offchain worker build * Address PR feedback * Update Cargo.lock * Move unused methods to test helper functions * Restore accidentally deleted cargo.lock files * Fix unused imports Co-authored-by: Max Inden <mail@max-inden.de> Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
206 lines
6.7 KiB
Rust
206 lines
6.7 KiB
Rust
// This file is part of Substrate.
|
|
|
|
// Copyright (C) 2020 Parity Technologies (UK) Ltd.
|
|
// SPDX-License-Identifier: Apache-2.0
|
|
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
use std::sync::Arc;
|
|
use crate::BenchmarkCmd;
|
|
use codec::{Decode, Encode};
|
|
use frame_benchmarking::{Analysis, BenchmarkBatch, BenchmarkSelector};
|
|
use sc_cli::{SharedParams, CliConfiguration, ExecutionStrategy, Result};
|
|
use sc_client_db::BenchmarkingState;
|
|
use sc_executor::NativeExecutor;
|
|
use sp_state_machine::StateMachine;
|
|
use sp_externalities::Extensions;
|
|
use sc_service::{Configuration, NativeExecutionDispatch};
|
|
use sp_runtime::traits::{Block as BlockT, Header as HeaderT, NumberFor};
|
|
use sp_core::offchain::{OffchainExt, testing::TestOffchainExt};
|
|
use sp_keystore::{
|
|
SyncCryptoStorePtr, KeystoreExt,
|
|
testing::KeyStore,
|
|
};
|
|
use std::fmt::Debug;
|
|
|
|
impl BenchmarkCmd {
|
|
/// Runs the command and benchmarks the chain.
|
|
pub fn run<BB, ExecDispatch>(&self, config: Configuration) -> Result<()>
|
|
where
|
|
BB: BlockT + Debug,
|
|
<<<BB as BlockT>::Header as HeaderT>::Number as std::str::FromStr>::Err: std::fmt::Debug,
|
|
<BB as BlockT>::Hash: std::str::FromStr,
|
|
ExecDispatch: NativeExecutionDispatch + 'static,
|
|
{
|
|
if let Some(output_path) = &self.output {
|
|
if !output_path.is_dir() { return Err("Output path is invalid!".into()) };
|
|
}
|
|
|
|
if let Some(header_file) = &self.header {
|
|
if !header_file.is_file() { return Err("Header file is invalid!".into()) };
|
|
}
|
|
|
|
let spec = config.chain_spec;
|
|
let wasm_method = self.wasm_method.into();
|
|
let strategy = self.execution.unwrap_or(ExecutionStrategy::Native);
|
|
|
|
let genesis_storage = spec.build_storage()?;
|
|
let mut changes = Default::default();
|
|
let mut offchain_changes = Default::default();
|
|
let cache_size = Some(self.database_cache_size as usize);
|
|
let state = BenchmarkingState::<BB>::new(genesis_storage, cache_size)?;
|
|
let executor = NativeExecutor::<ExecDispatch>::new(
|
|
wasm_method,
|
|
self.heap_pages,
|
|
2, // The runtime instances cache size.
|
|
);
|
|
|
|
let mut extensions = Extensions::default();
|
|
extensions.register(KeystoreExt(Arc::new(KeyStore::new()) as SyncCryptoStorePtr));
|
|
let (offchain, _) = TestOffchainExt::new();
|
|
extensions.register(OffchainExt::new(offchain));
|
|
|
|
let result = StateMachine::<_, _, NumberFor<BB>, _>::new(
|
|
&state,
|
|
None,
|
|
&mut changes,
|
|
&mut offchain_changes,
|
|
&executor,
|
|
"Benchmark_dispatch_benchmark",
|
|
&(
|
|
&self.pallet,
|
|
&self.extrinsic,
|
|
self.lowest_range_values.clone(),
|
|
self.highest_range_values.clone(),
|
|
self.steps.clone(),
|
|
self.repeat,
|
|
!self.no_verify,
|
|
self.extra,
|
|
).encode(),
|
|
extensions,
|
|
&sp_state_machine::backend::BackendRuntimeCode::new(&state).runtime_code()?,
|
|
sp_core::testing::TaskExecutor::new(),
|
|
)
|
|
.execute(strategy.into())
|
|
.map_err(|e| format!("Error executing runtime benchmark: {:?}", e))?;
|
|
|
|
let results = <std::result::Result<Vec<BenchmarkBatch>, String> as Decode>::decode(&mut &result[..])
|
|
.map_err(|e| format!("Failed to decode benchmark results: {:?}", e))?;
|
|
|
|
match results {
|
|
Ok(batches) => {
|
|
// If we are going to output results to a file...
|
|
if let Some(output_path) = &self.output {
|
|
if self.trait_def {
|
|
crate::writer::write_trait(&batches, output_path, &self.r#trait, self.spaces)?;
|
|
} else {
|
|
crate::writer::write_results(
|
|
&batches,
|
|
output_path,
|
|
&self.lowest_range_values,
|
|
&self.highest_range_values,
|
|
&self.steps,
|
|
self.repeat,
|
|
&self.header,
|
|
&self.r#struct,
|
|
&self.r#trait,
|
|
self.spaces
|
|
)?;
|
|
}
|
|
}
|
|
|
|
for batch in batches.into_iter() {
|
|
// Print benchmark metadata
|
|
println!(
|
|
"Pallet: {:?}, Extrinsic: {:?}, Lowest values: {:?}, Highest values: {:?}, Steps: {:?}, Repeat: {:?}",
|
|
String::from_utf8(batch.pallet).expect("Encoded from String; qed"),
|
|
String::from_utf8(batch.benchmark).expect("Encoded from String; qed"),
|
|
self.lowest_range_values,
|
|
self.highest_range_values,
|
|
self.steps,
|
|
self.repeat,
|
|
);
|
|
|
|
// Skip raw data + analysis if there are no results
|
|
if batch.results.is_empty() { continue }
|
|
|
|
if self.raw_data {
|
|
// Print the table header
|
|
batch.results[0].components.iter().for_each(|param| print!("{:?},", param.0));
|
|
|
|
print!("extrinsic_time,storage_root_time,reads,repeat_reads,writes,repeat_writes\n");
|
|
// Print the values
|
|
batch.results.iter().for_each(|result| {
|
|
let parameters = &result.components;
|
|
parameters.iter().for_each(|param| print!("{:?},", param.1));
|
|
// Print extrinsic time and storage root time
|
|
print!("{:?},{:?},{:?},{:?},{:?},{:?}\n",
|
|
result.extrinsic_time,
|
|
result.storage_root_time,
|
|
result.reads,
|
|
result.repeat_reads,
|
|
result.writes,
|
|
result.repeat_writes,
|
|
);
|
|
});
|
|
|
|
println!();
|
|
}
|
|
|
|
// Conduct analysis.
|
|
if !self.no_median_slopes {
|
|
println!("Median Slopes Analysis\n========");
|
|
if let Some(analysis) = Analysis::median_slopes(&batch.results, BenchmarkSelector::ExtrinsicTime) {
|
|
println!("-- Extrinsic Time --\n{}", analysis);
|
|
}
|
|
if let Some(analysis) = Analysis::median_slopes(&batch.results, BenchmarkSelector::Reads) {
|
|
println!("Reads = {:?}", analysis);
|
|
}
|
|
if let Some(analysis) = Analysis::median_slopes(&batch.results, BenchmarkSelector::Writes) {
|
|
println!("Writes = {:?}", analysis);
|
|
}
|
|
}
|
|
if !self.no_min_squares {
|
|
println!("Min Squares Analysis\n========");
|
|
if let Some(analysis) = Analysis::min_squares_iqr(&batch.results, BenchmarkSelector::ExtrinsicTime) {
|
|
println!("-- Extrinsic Time --\n{}", analysis);
|
|
}
|
|
if let Some(analysis) = Analysis::min_squares_iqr(&batch.results, BenchmarkSelector::Reads) {
|
|
println!("Reads = {:?}", analysis);
|
|
}
|
|
if let Some(analysis) = Analysis::min_squares_iqr(&batch.results, BenchmarkSelector::Writes) {
|
|
println!("Writes = {:?}", analysis);
|
|
}
|
|
}
|
|
}
|
|
},
|
|
Err(error) => eprintln!("Error: {:?}", error),
|
|
}
|
|
|
|
Ok(())
|
|
}
|
|
}
|
|
|
|
impl CliConfiguration for BenchmarkCmd {
|
|
fn shared_params(&self) -> &SharedParams {
|
|
&self.shared_params
|
|
}
|
|
|
|
fn chain_id(&self, _is_dev: bool) -> Result<String> {
|
|
Ok(match self.shared_params.chain {
|
|
Some(ref chain) => chain.clone(),
|
|
None => "dev".into(),
|
|
})
|
|
}
|
|
}
|