From 1a3d5f1f96756555ddebd1b898c03464ffffdb25 Mon Sep 17 00:00:00 2001
From: tin-snowflake <cqtin0903@gmail.com>
Date: Mon, 25 Mar 2024 16:52:47 +0700
Subject: [PATCH] Update benchmarking.rs
---
substrate/frame/treasury/src/benchmarking.rs | 74 ++------------------
1 file changed, 7 insertions(+), 67 deletions(-)
diff --git a/substrate/frame/treasury/src/benchmarking.rs b/substrate/frame/treasury/src/benchmarking.rs
index 0b9999e37fb..735e1df7b92 100644
--- a/substrate/frame/treasury/src/benchmarking.rs
+++ b/substrate/frame/treasury/src/benchmarking.rs
@@ -73,12 +73,10 @@ fn setup_proposal<T: Config<I>, I: 'static>(
// Create proposals that are approved for use in `on_initialize`.
fn create_approved_proposals<T: Config<I>, I: 'static>(n: u32) -> Result<(), &'static str> {
+ let origin = T::SpendOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?;
for i in 0..n {
- let (caller, value, lookup) = setup_proposal::<T, I>(i);
- #[allow(deprecated)]
- Treasury::<T, I>::propose_spend(RawOrigin::Signed(caller).into(), value, lookup)?;
- let proposal_id = <ProposalCount<T, I>>::get() - 1;
- Approvals::<T, I>::try_append(proposal_id).unwrap();
+ let (_, value, lookup) = setup_proposal::<T, I>(i);
+ Treasury::<T, I>::spend_local(origin.clone(), value, lookup)?;
}
ensure!(<Approvals<T, I>>::get().len() == n as usize, "Not all approved");
Ok(())
@@ -126,71 +124,13 @@ mod benchmarks {
Ok(())
}
- #[benchmark]
- fn propose_spend() -> Result<(), BenchmarkError> {
- let (caller, value, beneficiary_lookup) = setup_proposal::<T, _>(SEED);
- // Whitelist caller account from further DB operations.
- let caller_key = frame_system::Account::<T>::hashed_key_for(&caller);
- frame_benchmarking::benchmarking::add_to_whitelist(caller_key.into());
-
- #[extrinsic_call]
- _(RawOrigin::Signed(caller), value, beneficiary_lookup);
-
- Ok(())
- }
-
- #[benchmark]
- fn reject_proposal() -> Result<(), BenchmarkError> {
- let (caller, value, beneficiary_lookup) = setup_proposal::<T, _>(SEED);
- #[allow(deprecated)]
- Treasury::<T, _>::propose_spend(
- RawOrigin::Signed(caller).into(),
- value,
- beneficiary_lookup,
- )?;
- let proposal_id = Treasury::<T, _>::proposal_count() - 1;
- let reject_origin =
- T::RejectOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?;
-
- #[extrinsic_call]
- _(reject_origin as T::RuntimeOrigin, proposal_id);
-
- Ok(())
- }
-
- #[benchmark]
- fn approve_proposal(
- p: Linear<0, { T::MaxApprovals::get() - 1 }>,
- ) -> Result<(), BenchmarkError> {
- let approve_origin =
- T::ApproveOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?;
- create_approved_proposals::<T, _>(p)?;
- let (caller, value, beneficiary_lookup) = setup_proposal::<T, _>(SEED);
- #[allow(deprecated)]
- Treasury::<T, _>::propose_spend(
- RawOrigin::Signed(caller).into(),
- value,
- beneficiary_lookup,
- )?;
- let proposal_id = Treasury::<T, _>::proposal_count() - 1;
-
- #[extrinsic_call]
- _(approve_origin as T::RuntimeOrigin, proposal_id);
-
- Ok(())
- }
-
#[benchmark]
fn remove_approval() -> Result<(), BenchmarkError> {
- let (caller, value, beneficiary_lookup) = setup_proposal::<T, _>(SEED);
- #[allow(deprecated)]
- Treasury::<T, _>::propose_spend(
- RawOrigin::Signed(caller).into(),
- value,
- beneficiary_lookup,
- )?;
+ let origin =
+ T::SpendOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?;
+ let (_, value, beneficiary_lookup) = setup_proposal::<T, _>(SEED);
+ Treasury::<T, _>::spend_local(origin, value, beneficiary_lookup)?;
let proposal_id = Treasury::<T, _>::proposal_count() - 1;
- Approvals::<T, _>::try_append(proposal_id).unwrap();
let reject_origin =
T::RejectOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?;
--
GitLab