diff --git a/pallets/certification/src/benchmarking.rs b/pallets/certification/src/benchmarking.rs index 1109f97a30fcc08d4c6d05a116ebe70afa4f0881..7084dc11df8e9c979532c77bf63c282838110632 100644 --- a/pallets/certification/src/benchmarking.rs +++ b/pallets/certification/src/benchmarking.rs @@ -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 { - let _ = 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, @@ -103,7 +103,7 @@ mod benchmarks { let receiver: T::IdtyIndex = 2.into(); // try to add cert if missing, else ignore // this depends on initial data - let _ = Pallet::<T>::do_add_cert_checked(issuer, receiver, false); + Pallet::<T>::do_add_cert_checked(issuer, receiver, false); #[extrinsic_call] _(RawOrigin::Root, issuer, receiver); @@ -154,7 +154,7 @@ mod benchmarks { let issuer: T::IdtyIndex = 1.into(); let receiver: T::IdtyIndex = 0.into(); Pallet::<T>::do_remove_cert(issuer, receiver, None); - let _ = 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); diff --git a/pallets/certification/src/lib.rs b/pallets/certification/src/lib.rs index 0f237cb51f16a0089620fd0a6c5678072d1a2975..56bf87f5ea301b9878f650179baf0e10ee2bd39e 100644 --- a/pallets/certification/src/lib.rs +++ b/pallets/certification/src/lib.rs @@ -360,21 +360,19 @@ pub mod pallet { issuer: T::IdtyIndex, receiver: T::IdtyIndex, verify_rules: bool, - ) -> Weight { + ) { let block_number = frame_system::pallet::Pallet::<T>::block_number(); if verify_rules { // only verify internal rules if asked if let Err(e) = Self::check_add_cert_internal(issuer, receiver, block_number) { sp_std::if_std! {println!("fail to force add cert: {:?}", e)} - return T::WeightInfo::do_add_cert_checked(); } } if let Err(e) = Self::try_add_cert(block_number, issuer, receiver) { sp_std::if_std! {println!("fail to force add cert: {:?}", e)} } - T::WeightInfo::do_add_cert_checked() } /// perform cert addition if not existing, else CertAlreadyExists diff --git a/pallets/duniter-wot/src/lib.rs b/pallets/duniter-wot/src/lib.rs index a3076f124d7442c98d04ca0233a8c57f64f236e2..4ff1bfce967a96adf41e485db0da43e89523d549 100644 --- a/pallets/duniter-wot/src/lib.rs +++ b/pallets/duniter-wot/src/lib.rs @@ -222,15 +222,9 @@ where // implement identity event handler impl<T: Config> pallet_identity::traits::OnNewIdty<T> for Pallet<T> { - fn on_created(idty_index: &IdtyIndex, creator: &IdtyIndex) -> Weight { - let mut weight = Weight::zero(); + fn on_created(idty_index: &IdtyIndex, creator: &IdtyIndex) { // identity just has been created, a cert must be added - weight = weight.saturating_add(<pallet_certification::Pallet<T>>::do_add_cert_checked( - *creator, - *idty_index, - true, - )); - weight + <pallet_certification::Pallet<T>>::do_add_cert_checked(*creator, *idty_index, true); } } diff --git a/pallets/identity/src/traits.rs b/pallets/identity/src/traits.rs index ed8abc16a6a84bafaa3e23ef351cea4c00cfe8bd..65679ca7d804160b502475cb5faf25391b595d10 100644 --- a/pallets/identity/src/traits.rs +++ b/pallets/identity/src/traits.rs @@ -36,7 +36,7 @@ pub trait IdtyNameValidator { } pub trait OnNewIdty<T: Config> { - fn on_created(idty_index: &T::IdtyIndex, creator: &T::IdtyIndex) -> Weight; + fn on_created(idty_index: &T::IdtyIndex, creator: &T::IdtyIndex); } pub trait OnRemoveIdty<T: Config> { @@ -47,10 +47,8 @@ pub trait OnRemoveIdty<T: Config> { #[impl_for_tuples(5)] #[allow(clippy::let_and_return)] impl<T: Config> OnNewIdty<T> for Tuple { - fn on_created(idty_index: &T::IdtyIndex, creator: &T::IdtyIndex) -> Weight { - let mut weight = Weight::zero(); - for_tuples!( #( weight = weight.saturating_add(Tuple::on_created(idty_index, creator)); )* ); - weight + fn on_created(idty_index: &T::IdtyIndex, creator: &T::IdtyIndex) { + for_tuples!( #( Tuple::on_created(idty_index, creator); )* ); } } diff --git a/pallets/quota/src/lib.rs b/pallets/quota/src/lib.rs index 398f67aad1b52e46dd6e67e822899ed79fe48096..85d0a35e2a819a841f413e6d915f1a7337d8f139 100644 --- a/pallets/quota/src/lib.rs +++ b/pallets/quota/src/lib.rs @@ -339,12 +339,7 @@ fn is_eligible_for_refund<T: pallet_identity::Config>(_identity: IdtyId<T>) -> b // implement identity event handler impl<T: Config> pallet_identity::traits::OnNewIdty<T> for Pallet<T> { - fn on_created(idty_index: &IdtyId<T>, _creator: &T::IdtyIndex) -> Weight { - let mut weight = Weight::zero(); - let mut add_db_reads_writes = |reads, writes| { - weight = weight.saturating_add(T::DbWeight::get().reads_writes(reads, writes)); - }; - + fn on_created(idty_index: &IdtyId<T>, _creator: &T::IdtyIndex) { IdtyQuota::<T>::insert( idty_index, Quota { @@ -352,8 +347,6 @@ impl<T: Config> pallet_identity::traits::OnNewIdty<T> for Pallet<T> { amount: BalanceOf::<T>::zero(), }, ); - add_db_reads_writes(0, 1); - weight } }