From a5178eab9f8509783913dec425755d777c8b09e6 Mon Sep 17 00:00:00 2001
From: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
Date: Thu, 2 Feb 2023 18:47:50 +0100
Subject: [PATCH] benchmarks: EnsureRankedMember must add ranked members
(#13297)
Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
---
substrate/frame/ranked-collective/src/lib.rs | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/substrate/frame/ranked-collective/src/lib.rs b/substrate/frame/ranked-collective/src/lib.rs
index 84be1243c8a..a65d184d6bf 100644
--- a/substrate/frame/ranked-collective/src/lib.rs
+++ b/substrate/frame/ranked-collective/src/lib.rs
@@ -256,8 +256,7 @@ impl<T: Config<I>, I: 'static, const MIN_RANK: u16> EnsureOrigin<T::RuntimeOrigi
#[cfg(feature = "runtime-benchmarks")]
fn try_successful_origin() -> Result<T::RuntimeOrigin, ()> {
- let who = IndexToId::<T, I>::get(MIN_RANK, 0).ok_or(())?;
- Ok(frame_system::RawOrigin::Signed(who).into())
+ EnsureRankedMember::<T, I, MIN_RANK>::try_successful_origin()
}
}
@@ -279,8 +278,7 @@ impl<T: Config<I>, I: 'static, const MIN_RANK: u16> EnsureOrigin<T::RuntimeOrigi
#[cfg(feature = "runtime-benchmarks")]
fn try_successful_origin() -> Result<T::RuntimeOrigin, ()> {
- let who = IndexToId::<T, I>::get(MIN_RANK, 0).ok_or(())?;
- Ok(frame_system::RawOrigin::Signed(who).into())
+ EnsureRankedMember::<T, I, MIN_RANK>::try_successful_origin()
}
}
@@ -302,7 +300,9 @@ impl<T: Config<I>, I: 'static, const MIN_RANK: u16> EnsureOrigin<T::RuntimeOrigi
#[cfg(feature = "runtime-benchmarks")]
fn try_successful_origin() -> Result<T::RuntimeOrigin, ()> {
- let who = IndexToId::<T, I>::get(MIN_RANK, 0).ok_or(())?;
+ let who = frame_benchmarking::account::<T::AccountId>("successful_origin", 0, 0);
+ crate::Pallet::<T, I>::do_add_member_to_rank(who.clone(), MIN_RANK)
+ .expect("Could not add members for benchmarks");
Ok(frame_system::RawOrigin::Signed(who).into())
}
}
--
GitLab