clippy

Author: sigurpol

substrate/frame/staking-async/ah-client/src/lib.rs

@@ -100,7 +100,7 @@ macro_rules! log {
 
 /// Interface to talk to the local session pallet.
 pub trait SessionInterface {
-	/// The validator id type of the session pallet.
+	/// The validator id type of the session pallet
 	type ValidatorId: Clone;
 
 	/// The account id type
@@ -111,7 +111,7 @@ pub trait SessionInterface {
 
 	fn validators() -> Vec<Self::ValidatorId>;
 
-	/// Prune up to the given session index.
+	/// prune up to the given session index.
 	fn prune_up_to(index: SessionIndex);
 
 	/// Report an offence.
@@ -144,7 +144,6 @@ impl<T: Config + pallet_session::Config + pallet_session::historical::Config> Se
 	fn prune_up_to(index: SessionIndex) {
 		pallet_session::historical::Pallet::<T>::prune_up_to(index)
 	}
-
 	fn report_offence(offender: Self::ValidatorId, severity: OffenceSeverity) {
 		pallet_session::Pallet::<T>::report_offence(offender, severity)
 	}
@@ -678,9 +677,6 @@ pub mod pallet {
 		/// The `proof` parameter is validated using the `OpaqueKeys::ownership_proof_is_valid`
 		/// method to verify key ownership.
 		#[pallet::call_index(3)]
-		// Weight approximation for pallet_session::do_set_keys:
-		// - Reads: NextKeys (load old keys), KeyOwner checks
-		// - Writes: NextKeys, KeyOwner entries
 		// TODO: Replace with proper benchmarked weight.
 		#[pallet::weight(T::DbWeight::get().reads_writes(2, 2))]
 		pub fn set_keys_from_ah(
@@ -710,9 +706,6 @@ pub mod pallet {
 		/// This is called when a validator purges their session keys on AssetHub, which forwards
 		/// the request to the RelayChain via XCM.
 		#[pallet::call_index(4)]
-		// Weight approximation for pallet_session::do_purge_keys:
-		// - Reads: NextKeys (take keys)
-		// - Writes: NextKeys (clear), KeyOwner entries (clear)
 		// TODO: Replace with proper benchmarked weight.
 		#[pallet::weight(T::DbWeight::get().reads_writes(2, 2))]
 		pub fn purge_keys_from_ah(origin: OriginFor<T>, stash: T::AccountId) -> DispatchResult {

substrate/frame/staking-async/ahm-test/src/ah/mock.rs

@@ -472,6 +472,7 @@ impl pallet_staking_async_rc_client::Config for Runtime {
 	type RelayChainOrigin = EnsureRoot<AccountId>;
 	type MaxValidatorSetRetries = ConstU32<3>;
 	type ValidatorSetExportSession = ValidatorSetExportSession;
+	type Keys = crate::rc::SessionKeys;
 }
 
 parameter_types! {
@@ -514,6 +515,30 @@ impl pallet_staking_async_rc_client::SendToRelayChain for DeliverToRelay {
 		}
 		Ok(())
 	}
+
+	fn set_keys(stash: Self::AccountId, keys: Vec<u8>, proof: Vec<u8>) -> Result<(), ()> {
+		Self::ensure_delivery_guard()?;
+		shared::in_rc(|| {
+			let origin = crate::rc::RuntimeOrigin::root();
+			pallet_staking_async_ah_client::Pallet::<crate::rc::Runtime>::set_keys_from_ah(
+				origin, stash, keys, proof,
+			)
+			.unwrap();
+		});
+		Ok(())
+	}
+
+	fn purge_keys(stash: Self::AccountId) -> Result<(), ()> {
+		Self::ensure_delivery_guard()?;
+		shared::in_rc(|| {
+			let origin = crate::rc::RuntimeOrigin::root();
+			pallet_staking_async_ah_client::Pallet::<crate::rc::Runtime>::purge_keys_from_ah(
+				origin, stash,
+			)
+			.unwrap();
+		});
+		Ok(())
+	}
 }
 
 const INITIAL_BALANCE: Balance = 1000;

substrate/frame/staking-async/rc-client/src/lib.rs

@@ -960,7 +960,6 @@ pub mod pallet {
 		/// Note: No deposit is currently required. Deposit handling will be added once direct
 		/// `set_keys`/`purge_keys` calls on the Relay Chain are disabled.
 		#[pallet::call_index(10)]
-		// Weight: XCM message encoding, validation, and UMP queue insertion.
 		// TODO: Replace with proper benchmarked weight including XCM overhead.
 		#[pallet::weight(T::DbWeight::get().reads_writes(0, 0))]
 		pub fn set_keys(origin: OriginFor<T>, keys: T::Keys, proof: Vec<u8>) -> DispatchResult {
@@ -985,7 +984,6 @@ pub mod pallet {
 		/// Note: No deposit is currently held/released. Deposit handling will be added once
 		/// direct `set_keys`/`purge_keys` calls on the Relay Chain are disabled.
 		#[pallet::call_index(11)]
-		// Weight: XCM message encoding, validation, and UMP queue insertion.
 		// TODO: Replace with proper benchmarked weight including XCM overhead.
 		#[pallet::weight(T::DbWeight::get().reads_writes(0, 0))]
 		pub fn purge_keys(origin: OriginFor<T>) -> DispatchResult {