individual benchmark tests (#4018)

This commit is contained in:
Shawn Tabrizi
2021-10-05 15:53:20 -04:00
committed by GitHub
parent d6d37621b0
commit bc7326383d
10 changed files with 64 additions and 71 deletions
+7 -7
View File
@@ -1708,7 +1708,7 @@ mod benchmarking {
use frame_system::RawOrigin; use frame_system::RawOrigin;
use sp_runtime::{traits::Bounded, SaturatedConversion}; use sp_runtime::{traits::Bounded, SaturatedConversion};
use frame_benchmarking::{account, benchmarks, impl_benchmark_test_suite, whitelisted_caller}; use frame_benchmarking::{account, benchmarks, whitelisted_caller};
fn assert_last_event<T: Config>(generic_event: <T as Config>::Event) { fn assert_last_event<T: Config>(generic_event: <T as Config>::Event) {
let events = frame_system::Pallet::<T>::events(); let events = frame_system::Pallet::<T>::events();
@@ -1883,11 +1883,11 @@ mod benchmarking {
verify { verify {
assert!(AuctionInfo::<T>::get().is_none()); assert!(AuctionInfo::<T>::get().is_none());
} }
}
impl_benchmark_test_suite!( impl_benchmark_test_suite!(
Auctions, Auctions,
crate::integration_tests::new_test_ext(), crate::integration_tests::new_test_ext(),
crate::integration_tests::Test, crate::integration_tests::Test,
); );
}
} }
+1 -6
View File
@@ -1589,13 +1589,8 @@ mod benchmarking {
assert!(super::Pallet::<T>::eth_recover(&signature, &data, extra).is_some()); assert!(super::Pallet::<T>::eth_recover(&signature, &data, extra).is_some());
} }
} }
}
#[cfg(test)] impl_benchmark_test_suite!(
mod tests {
use super::*;
frame_benchmarking::impl_benchmark_test_suite!(
Pallet, Pallet,
crate::claims::tests::new_test_ext(), crate::claims::tests::new_test_ext(),
crate::claims::tests::Test, crate::claims::tests::Test,
+7 -7
View File
@@ -1857,7 +1857,7 @@ mod benchmarking {
use sp_runtime::traits::{Bounded, CheckedSub}; use sp_runtime::traits::{Bounded, CheckedSub};
use sp_std::prelude::*; use sp_std::prelude::*;
use frame_benchmarking::{account, benchmarks, impl_benchmark_test_suite, whitelisted_caller}; use frame_benchmarking::{account, benchmarks, whitelisted_caller};
fn assert_last_event<T: Config>(generic_event: <T as Config>::Event) { fn assert_last_event<T: Config>(generic_event: <T as Config>::Event) {
let events = frame_system::Pallet::<T>::events(); let events = frame_system::Pallet::<T>::events();
@@ -2105,11 +2105,11 @@ mod benchmarking {
assert_eq!(EndingsCount::<T>::get(), old_endings_count + 1); assert_eq!(EndingsCount::<T>::get(), old_endings_count + 1);
assert_last_event::<T>(Event::<T>::HandleBidResult((n - 1).into(), Ok(())).into()); assert_last_event::<T>(Event::<T>::HandleBidResult((n - 1).into(), Ok(())).into());
} }
}
impl_benchmark_test_suite!( impl_benchmark_test_suite!(
Crowdloan, Crowdloan,
crate::integration_tests::new_test_ext_with_offset(10), crate::integration_tests::new_test_ext_with_offset(10),
crate::integration_tests::Test, crate::integration_tests::Test,
); );
}
} }
@@ -1048,7 +1048,7 @@ mod benchmarking {
use runtime_parachains::{paras, shared, Origin as ParaOrigin}; use runtime_parachains::{paras, shared, Origin as ParaOrigin};
use sp_runtime::traits::Bounded; use sp_runtime::traits::Bounded;
use frame_benchmarking::{account, benchmarks, impl_benchmark_test_suite, whitelisted_caller}; use frame_benchmarking::{account, benchmarks, whitelisted_caller};
fn assert_last_event<T: Config>(generic_event: <T as Config>::Event) { fn assert_last_event<T: Config>(generic_event: <T as Config>::Event) {
let events = frame_system::Pallet::<T>::events(); let events = frame_system::Pallet::<T>::events();
@@ -1160,11 +1160,11 @@ mod benchmarking {
assert_eq!(paras::Pallet::<T>::lifecycle(parachain), Some(ParaLifecycle::Parathread)); assert_eq!(paras::Pallet::<T>::lifecycle(parachain), Some(ParaLifecycle::Parathread));
assert_eq!(paras::Pallet::<T>::lifecycle(parathread), Some(ParaLifecycle::Parachain)); assert_eq!(paras::Pallet::<T>::lifecycle(parathread), Some(ParaLifecycle::Parachain));
} }
}
impl_benchmark_test_suite!( impl_benchmark_test_suite!(
Registrar, Registrar,
crate::integration_tests::new_test_ext(), crate::integration_tests::new_test_ext(),
crate::integration_tests::Test, crate::integration_tests::Test,
); );
}
} }
+7 -7
View File
@@ -975,7 +975,7 @@ mod benchmarking {
use frame_system::RawOrigin; use frame_system::RawOrigin;
use sp_runtime::traits::Bounded; use sp_runtime::traits::Bounded;
use frame_benchmarking::{account, benchmarks, impl_benchmark_test_suite, whitelisted_caller}; use frame_benchmarking::{account, benchmarks, whitelisted_caller};
use crate::slots::Pallet as Slots; use crate::slots::Pallet as Slots;
@@ -1112,11 +1112,11 @@ mod benchmarking {
T::Registrar::execute_pending_transitions(); T::Registrar::execute_pending_transitions();
assert!(T::Registrar::is_parachain(para)); assert!(T::Registrar::is_parachain(para));
} }
}
impl_benchmark_test_suite!( impl_benchmark_test_suite!(
Slots, Slots,
crate::integration_tests::new_test_ext(), crate::integration_tests::new_test_ext(),
crate::integration_tests::Test, crate::integration_tests::Test,
); );
}
} }
@@ -15,7 +15,7 @@
// along with Polkadot. If not, see <http://www.gnu.org/licenses/>. // along with Polkadot. If not, see <http://www.gnu.org/licenses/>.
use crate::configuration::*; use crate::configuration::*;
use frame_benchmarking::{benchmarks, impl_benchmark_test_suite, BenchmarkError, BenchmarkResult}; use frame_benchmarking::{benchmarks, BenchmarkError, BenchmarkResult};
use frame_system::RawOrigin; use frame_system::RawOrigin;
use sp_runtime::traits::One; use sp_runtime::traits::One;
@@ -35,10 +35,10 @@ benchmarks! {
} }
set_config_with_balance {}: set_hrmp_sender_deposit(RawOrigin::Root, 100_000_000_000) set_config_with_balance {}: set_hrmp_sender_deposit(RawOrigin::Root, 100_000_000_000)
}
impl_benchmark_test_suite!( impl_benchmark_test_suite!(
Pallet, Pallet,
crate::mock::new_test_ext(Default::default()), crate::mock::new_test_ext(Default::default()),
crate::mock::Test crate::mock::Test
); );
}
@@ -16,7 +16,7 @@
use super::*; use super::*;
use frame_benchmarking::{benchmarks, impl_benchmark_test_suite}; use frame_benchmarking::benchmarks;
use frame_system::RawOrigin; use frame_system::RawOrigin;
use sp_runtime::traits::One; use sp_runtime::traits::One;
@@ -27,10 +27,10 @@ benchmarks! {
verify { verify {
assert!(Frozen::<T>::get().is_none()) assert!(Frozen::<T>::get().is_none())
} }
}
impl_benchmark_test_suite!( impl_benchmark_test_suite!(
Pallet, Pallet,
crate::mock::new_test_ext(Default::default()), crate::mock::new_test_ext(Default::default()),
crate::mock::Test crate::mock::Test
); );
}
@@ -15,7 +15,7 @@
// along with Polkadot. If not, see <http://www.gnu.org/licenses/>. // along with Polkadot. If not, see <http://www.gnu.org/licenses/>.
use super::*; use super::*;
use frame_benchmarking::{benchmarks, impl_benchmark_test_suite}; use frame_benchmarking::benchmarks;
use frame_system::{DigestItemOf, RawOrigin}; use frame_system::{DigestItemOf, RawOrigin};
use primitives::v1::ConsensusLog; use primitives::v1::ConsensusLog;
@@ -35,10 +35,10 @@ benchmarks! {
&<DigestItemOf<T>>::from(ConsensusLog::ForceApprove(d + 1)), &<DigestItemOf<T>>::from(ConsensusLog::ForceApprove(d + 1)),
); );
} }
}
impl_benchmark_test_suite!( impl_benchmark_test_suite!(
Pallet, Pallet,
crate::mock::new_test_ext(Default::default()), crate::mock::new_test_ext(Default::default()),
crate::mock::Test crate::mock::Test
); );
}
@@ -16,7 +16,7 @@
use super::*; use super::*;
use crate::{configuration::HostConfiguration, shared}; use crate::{configuration::HostConfiguration, shared};
use frame_benchmarking::{benchmarks, impl_benchmark_test_suite}; use frame_benchmarking::benchmarks;
use frame_system::RawOrigin; use frame_system::RawOrigin;
use primitives::v1::{HeadData, Id as ParaId, ValidationCode, MAX_CODE_SIZE, MAX_HEAD_DATA_SIZE}; use primitives::v1::{HeadData, Id as ParaId, ValidationCode, MAX_CODE_SIZE, MAX_HEAD_DATA_SIZE};
use sp_runtime::traits::{One, Saturating}; use sp_runtime::traits::{One, Saturating};
@@ -126,10 +126,10 @@ benchmarks! {
let next_session = crate::shared::Pallet::<T>::session_index().saturating_add(One::one()); let next_session = crate::shared::Pallet::<T>::session_index().saturating_add(One::one());
assert_last_event::<T>(Event::ActionQueued(para_id, next_session).into()); assert_last_event::<T>(Event::ActionQueued(para_id, next_session).into());
} }
}
impl_benchmark_test_suite!( impl_benchmark_test_suite!(
Pallet, Pallet,
crate::mock::new_test_ext(Default::default()), crate::mock::new_test_ext(Default::default()),
crate::mock::Test crate::mock::Test
); );
}
@@ -16,9 +16,7 @@
use super::*; use super::*;
use crate::{account_and_location, new_executor, worst_case_holding, AssetTransactorOf, XcmCallOf}; use crate::{account_and_location, new_executor, worst_case_holding, AssetTransactorOf, XcmCallOf};
use frame_benchmarking::{ use frame_benchmarking::{benchmarks_instance_pallet, BenchmarkError, BenchmarkResult};
benchmarks_instance_pallet, impl_benchmark_test_suite, BenchmarkError, BenchmarkResult,
};
use frame_support::{pallet_prelude::Get, traits::fungible::Inspect}; use frame_support::{pallet_prelude::Get, traits::fungible::Inspect};
use sp_runtime::traits::Zero; use sp_runtime::traits::Zero;
use sp_std::{convert::TryInto, prelude::*, vec}; use sp_std::{convert::TryInto, prelude::*, vec};
@@ -210,10 +208,10 @@ benchmarks_instance_pallet! {
assert!(!T::TransactAsset::balance(&checked_account).is_zero()); assert!(!T::TransactAsset::balance(&checked_account).is_zero());
} }
} }
}
impl_benchmark_test_suite!( impl_benchmark_test_suite!(
Pallet, Pallet,
crate::fungible::mock::new_test_ext(), crate::fungible::mock::new_test_ext(),
crate::fungible::mock::Test crate::fungible::mock::Test
); );
}