pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-05-31 21:31:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix some broken benchmarks (#6528)

Browse Source
This commit is contained in:
Shawn Tabrizi
2020-06-28 19:53:58 +02:00
committed by GitHub
parent 505540a2a0
commit f1bd59c6a9
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/frame/democracy/src/benchmarking.rs
+3 -3
View File
@@ -74,13 +74,13 @@ fn add_referendum<T: Trait>(n: u32) -> Result<ReferendumIndex, &'static str> {
0.into(), 0.into(),
); );
let referendum_index: ReferendumIndex = ReferendumCount::get() - 1; let referendum_index: ReferendumIndex = ReferendumCount::get() - 1;
let _ = T::Scheduler::schedule_named( T::Scheduler::schedule_named(
(DEMOCRACY_ID, referendum_index).encode(), (DEMOCRACY_ID, referendum_index).encode(),
0.into(), 1.into(),
None, None,
63, 63,
Call::enact_proposal(proposal_hash, referendum_index).into(), Call::enact_proposal(proposal_hash, referendum_index).into(),
); ).map_err(|_| "failed to schedule named")?;
Ok(referendum_index) Ok(referendum_index)
} }
substrate/frame/multisig/src/benchmarking.rs
+2 -3
View File
@@ -22,7 +22,7 @@
use super::*; use super::*;
use frame_system::RawOrigin; use frame_system::RawOrigin;
use frame_benchmarking::{benchmarks, account}; use frame_benchmarking::{benchmarks, account};
use sp_runtime::traits::{Bounded, Saturating}; use sp_runtime::traits::Bounded;
use core::convert::TryInto; use core::convert::TryInto;
use crate::Module as Multisig; use crate::Module as Multisig;
@@ -36,8 +36,7 @@ fn setup_multi<T: Trait>(s: u32, z: u32)
for i in 0 .. s { for i in 0 .. s {
let signatory = account("signatory", i, SEED); let signatory = account("signatory", i, SEED);
// Give them some balance for a possible deposit // Give them some balance for a possible deposit
let deposit = T::DepositBase::get() + T::DepositFactor::get() * s.into(); let balance = BalanceOf::<T>::max_value();
let balance = T::Currency::minimum_balance().saturating_mul(100.into()) + deposit;
T::Currency::make_free_balance_be(&signatory, balance); T::Currency::make_free_balance_be(&signatory, balance);
signatories.push(signatory); signatories.push(signatory);
} }
substrate/frame/scheduler/src/benchmarking.rs
+7 -6
View File
@@ -29,6 +29,7 @@ use crate::Module as Scheduler;
use frame_system::Module as System; use frame_system::Module as System;
const MAX_SCHEDULED: u32 = 50; const MAX_SCHEDULED: u32 = 50;
const BLOCK_NUMBER: u32 = 2;
// Add `n` named items to the schedule // Add `n` named items to the schedule
fn fill_schedule<T: Trait> (when: T::BlockNumber, n: u32) -> Result<(), &'static str> { fn fill_schedule<T: Trait> (when: T::BlockNumber, n: u32) -> Result<(), &'static str> {
@@ -55,7 +56,7 @@ benchmarks! {
schedule { schedule {
let s in 0 .. MAX_SCHEDULED; let s in 0 .. MAX_SCHEDULED;
let when = T::BlockNumber::one(); let when = BLOCK_NUMBER.into();
let periodic = Some((T::BlockNumber::one(), 100)); let periodic = Some((T::BlockNumber::one(), 100));
let priority = 0; let priority = 0;
// Essentially a no-op call. // Essentially a no-op call.
@@ -72,7 +73,7 @@ benchmarks! {
cancel { cancel {
let s in 1 .. MAX_SCHEDULED; let s in 1 .. MAX_SCHEDULED;
let when: T::BlockNumber = 2.into(); let when = BLOCK_NUMBER.into();
fill_schedule::<T>(when, s)?; fill_schedule::<T>(when, s)?;
assert_eq!(Agenda::<T>::get(when).len(), s as usize); assert_eq!(Agenda::<T>::get(when).len(), s as usize);
@@ -92,7 +93,7 @@ benchmarks! {
schedule_named { schedule_named {
let s in 0 .. MAX_SCHEDULED; let s in 0 .. MAX_SCHEDULED;
let id = s.encode(); let id = s.encode();
let when = T::BlockNumber::one(); let when = BLOCK_NUMBER.into();
let periodic = Some((T::BlockNumber::one(), 100)); let periodic = Some((T::BlockNumber::one(), 100));
let priority = 0; let priority = 0;
// Essentially a no-op call. // Essentially a no-op call.
@@ -109,7 +110,7 @@ benchmarks! {
cancel_named { cancel_named {
let s in 1 .. MAX_SCHEDULED; let s in 1 .. MAX_SCHEDULED;
let when = T::BlockNumber::one(); let when = BLOCK_NUMBER.into();
fill_schedule::<T>(when, s)?; fill_schedule::<T>(when, s)?;
}: _(RawOrigin::Root, 0.encode()) }: _(RawOrigin::Root, 0.encode())
@@ -127,9 +128,9 @@ benchmarks! {
on_initialize { on_initialize {
let s in 0 .. MAX_SCHEDULED; let s in 0 .. MAX_SCHEDULED;
let when = T::BlockNumber::one(); let when = BLOCK_NUMBER.into();
fill_schedule::<T>(when, s)?; fill_schedule::<T>(when, s)?;
}: { Scheduler::<T>::on_initialize(T::BlockNumber::one()); } }: { Scheduler::<T>::on_initialize(BLOCK_NUMBER.into()); }
verify { verify {
assert_eq!(System::<T>::event_count(), s); assert_eq!(System::<T>::event_count(), s);
// Next block should have all the schedules again // Next block should have all the schedules again