diff --git a/pallets/distance/src/lib.rs b/pallets/distance/src/lib.rs index 8bdcc60b342516d416bcd529ae5306bf3c18c20f..62a33b4fa55f7915a41d2c940b95d7b0306a4705 100644 --- a/pallets/distance/src/lib.rs +++ b/pallets/distance/src/lib.rs @@ -481,7 +481,7 @@ pub mod pallet { MedianResult::Two(m1, m2) => m1 + (m2 - m1) / 2, // Avoid overflow (since max is 1) }; IdentityDistanceStatus::<T>::mutate(idty, |entry| { - entry.as_mut().map(|(account_id, status)| { + if let Some((account_id, status)) = entry.as_mut() { if median >= T::MinAccessibleReferees::get() { T::Currency::unreserve( account_id, @@ -489,13 +489,13 @@ pub mod pallet { ); *status = DistanceStatus::Valid; } else { - <T as Config>::Currency::slash_reserved( - &account_id, + T::Currency::slash_reserved( + account_id, <T as Config>::EvaluationPrice::get(), ); *status = DistanceStatus::Invalid; } - }); + } }); } else if let Some((account_id, _status)) = IdentityDistanceStatus::<T>::take(idty) { diff --git a/runtime/common/src/providers.rs b/runtime/common/src/providers.rs index 65403aa6aef9debd2067a7dc8cd461fca76d51e1..1417140622744b6879500cb0ebd5a8962759860d 100644 --- a/runtime/common/src/providers.rs +++ b/runtime/common/src/providers.rs @@ -119,7 +119,7 @@ where idty_id: &<T as pallet_identity::Config>::IdtyIndex, ) -> Result<(), DispatchError> { match pallet_distance::Pallet::<T>::identity_distance_status(idty_id) { - Some((_, pallet_distance::DistanceStatus::Valid)) => Ok(()).into(), + Some((_, pallet_distance::DistanceStatus::Valid)) => Ok(()), Some((_, pallet_distance::DistanceStatus::Invalid)) => Err(pallet_duniter_wot::Error::<T, frame_support::instances::Instance1>::DistanceIsInvalid.into()), _ => Err(pallet_duniter_wot::Error::<T, frame_support::instances::Instance1>::DistanceNotEvaluated.into()), }