From 9f35731596af76176e15ffc85d913b4fdc7121d7 Mon Sep 17 00:00:00 2001
From: "paritytech-cmd-bot-polkadot-sdk[bot]"
<179002856+paritytech-cmd-bot-polkadot-sdk[bot]@users.noreply.github.com>
Date: Tue, 14 Jan 2025 17:21:35 +0100
Subject: [PATCH] [stable2409] Backport #7013 (#7016)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Backport #7013 into `stable2409` from bkchr.
See the
[documentation](https://github.com/paritytech/polkadot-sdk/blob/master/docs/BACKPORT.md)
on how to use this bot.
<!--
# To be used by other automation, do not modify:
original-pr-number: #${pull_number}
-->
---------
Co-authored-by: Bastian Köcher <git@kchr.de>
Co-authored-by: EgorPopelyaev <egor@parity.io>
---
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 0000000000000..138fa7f231022
--- /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 de93ba5c4ce7a..250bf53999ad1 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::*;
@@ -33,6 +31,16 @@ use pallet_treasury::Pallet as Treasury;
const SEED: u32 = 0;
+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 {
@@ -58,12 +66,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)
}
@@ -86,7 +92,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 7b89a6e3e76f5..f392f457772d4 100644
--- a/substrate/frame/bounties/src/lib.rs
+++ b/substrate/frame/bounties/src/lib.rs
@@ -82,6 +82,7 @@
#![cfg_attr(not(feature = "std"), no_std)]
+#[cfg(feature = "runtime-benchmarks")]
mod benchmarking;
pub mod migrations;
mod tests;