Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

migrate new benchmarking syntax from frame_support::benchmarking to frame_benchmarking::v2 #13235

Merged
merged 8 commits into from
Jan 27, 2023
Merged

migrate new benchmarking syntax from frame_support::benchmarking to frame_benchmarking::v2 #13235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
66704ce
* re-export frame_support::benchmarking in frame_benchmarking::
sam0x17 Jan 24, 2023
96fd853
switch to frame_benchmarking::v2
sam0x17 Jan 25, 2023
6efefc6
completely migrate new benchmarking code out of frame_support
sam0x17 Jan 25, 2023
7ebadda
fix doc links
sam0x17 Jan 25, 2023
fe41f75
remove unneeded return
sam0x17 Jan 25, 2023
1e3587b
remove another unneeded return
sam0x17 Jan 25, 2023
01e2a69
properly export all macros in v1
sam0x17 Jan 26, 2023
631f88c
refactor existing frame_benchmarking imports to use ::v1
sam0x17 Jan 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion bin/node-template/pallets/template/src/benchmarking.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use super::*;

#[allow(unused)]
use crate::Pallet as Template;
use frame_benchmarking::{benchmarks, whitelisted_caller};
use frame_benchmarking::v1::{benchmarks, whitelisted_caller};
use frame_system::RawOrigin;

benchmarks! {
Expand Down
2 changes: 1 addition & 1 deletion frame/alliance/src/benchmarking.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ use sp_std::{
prelude::*,
};

use frame_benchmarking::{account, benchmarks_instance_pallet};
use frame_benchmarking::v1::{account, benchmarks_instance_pallet};
use frame_support::traits::{EnsureOrigin, Get, UnfilteredDispatchable};
use frame_system::{Pallet as System, RawOrigin as SystemOrigin};

Expand Down
2 changes: 1 addition & 1 deletion frame/assets/src/benchmarking.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#![cfg(feature = "runtime-benchmarks")]

use super::*;
use frame_benchmarking::{
use frame_benchmarking::v1::{
account, benchmarks_instance_pallet, whitelist_account, whitelisted_caller,
};
use frame_support::{
Expand Down
2 changes: 1 addition & 1 deletion frame/babe/src/benchmarking.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#![cfg(feature = "runtime-benchmarks")]

use super::*;
use frame_benchmarking::benchmarks;
use frame_benchmarking::v1::benchmarks;

type Header = sp_runtime::generic::Header<u64, sp_runtime::traits::BlakeTwo256>;

Expand Down
6 changes: 4 additions & 2 deletions frame/bags-list/src/benchmarks.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,15 @@

use super::*;
use crate::list::List;
use frame_benchmarking::{account, whitelist_account, whitelisted_caller};
use frame_benchmarking::v1::{
account, benchmarks_instance_pallet, whitelist_account, whitelisted_caller,
};
use frame_election_provider_support::ScoreProvider;
use frame_support::{assert_ok, traits::Get};
use frame_system::RawOrigin as SystemOrigin;
use sp_runtime::traits::One;

frame_benchmarking::benchmarks_instance_pallet! {
benchmarks_instance_pallet! {
rebag_non_terminal {
// An expensive case for rebag-ing (rebag a non-terminal node):
//
Expand Down
3 changes: 1 addition & 2 deletions frame/balances/src/benchmarking.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@
use super::*;
use crate::Pallet as Balances;

use frame_benchmarking::{account, impl_benchmark_test_suite, whitelisted_caller};
use frame_support::benchmarking::*;
use frame_benchmarking::v2::*;
use frame_system::RawOrigin;

const SEED: u32 = 0;
Expand Down
2 changes: 2 additions & 0 deletions frame/benchmarking/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ paste = "1.0"
scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
serde = { version = "1.0.136", optional = true }
frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
frame-support-procedural = { version = "4.0.0-dev", default-features = false, path = "../support/procedural" }
frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
sp-api = { version = "4.0.0-dev", default-features = false, path = "../../primitives/api" }
sp-application-crypto = { version = "7.0.0", default-features = false, path = "../../primitives/application-crypto" }
Expand All @@ -29,6 +30,7 @@ sp-runtime = { version = "7.0.0", default-features = false, path = "../../primit
sp-runtime-interface = { version = "7.0.0", default-features = false, path = "../../primitives/runtime-interface" }
sp-std = { version = "5.0.0", default-features = false, path = "../../primitives/std" }
sp-storage = { version = "7.0.0", default-features = false, path = "../../primitives/storage" }
static_assertions = "1.1.0"

[dev-dependencies]
array-bytes = "4.1"
Expand Down
Loading