diff --git a/pallets/distance/src/lib.rs b/pallets/distance/src/lib.rs index ab6892b438c3629fb52f341e4ad8c063747d6078..4413e26f3a1573b062155cefe789ab183116d087 100644 --- a/pallets/distance/src/lib.rs +++ b/pallets/distance/src/lib.rs @@ -91,6 +91,8 @@ pub mod pallet { type WeightInfo: WeightInfo; /// Handler for successful distance evaluation type OnValidDistanceStatus: OnValidDistanceStatus<Self>; + /// Trait to check that distance evaluation request is allowed + type CheckRequestDistanceEvaluation: CheckRequestDistanceEvaluation<Self>; } // STORAGE // @@ -259,7 +261,7 @@ pub mod pallet { } /// Request target identity to be evaluated - /// only possible for unconfirmed identity + /// only possible for unvalidated identity #[pallet::call_index(4)] #[pallet::weight(<T as pallet::Config>::WeightInfo::request_distance_evaluation())] pub fn request_distance_evaluation_for( @@ -402,7 +404,6 @@ pub mod pallet { // caller has an identity let idty_index = pallet_identity::IdentityIndexOf::<T>::get(who) .ok_or(Error::<T>::CallerHasNoIdentity)?; - // TODO "check idty call allowed" managed by wot that checks received cert count Self::check_request_distance_evaluation_common(idty_index)?; Ok(idty_index) } @@ -415,8 +416,6 @@ pub mod pallet { // caller has an identity let caller_idty_index = pallet_identity::IdentityIndexOf::<T>::get(who) .ok_or(Error::<T>::CallerHasNoIdentity)?; - // TODO some of the following can be moved to a "check idty call allowed" managed by wot - // which also checks certification count let caller_idty = pallet_identity::Identities::<T>::get(caller_idty_index) .ok_or(Error::<T>::CallerIdentityNotFound)?; // caller is member @@ -450,7 +449,9 @@ pub mod pallet { ValidEvaluationResult::<T>::get(target).is_none(), Error::<T>::ValidDistanceResultAlreadyAvailable ); - Ok(()) + // external validation + // target has received enough certifications + T::CheckRequestDistanceEvaluation::check_request_distance_evaluation(target) } /// request distance evaluation in current pool diff --git a/pallets/distance/src/mock.rs b/pallets/distance/src/mock.rs index 537d5bce05aad24d053de4cf68dd73870d08fbcf..64bb309b93a0463355fa1d1b0cd1e3a6bc741112 100644 --- a/pallets/distance/src/mock.rs +++ b/pallets/distance/src/mock.rs @@ -259,6 +259,7 @@ impl pallet_distance::Config for Test { type RuntimeEvent = RuntimeEvent; type WeightInfo = (); type OnValidDistanceStatus = (); + type CheckRequestDistanceEvaluation = (); } // Build genesis storage according to the mock runtime. diff --git a/pallets/distance/src/traits.rs b/pallets/distance/src/traits.rs index eafb5451c1136bb3a1709d5370a88211fdf07fdb..6849d9c250c29421bffb67f4d52c0cf626271a59 100644 --- a/pallets/distance/src/traits.rs +++ b/pallets/distance/src/traits.rs @@ -15,6 +15,7 @@ // along with Duniter-v2S. If not, see <https://www.gnu.org/licenses/>. use crate::*; +use frame_support::pallet_prelude::*; pub trait OnValidDistanceStatus<T: Config> { /// Handler for valid distance evaluation @@ -24,3 +25,13 @@ pub trait OnValidDistanceStatus<T: Config> { impl<T: Config> OnValidDistanceStatus<T> for () { fn on_valid_distance_status(_idty_index: T::IdtyIndex) {} } + +pub trait CheckRequestDistanceEvaluation<T: Config> { + fn check_request_distance_evaluation(idty_index: T::IdtyIndex) -> Result<(), DispatchError>; +} + +impl<T: Config> CheckRequestDistanceEvaluation<T> for () { + fn check_request_distance_evaluation(_idty_index: T::IdtyIndex) -> Result<(), DispatchError> { + Ok(()) + } +} diff --git a/pallets/duniter-wot/src/lib.rs b/pallets/duniter-wot/src/lib.rs index a33bec74339e7d07cd80ccd27d3101246535e024..0f6bed36a15ec67cb8d171020e6cb08eee4a4074 100644 --- a/pallets/duniter-wot/src/lib.rs +++ b/pallets/duniter-wot/src/lib.rs @@ -122,6 +122,8 @@ pub mod pallet { CertToRevoked, /// Issuer or receiver not found. IdtyNotFound, + /// Not enough certs received to request distance evaluation. + NotEnoughCertsReceivedToRequestDistanceEvaluation, } } @@ -391,3 +393,19 @@ impl<T: Config<I> + pallet_distance::Config, I: 'static> } } } + +/// distance evaluation request allowed check +impl<T: Config<I> + pallet_distance::Config, I: 'static> + pallet_distance::traits::CheckRequestDistanceEvaluation<T> for Pallet<T, I> +{ + fn check_request_distance_evaluation(idty_index: IdtyIndex) -> Result<(), DispatchError> { + // maybe check idty is not unconfirmed or revoked ? + // check cert count + let idty_cert_meta = pallet_certification::Pallet::<T, I>::idty_cert_meta(idty_index); + ensure!( + idty_cert_meta.received_count >= T::MinCertForMembership::get(), + Error::<T, I>::NotEnoughCertsReceivedToRequestDistanceEvaluation + ); + Ok(()) + } +} diff --git a/runtime/common/src/pallets_config.rs b/runtime/common/src/pallets_config.rs index b20283e149143160a8763739360e420979e7e302..e8712c23ec8763dccddfa5e187a02666ef8b77b2 100644 --- a/runtime/common/src/pallets_config.rs +++ b/runtime/common/src/pallets_config.rs @@ -524,6 +524,7 @@ macro_rules! pallets_config { type RuntimeEvent = RuntimeEvent; type WeightInfo = common_runtime::weights::pallet_distance::WeightInfo<Runtime>; type OnValidDistanceStatus = Wot; + type CheckRequestDistanceEvaluation = Wot; } // SMITHSÂ SUB-WOT //