Skip to content

Commit 322a251

Browse files
author
DavidK
committed
Add Consideration::ensure_successful calls to benchmarks
1 parent 0332ab4 commit 322a251

File tree

1 file changed

+19
-1
lines changed

1 file changed

+19
-1
lines changed

substrate/frame/proxy/src/benchmarking.rs

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@ fn add_proxies<T: Config>(n: u32, maybe_who: Option<T::AccountId>) -> Result<(),
4343
BlockNumberFor::<T>::zero(),
4444
)?;
4545
}
46+
T::ProxyConsideration::ensure_successful(
47+
&caller,
48+
Footprint::from_mel::<(ProxiesVec<T>, ProxyTicketOf<T>)>(),
49+
);
4650
Ok(())
4751
}
4852

@@ -63,6 +67,10 @@ fn add_announcements<T: Config>(
6367
T::ProxyType::default(),
6468
BlockNumberFor::<T>::zero(),
6569
)?;
70+
T::ProxyConsideration::ensure_successful(
71+
&real,
72+
Footprint::from_mel::<(ProxiesVec<T>, ProxyTicketOf<T>)>(),
73+
);
6674
real
6775
};
6876
let real_lookup = T::Lookup::unlookup(real);
@@ -73,6 +81,10 @@ fn add_announcements<T: Config>(
7381
T::CallHasher::hash_of(&("add_announcement", n)),
7482
)?;
7583
}
84+
T::AnnouncementConsideration::ensure_successful(
85+
&caller,
86+
Footprint::from_mel::<(AnnouncementsVec<T>, AnnouncementTicketOf<T>)>(),
87+
);
7688
Ok(())
7789
}
7890

@@ -108,6 +120,7 @@ benchmarks! {
108120
real_lookup.clone(),
109121
T::CallHasher::hash_of(&call),
110122
)?;
123+
T::AnnouncementConsideration::ensure_successful(&delegate, Footprint::from_mel::<(AnnouncementsVec<T>, AnnouncementTicketOf<T>)>());
111124
add_announcements::<T>(a, Some(delegate.clone()), None)?;
112125
}: _(RawOrigin::Signed(caller), delegate_lookup, real_lookup, Some(T::ProxyType::default()), Box::new(call))
113126
verify {
@@ -128,6 +141,7 @@ benchmarks! {
128141
real_lookup.clone(),
129142
T::CallHasher::hash_of(&call),
130143
)?;
144+
T::AnnouncementConsideration::ensure_successful(&caller, Footprint::from_mel::<(AnnouncementsVec<T>, AnnouncementTicketOf<T>)>());
131145
add_announcements::<T>(a, Some(caller.clone()), None)?;
132146
}: _(RawOrigin::Signed(caller.clone()), real_lookup, T::CallHasher::hash_of(&call))
133147
verify {
@@ -150,6 +164,7 @@ benchmarks! {
150164
real_lookup,
151165
T::CallHasher::hash_of(&call),
152166
)?;
167+
T::AnnouncementConsideration::ensure_successful(&caller, Footprint::from_mel::<(AnnouncementsVec<T>, AnnouncementTicketOf<T>)>());
153168
add_announcements::<T>(a, Some(caller.clone()), None)?;
154169
}: _(RawOrigin::Signed(real), caller_lookup, T::CallHasher::hash_of(&call))
155170
verify {
@@ -177,6 +192,7 @@ benchmarks! {
177192
let p in 1 .. (T::MaxProxies::get() - 1) => add_proxies::<T>(p, None)?;
178193
let caller: T::AccountId = whitelisted_caller();
179194
let real = T::Lookup::unlookup(account("target", T::MaxProxies::get(), SEED));
195+
T::ProxyConsideration::ensure_successful(&caller, Footprint::from_mel::<(ProxiesVec<T>, ProxyTicketOf<T>)>());
180196
}: _(
181197
RawOrigin::Signed(caller.clone()),
182198
real,
@@ -215,6 +231,7 @@ benchmarks! {
215231
create_pure {
216232
let p in 1 .. (T::MaxProxies::get() - 1) => add_proxies::<T>(p, None)?;
217233
let caller: T::AccountId = whitelisted_caller();
234+
T::ProxyConsideration::ensure_successful(&caller, Footprint::from_mel::<(ProxiesVec<T>, ProxyTicketOf<T>)>());
218235
}: _(
219236
RawOrigin::Signed(caller.clone()),
220237
T::ProxyType::default(),
@@ -237,11 +254,12 @@ benchmarks! {
237254
let caller: T::AccountId = whitelisted_caller();
238255
let caller_lookup = T::Lookup::unlookup(caller.clone());
239256
Pallet::<T>::create_pure(
240-
RawOrigin::Signed(whitelisted_caller()).into(),
257+
RawOrigin::Signed(caller.clone()).into(),
241258
T::ProxyType::default(),
242259
BlockNumberFor::<T>::zero(),
243260
0
244261
)?;
262+
T::ProxyConsideration::ensure_successful(&caller, Footprint::from_mel::<(ProxiesVec<T>, ProxyTicketOf<T>)>());
245263
let height = system::Pallet::<T>::block_number();
246264
let ext_index = system::Pallet::<T>::extrinsic_index().unwrap_or(0);
247265
let pure_account = Pallet::<T>::pure_account(&caller, &T::ProxyType::default(), 0, None);

0 commit comments

Comments
 (0)