From 4a07ce0124d74b162e8f48cd88878a1da9d1e820 Mon Sep 17 00:00:00 2001
From: bgallois <benjamin@gallois.cc>
Date: Fri, 8 Dec 2023 14:20:04 +0100
Subject: [PATCH] fix clippy errors
---
pallets/distance/src/lib.rs | 8 ++++----
runtime/common/src/providers.rs | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/pallets/distance/src/lib.rs b/pallets/distance/src/lib.rs
index 8bdcc60b3..62a33b4fa 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 65403aa6a..141714062 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()),
}
--
GitLab