Skip to content
Snippets Groups Projects

Fix weight accounting

Merged Benjamin Gallois requested to merge 167-fix-remove-member-weight into master
3 files
+ 19
16
Compare changes
  • Side-by-side
  • Inline
Files
3
@@ -38,7 +38,7 @@ mod benchmarks {
fn add_certs<T: Config>(i: u32, receiver: T::IdtyIndex) -> Result<(), &'static str> {
Pallet::<T>::remove_all_certs_received_by(RawOrigin::Root.into(), receiver)?;
for j in 1..i {
Pallet::<T>::do_add_cert_checked(j.into(), receiver, false);
Pallet::<T>::do_add_cert_checked(j.into(), receiver, false)?;
}
assert!(
CertsByReceiver::<T>::get(receiver).len() as u32 == i - 1,
@@ -56,7 +56,7 @@ mod benchmarks {
#[block]
{
Pallet::<T>::do_add_cert_checked(issuer, receiver, true);
Pallet::<T>::do_add_cert_checked(issuer, receiver, true)?;
}
assert_has_event::<T>(Event::<T>::CertAdded { issuer, receiver }.into());
@@ -98,12 +98,12 @@ mod benchmarks {
}
#[benchmark]
fn del_cert() -> Result<(), BenchmarkError> {
fn del_cert() {
let issuer: T::IdtyIndex = 1.into();
let receiver: T::IdtyIndex = 2.into();
// try to add cert if missing, else ignore
// this depends on initial data
Pallet::<T>::do_add_cert_checked(issuer, receiver, false);
let _ = Pallet::<T>::do_add_cert_checked(issuer, receiver, false);
#[extrinsic_call]
_(RawOrigin::Root, issuer, receiver);
@@ -116,7 +116,6 @@ mod benchmarks {
}
.into(),
);
Ok(())
}
#[benchmark]
@@ -150,11 +149,11 @@ mod benchmarks {
}
#[benchmark]
fn do_remove_cert() {
fn do_remove_cert() -> Result<(), BenchmarkError> {
let issuer: T::IdtyIndex = 1.into();
let receiver: T::IdtyIndex = 0.into();
Pallet::<T>::do_remove_cert(issuer, receiver, None);
Pallet::<T>::do_add_cert_checked(issuer, receiver, false);
Pallet::<T>::do_add_cert_checked(issuer, receiver, false)?;
let block_number = T::ValidityPeriod::get();
frame_system::pallet::Pallet::<T>::set_block_number(block_number);
@@ -171,6 +170,7 @@ mod benchmarks {
}
.into(),
);
Ok(())
}
impl_benchmark_test_suite!(
Loading