Skip to content
Snippets Groups Projects

Fix weight accounting

Merged Benjamin Gallois requested to merge 167-fix-remove-member-weight into master
Compare and
21 files
+ 488
148
Compare changes
  • Side-by-side
  • Inline
Files
21
@@ -38,7 +38,7 @@ mod benchmarks {
@@ -38,7 +38,7 @@ mod benchmarks {
fn add_certs<T: Config>(i: u32, receiver: T::IdtyIndex) -> Result<(), &'static str> {
fn add_certs<T: Config>(i: u32, receiver: T::IdtyIndex) -> Result<(), &'static str> {
Pallet::<T>::remove_all_certs_received_by(RawOrigin::Root.into(), receiver)?;
Pallet::<T>::remove_all_certs_received_by(RawOrigin::Root.into(), receiver)?;
for j in 1..i {
for j in 1..i {
Pallet::<T>::do_add_cert_checked(j.into(), receiver, false)?;
let _ = Pallet::<T>::do_add_cert_checked(j.into(), receiver, false);
}
}
assert!(
assert!(
CertsByReceiver::<T>::get(receiver).len() as u32 == i - 1,
CertsByReceiver::<T>::get(receiver).len() as u32 == i - 1,
@@ -47,6 +47,22 @@ mod benchmarks {
@@ -47,6 +47,22 @@ mod benchmarks {
Ok(())
Ok(())
}
}
 
#[benchmark]
 
fn do_add_cert_checked() -> Result<(), BenchmarkError> {
 
let issuer: T::IdtyIndex = 1.into();
 
let receiver: T::IdtyIndex = 2.into();
 
Pallet::<T>::del_cert(RawOrigin::Root.into(), issuer, receiver)?;
 
frame_system::pallet::Pallet::<T>::set_block_number(T::CertPeriod::get());
 
 
#[block]
 
{
 
Pallet::<T>::do_add_cert_checked(issuer, receiver, true);
 
}
 
 
assert_has_event::<T>(Event::<T>::CertAdded { issuer, receiver }.into());
 
Ok(())
 
}
 
#[benchmark]
#[benchmark]
fn add_cert() -> Result<(), BenchmarkError> {
fn add_cert() -> Result<(), BenchmarkError> {
let issuer: T::IdtyIndex = 1.into();
let issuer: T::IdtyIndex = 1.into();
@@ -134,11 +150,11 @@ mod benchmarks {
@@ -134,11 +150,11 @@ mod benchmarks {
}
}
#[benchmark]
#[benchmark]
fn do_remove_cert() -> Result<(), BenchmarkError> {
fn do_remove_cert() {
let issuer: T::IdtyIndex = 1.into();
let issuer: T::IdtyIndex = 1.into();
let receiver: T::IdtyIndex = 0.into();
let receiver: T::IdtyIndex = 0.into();
Pallet::<T>::do_remove_cert(issuer, receiver, None);
Pallet::<T>::do_remove_cert(issuer, receiver, None);
Pallet::<T>::do_add_cert_checked(issuer, receiver, false)?;
let _ = Pallet::<T>::do_add_cert_checked(issuer, receiver, false);
let block_number = T::ValidityPeriod::get();
let block_number = T::ValidityPeriod::get();
frame_system::pallet::Pallet::<T>::set_block_number(block_number);
frame_system::pallet::Pallet::<T>::set_block_number(block_number);
@@ -155,7 +171,6 @@ mod benchmarks {
@@ -155,7 +171,6 @@ mod benchmarks {
}
}
.into(),
.into(),
);
);
Ok(())
}
}
impl_benchmark_test_suite!(
impl_benchmark_test_suite!(
Loading