Commit 6301515b authored by Cecile Tonglet's avatar Cecile Tonglet
Browse files

Merge commit 01ffc66b (no conflict)

Parent branch: origin/master
Forked at: bf7ccb84
parents 7f573736 01ffc66b
This diff is collapsed.
......@@ -4,7 +4,7 @@ path = "src/main.rs"
[package]
name = "polkadot"
version = "0.8.19"
version = "0.8.22"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
......
......@@ -1203,13 +1203,7 @@ sp_api::impl_runtime_apis! {
#[cfg(feature = "runtime-benchmarks")]
impl frame_benchmarking::Benchmark<Block> for Runtime {
fn dispatch_benchmark(
pallet: Vec<u8>,
benchmark: Vec<u8>,
lowest_range_values: Vec<u32>,
highest_range_values: Vec<u32>,
steps: Vec<u32>,
repeat: u32,
extra: bool,
config: frame_benchmarking::BenchmarkConfig
) -> Result<Vec<frame_benchmarking::BenchmarkBatch>, RuntimeString> {
use frame_benchmarking::{Benchmarking, BenchmarkBatch, add_benchmark, TrackedStorageKey};
// Trying to add benchmarks directly to the Session Pallet caused cyclic dependency issues.
......@@ -1239,16 +1233,7 @@ sp_api::impl_runtime_apis! {
];
let mut batches = Vec::<BenchmarkBatch>::new();
let params = (
&pallet,
&benchmark,
&lowest_range_values,
&highest_range_values,
&steps,
repeat,
&whitelist,
extra,
);
let params = (&config, &whitelist);
// Polkadot
add_benchmark!(params, batches, claims, Claims);
// Substrate
......
......@@ -1344,13 +1344,7 @@ sp_api::impl_runtime_apis! {
#[cfg(feature = "runtime-benchmarks")]
impl frame_benchmarking::Benchmark<Block> for Runtime {
fn dispatch_benchmark(
pallet: Vec<u8>,
benchmark: Vec<u8>,
lowest_range_values: Vec<u32>,
highest_range_values: Vec<u32>,
steps: Vec<u32>,
repeat: u32,
extra: bool,
config: frame_benchmarking::BenchmarkConfig
) -> Result<Vec<frame_benchmarking::BenchmarkBatch>, RuntimeString> {
use frame_benchmarking::{Benchmarking, BenchmarkBatch, add_benchmark, TrackedStorageKey};
// Trying to add benchmarks directly to the Session Pallet caused cyclic dependency issues.
......@@ -1380,16 +1374,7 @@ sp_api::impl_runtime_apis! {
];
let mut batches = Vec::<BenchmarkBatch>::new();
let params = (
&pallet,
&benchmark,
&lowest_range_values,
&highest_range_values,
&steps,
repeat,
&whitelist,
extra,
);
let params = (&config, &whitelist);
// Polkadot
add_benchmark!(params, batches, claims, Claims);
// Substrate
......
......@@ -1000,13 +1000,7 @@ sp_api::impl_runtime_apis! {
#[cfg(feature = "runtime-benchmarks")]
impl frame_benchmarking::Benchmark<Block> for Runtime {
fn dispatch_benchmark(
pallet: Vec<u8>,
benchmark: Vec<u8>,
lowest_range_values: Vec<u32>,
highest_range_values: Vec<u32>,
steps: Vec<u32>,
repeat: u32,
extra: bool,
config: frame_benchmarking::BenchmarkConfig,
) -> Result<Vec<frame_benchmarking::BenchmarkBatch>, RuntimeString> {
use frame_benchmarking::{Benchmarking, BenchmarkBatch, add_benchmark, TrackedStorageKey};
// Trying to add benchmarks directly to the Session Pallet caused cyclic dependency issues.
......@@ -1036,16 +1030,7 @@ sp_api::impl_runtime_apis! {
];
let mut batches = Vec::<BenchmarkBatch>::new();
let params = (
&pallet,
&benchmark,
&lowest_range_values,
&highest_range_values,
&steps,
repeat,
&whitelist,
extra,
);
let params = (&config, &whitelist);
add_benchmark!(params, batches, pallet_balances, Balances);
add_benchmark!(params, batches, pallet_identity, Identity);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment