pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-07-22 20:45:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Collective: Benchmark with greater MaxProposals (#12454)

Browse Source 
* Collective: Benchmark with greated

* fix

* remove bs

* id_to_remark_data

* fix

* remove hardcoded

* clean up

* simplify

* questionable renaming

* better variable name

* better solution

* no need for large length

* better solution

* Update frame/collective/src/benchmarking.rs

Co-authored-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* fix

* test

* remove test

Co-authored-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
This commit is contained in:
Sergej Sakac
2022-11-14 23:34:30 +01:00
committed by GitHub
parent e649108464
commit 8d3548df1c
2 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/frame/collective/src/benchmarking.rs
+20 -22
View File
@@ -34,6 +34,10 @@ fn assert_last_event<T: Config<I>, I: 'static>(generic_event: <T as Config<I>>::
frame_system::Pallet::<T>::assert_last_event(generic_event.into()); frame_system::Pallet::<T>::assert_last_event(generic_event.into());
} }
fn id_to_remark_data(id: u32, length: usize) -> Vec<u8> {
id.to_le_bytes().into_iter().cycle().take(length).collect()
}
benchmarks_instance_pallet! { benchmarks_instance_pallet! {
set_members { set_members {
let m in 0 .. T::MaxMembers::get(); let m in 0 .. T::MaxMembers::get();
@@ -64,9 +68,7 @@ benchmarks_instance_pallet! {
let length = 100; let length = 100;
for i in 0 .. p { for i in 0 .. p {
// Proposals should be different so that different proposal hashes are generated // Proposals should be different so that different proposal hashes are generated
let proposal: T::Proposal = SystemCall::<T>::remark { let proposal: T::Proposal = SystemCall::<T>::remark { remark: id_to_remark_data(i, length) }.into();
remark: vec![i as u8; length]
}.into();
Collective::<T, I>::propose( Collective::<T, I>::propose(
SystemOrigin::Signed(old_members.last().unwrap().clone()).into(), SystemOrigin::Signed(old_members.last().unwrap().clone()).into(),
threshold, threshold,
@@ -105,7 +107,7 @@ benchmarks_instance_pallet! {
} }
execute { execute {
let b in 1 .. MAX_BYTES; let b in 2 .. MAX_BYTES;
let m in 1 .. T::MaxMembers::get(); let m in 1 .. T::MaxMembers::get();
let bytes_in_storage = b + size_of::<u32>() as u32; let bytes_in_storage = b + size_of::<u32>() as u32;
@@ -122,7 +124,7 @@ benchmarks_instance_pallet! {
Collective::<T, I>::set_members(SystemOrigin::Root.into(), members, None, T::MaxMembers::get())?; Collective::<T, I>::set_members(SystemOrigin::Root.into(), members, None, T::MaxMembers::get())?;
let proposal: T::Proposal = SystemCall::<T>::remark { remark: vec![1; b as usize] }.into(); let proposal: T::Proposal = SystemCall::<T>::remark { remark: id_to_remark_data(1, b as usize) }.into();
}: _(SystemOrigin::Signed(caller), Box::new(proposal.clone()), bytes_in_storage) }: _(SystemOrigin::Signed(caller), Box::new(proposal.clone()), bytes_in_storage)
verify { verify {
@@ -135,7 +137,7 @@ benchmarks_instance_pallet! {
// This tests when execution would happen immediately after proposal // This tests when execution would happen immediately after proposal
propose_execute { propose_execute {
let b in 1 .. MAX_BYTES; let b in 2 .. MAX_BYTES;
let m in 1 .. T::MaxMembers::get(); let m in 1 .. T::MaxMembers::get();
let bytes_in_storage = b + size_of::<u32>() as u32; let bytes_in_storage = b + size_of::<u32>() as u32;
@@ -152,7 +154,7 @@ benchmarks_instance_pallet! {
Collective::<T, I>::set_members(SystemOrigin::Root.into(), members, None, T::MaxMembers::get())?; Collective::<T, I>::set_members(SystemOrigin::Root.into(), members, None, T::MaxMembers::get())?;
let proposal: T::Proposal = SystemCall::<T>::remark { remark: vec![1; b as usize] }.into(); let proposal: T::Proposal = SystemCall::<T>::remark { remark: id_to_remark_data(1, b as usize) }.into();
let threshold = 1; let threshold = 1;
}: propose(SystemOrigin::Signed(caller), threshold, Box::new(proposal.clone()), bytes_in_storage) }: propose(SystemOrigin::Signed(caller), threshold, Box::new(proposal.clone()), bytes_in_storage)
@@ -166,7 +168,7 @@ benchmarks_instance_pallet! {
// This tests when proposal is created and queued as "proposed" // This tests when proposal is created and queued as "proposed"
propose_proposed { propose_proposed {
let b in 1 .. MAX_BYTES; let b in 2 .. MAX_BYTES;
let m in 2 .. T::MaxMembers::get(); let m in 2 .. T::MaxMembers::get();
let p in 1 .. T::MaxProposals::get(); let p in 1 .. T::MaxProposals::get();
@@ -186,7 +188,7 @@ benchmarks_instance_pallet! {
// Add previous proposals. // Add previous proposals.
for i in 0 .. p - 1 { for i in 0 .. p - 1 {
// Proposals should be different so that different proposal hashes are generated // Proposals should be different so that different proposal hashes are generated
let proposal: T::Proposal = SystemCall::<T>::remark { remark: vec![i as u8; b as usize] }.into(); let proposal: T::Proposal = SystemCall::<T>::remark { remark: id_to_remark_data(i, b as usize) }.into();
Collective::<T, I>::propose( Collective::<T, I>::propose(
SystemOrigin::Signed(caller.clone()).into(), SystemOrigin::Signed(caller.clone()).into(),
threshold, threshold,
@@ -197,7 +199,7 @@ benchmarks_instance_pallet! {
assert_eq!(Collective::<T, I>::proposals().len(), (p - 1) as usize); assert_eq!(Collective::<T, I>::proposals().len(), (p - 1) as usize);
let proposal: T::Proposal = SystemCall::<T>::remark { remark: vec![p as u8; b as usize] }.into(); let proposal: T::Proposal = SystemCall::<T>::remark { remark: id_to_remark_data(p, b as usize) }.into();
}: propose(SystemOrigin::Signed(caller.clone()), threshold, Box::new(proposal.clone()), bytes_in_storage) }: propose(SystemOrigin::Signed(caller.clone()), threshold, Box::new(proposal.clone()), bytes_in_storage)
verify { verify {
@@ -234,7 +236,7 @@ benchmarks_instance_pallet! {
let mut last_hash = T::Hash::default(); let mut last_hash = T::Hash::default();
for i in 0 .. p { for i in 0 .. p {
// Proposals should be different so that different proposal hashes are generated // Proposals should be different so that different proposal hashes are generated
let proposal: T::Proposal = SystemCall::<T>::remark { remark: vec![i as u8; b as usize] }.into(); let proposal: T::Proposal = SystemCall::<T>::remark { remark: id_to_remark_data(i, b as usize) }.into();
Collective::<T, I>::propose( Collective::<T, I>::propose(
SystemOrigin::Signed(proposer.clone()).into(), SystemOrigin::Signed(proposer.clone()).into(),
threshold, threshold,
@@ -309,9 +311,7 @@ benchmarks_instance_pallet! {
let mut last_hash = T::Hash::default(); let mut last_hash = T::Hash::default();
for i in 0 .. p { for i in 0 .. p {
// Proposals should be different so that different proposal hashes are generated // Proposals should be different so that different proposal hashes are generated
let proposal: T::Proposal = SystemCall::<T>::remark { let proposal: T::Proposal = SystemCall::<T>::remark { remark: id_to_remark_data(i, bytes as usize) }.into();
remark: vec![i as u8; bytes as usize]
}.into();
Collective::<T, I>::propose( Collective::<T, I>::propose(
SystemOrigin::Signed(proposer.clone()).into(), SystemOrigin::Signed(proposer.clone()).into(),
threshold, threshold,
@@ -364,7 +364,7 @@ benchmarks_instance_pallet! {
} }
close_early_approved { close_early_approved {
let b in 1 .. MAX_BYTES; let b in 2 .. MAX_BYTES;
// We choose 4 as a minimum so we always trigger a vote in the voting loop (`for j in ...`) // We choose 4 as a minimum so we always trigger a vote in the voting loop (`for j in ...`)
let m in 4 .. T::MaxMembers::get(); let m in 4 .. T::MaxMembers::get();
let p in 1 .. T::MaxProposals::get(); let p in 1 .. T::MaxProposals::get();
@@ -388,7 +388,7 @@ benchmarks_instance_pallet! {
let mut last_hash = T::Hash::default(); let mut last_hash = T::Hash::default();
for i in 0 .. p { for i in 0 .. p {
// Proposals should be different so that different proposal hashes are generated // Proposals should be different so that different proposal hashes are generated
let proposal: T::Proposal = SystemCall::<T>::remark { remark: vec![i as u8; b as usize] }.into(); let proposal: T::Proposal = SystemCall::<T>::remark { remark: id_to_remark_data(i, b as usize) }.into();
Collective::<T, I>::propose( Collective::<T, I>::propose(
SystemOrigin::Signed(caller.clone()).into(), SystemOrigin::Signed(caller.clone()).into(),
threshold, threshold,
@@ -474,9 +474,7 @@ benchmarks_instance_pallet! {
let mut last_hash = T::Hash::default(); let mut last_hash = T::Hash::default();
for i in 0 .. p { for i in 0 .. p {
// Proposals should be different so that different proposal hashes are generated // Proposals should be different so that different proposal hashes are generated
let proposal: T::Proposal = SystemCall::<T>::remark { let proposal: T::Proposal = SystemCall::<T>::remark { remark: id_to_remark_data(i, bytes as usize) }.into();
remark: vec![i as u8; bytes as usize]
}.into();
Collective::<T, I>::propose( Collective::<T, I>::propose(
SystemOrigin::Signed(caller.clone()).into(), SystemOrigin::Signed(caller.clone()).into(),
threshold, threshold,
@@ -529,7 +527,7 @@ benchmarks_instance_pallet! {
} }
close_approved { close_approved {
let b in 1 .. MAX_BYTES; let b in 2 .. MAX_BYTES;
// We choose 4 as a minimum so we always trigger a vote in the voting loop (`for j in ...`) // We choose 4 as a minimum so we always trigger a vote in the voting loop (`for j in ...`)
let m in 4 .. T::MaxMembers::get(); let m in 4 .. T::MaxMembers::get();
let p in 1 .. T::MaxProposals::get(); let p in 1 .. T::MaxProposals::get();
@@ -558,7 +556,7 @@ benchmarks_instance_pallet! {
let mut last_hash = T::Hash::default(); let mut last_hash = T::Hash::default();
for i in 0 .. p { for i in 0 .. p {
// Proposals should be different so that different proposal hashes are generated // Proposals should be different so that different proposal hashes are generated
let proposal: T::Proposal = SystemCall::<T>::remark { remark: vec![i as u8; b as usize] }.into(); let proposal: T::Proposal = SystemCall::<T>::remark { remark: id_to_remark_data(i, b as usize) }.into();
Collective::<T, I>::propose( Collective::<T, I>::propose(
SystemOrigin::Signed(caller.clone()).into(), SystemOrigin::Signed(caller.clone()).into(),
threshold, threshold,
@@ -629,7 +627,7 @@ benchmarks_instance_pallet! {
let mut last_hash = T::Hash::default(); let mut last_hash = T::Hash::default();
for i in 0 .. p { for i in 0 .. p {
// Proposals should be different so that different proposal hashes are generated // Proposals should be different so that different proposal hashes are generated
let proposal: T::Proposal = SystemCall::<T>::remark { remark: vec![i as u8; b as usize] }.into(); let proposal: T::Proposal = SystemCall::<T>::remark { remark: id_to_remark_data(i, b as usize) }.into();
Collective::<T, I>::propose( Collective::<T, I>::propose(
SystemOrigin::Signed(caller.clone()).into(), SystemOrigin::Signed(caller.clone()).into(),
threshold, threshold,
substrate/frame/collective/src/tests.rs
+1 -1
View File
@@ -89,7 +89,7 @@ pub type MaxMembers = ConstU32<100>;
parameter_types! { parameter_types! {
pub const MotionDuration: u64 = 3; pub const MotionDuration: u64 = 3;
pub const MaxProposals: u32 = 100; pub const MaxProposals: u32 = 257;
pub BlockWeights: frame_system::limits::BlockWeights = pub BlockWeights: frame_system::limits::BlockWeights =
frame_system::limits::BlockWeights::simple_max(frame_support::weights::Weight::from_ref_time(1024)); frame_system::limits::BlockWeights::simple_max(frame_support::weights::Weight::from_ref_time(1024));
} }