From 9d36a64c603e54203133cea3d5450577e69ed2c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Mon, 30 Dec 2024 11:34:31 +0100
Subject: [PATCH] pallet-bounties: Fix benchmarks for 0 ED (#7013)
Closes: https://github.com/paritytech/polkadot-sdk/issues/7009
---------
Co-authored-by: command-bot <>
(cherry picked from commit 997db8e2035ce180f502ccb54eb06ab464d95dab)
---
prdoc/pr_7013.prdoc | 7 ++++++
substrate/frame/bounties/src/benchmarking.rs | 24 ++++++++++++--------
substrate/frame/bounties/src/lib.rs | 1 +
3 files changed, 23 insertions(+), 9 deletions(-)
create mode 100644 prdoc/pr_7013.prdoc
diff --git a/prdoc/pr_7013.prdoc b/prdoc/pr_7013.prdoc
new file mode 100644
index 00000000000..138fa7f2310
--- /dev/null
+++ b/prdoc/pr_7013.prdoc
@@ -0,0 +1,7 @@
+title: 'pallet-bounties: Fix benchmarks for 0 ED'
+doc:
+- audience: Runtime Dev
+ description: 'Closes: https://github.com/paritytech/polkadot-sdk/issues/7009'
+crates:
+- name: pallet-bounties
+ bump: patch
diff --git a/substrate/frame/bounties/src/benchmarking.rs b/substrate/frame/bounties/src/benchmarking.rs
index 8ad85d5420e..1370bf1803d 100644
--- a/substrate/frame/bounties/src/benchmarking.rs
+++ b/substrate/frame/bounties/src/benchmarking.rs
@@ -15,9 +15,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-//! bounties pallet benchmarking.
-
-#![cfg(feature = "runtime-benchmarks")]
+//! Bounties pallet benchmarking.
use super::*;
@@ -37,6 +35,16 @@ fn set_block_number<T: Config<I>, I: 'static>(n: BlockNumberFor<T>) {
<T as pallet_treasury::Config<I>>::BlockNumberProvider::set_block_number(n);
}
+fn minimum_balance<T: Config<I>, I: 'static>() -> BalanceOf<T, I> {
+ let minimum_balance = T::Currency::minimum_balance();
+
+ if minimum_balance.is_zero() {
+ 1u32.into()
+ } else {
+ minimum_balance
+ }
+}
+
// Create bounties that are approved for use in `on_initialize`.
fn create_approved_bounties<T: Config<I>, I: 'static>(n: u32) -> Result<(), BenchmarkError> {
for i in 0..n {
@@ -62,12 +70,10 @@ fn setup_bounty<T: Config<I>, I: 'static>(
let fee = value / 2u32.into();
let deposit = T::BountyDepositBase::get() +
T::DataDepositPerByte::get() * T::MaximumReasonLength::get().into();
- let _ = T::Currency::make_free_balance_be(&caller, deposit + T::Currency::minimum_balance());
+ let _ = T::Currency::make_free_balance_be(&caller, deposit + minimum_balance::<T, I>());
let curator = account("curator", u, SEED);
- let _ = T::Currency::make_free_balance_be(
- &curator,
- fee / 2u32.into() + T::Currency::minimum_balance(),
- );
+ let _ =
+ T::Currency::make_free_balance_be(&curator, fee / 2u32.into() + minimum_balance::<T, I>());
let reason = vec![0; d as usize];
(caller, curator, fee, value, reason)
}
@@ -91,7 +97,7 @@ fn create_bounty<T: Config<I>, I: 'static>(
fn setup_pot_account<T: Config<I>, I: 'static>() {
let pot_account = Bounties::<T, I>::account_id();
- let value = T::Currency::minimum_balance().saturating_mul(1_000_000_000u32.into());
+ let value = minimum_balance::<T, I>().saturating_mul(1_000_000_000u32.into());
let _ = T::Currency::make_free_balance_be(&pot_account, value);
}
diff --git a/substrate/frame/bounties/src/lib.rs b/substrate/frame/bounties/src/lib.rs
index 3ed408a1912..c070791826b 100644
--- a/substrate/frame/bounties/src/lib.rs
+++ b/substrate/frame/bounties/src/lib.rs
@@ -84,6 +84,7 @@
#![cfg_attr(not(feature = "std"), no_std)]
+#[cfg(feature = "runtime-benchmarks")]
mod benchmarking;
pub mod migrations;
mod tests;
--
GitLab