feat: refactor extrinsics + restrict weight setting

pallets/emission0/src/benchmarks.rs

@@ -28,15 +28,4 @@ benchmarks! {
         <T::Torus>::force_register_agent(&module_key2, vec![], vec![], vec![])?;
 
     }: _(RawOrigin::Signed(module_key), module_key2.clone())
-
-    regain_weight_control {
-        let module_key: T::AccountId = account("ModuleKey", 0, 2);
-        let module_key2: T::AccountId = account("ModuleKey2", 0, 3);
-
-        <T::Torus>::force_register_agent(&module_key, vec![], vec![], vec![])?;
-        <T::Torus>::force_register_agent(&module_key2, vec![], vec![], vec![])?;
-
-        Pallet::<T>::delegate_weight_control(RawOrigin::Signed(module_key.clone()).into(), module_key2.clone())?;
-
-    }: _(RawOrigin::Signed(module_key))
 }

pallets/emission0/src/lib.rs

@@ -121,6 +121,9 @@ pub mod pallet {
         /// Tried setting weights for itself.
         CannotSetWeightsForSelf,
 
+        /// Tried setting weights while delegating weight control.
+        CannotSetWeightsWhileDelegating,
+
         /// Tried delegating weight control to itself.
         CannotDelegateWeightControlToSelf,
 
@@ -152,20 +155,14 @@ pub mod pallet {
             weight_control::set_weights::<T>(origin, weights)
         }
 
-        #[pallet::call_index(2)]
-        #[pallet::weight((T::WeightInfo::delegate_weight_control(), DispatchClass::Normal, Pays::Yes))]
+        #[pallet::call_index(1)]
+        #[pallet::weight((Weight::zero(), DispatchClass::Normal, Pays::Yes))]
         pub fn delegate_weight_control(
             origin: OriginFor<T>,
             target: AccountIdOf<T>,
         ) -> DispatchResult {
             weight_control::delegate_weight_control::<T>(origin, target)
         }
-
-        #[pallet::call_index(3)]
-        #[pallet::weight((T::WeightInfo::regain_weight_control(), DispatchClass::Normal, Pays::Yes))]
-        pub fn regain_weight_control(origin: OriginFor<T>) -> DispatchResult {
-            weight_control::regain_weight_control::<T>(origin)
-        }
     }
 }
 

pallets/emission0/src/weight_control.rs

@@ -94,12 +94,3 @@ pub fn delegate_weight_control<T: crate::Config>(
 
     Ok(())
 }
-
-pub fn regain_weight_control<T: crate::Config>(origin: OriginFor<T>) -> DispatchResult {
-    let acc_id = ensure_signed(origin)?;
-
-    crate::WeightControlDelegation::<T>::mutate(acc_id, |val| match val.take() {
-        Some(_) => Ok(()),
-        None => Err(crate::Error::<T>::AgentIsNotDelegating.into()),
-    })
-}

pallets/emission0/src/weights.rs

@@ -40,7 +40,6 @@ use core::marker::PhantomData;
 pub trait WeightInfo {
 	fn set_weights() -> Weight;
 	fn delegate_weight_control() -> Weight;
-	fn regain_weight_control() -> Weight;
 }
 
 /// Weights for `pallet_emission0` using the Substrate node and recommended hardware.
@@ -78,17 +77,6 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: `Emission0::WeightControlDelegation` (r:1 w:1)
-	/// Proof: `Emission0::WeightControlDelegation` (`max_values`: None, `max_size`: Some(64), added: 2539, mode: `MaxEncodedLen`)
-	fn regain_weight_control() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `199`
-		//  Estimated: `3529`
-		// Minimum execution time: 7_000_000 picoseconds.
-		Weight::from_parts(8_000_000, 3529)
-			.saturating_add(T::DbWeight::get().reads(1_u64))
-			.saturating_add(T::DbWeight::get().writes(1_u64))
-	}
 }
 
 // For backwards compatibility and tests.
@@ -125,15 +113,4 @@ impl WeightInfo for () {
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
-	/// Storage: `Emission0::WeightControlDelegation` (r:1 w:1)
-	/// Proof: `Emission0::WeightControlDelegation` (`max_values`: None, `max_size`: Some(64), added: 2539, mode: `MaxEncodedLen`)
-	fn regain_weight_control() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `199`
-		//  Estimated: `3529`
-		// Minimum execution time: 7_000_000 picoseconds.
-		Weight::from_parts(8_000_000, 3529)
-			.saturating_add(RocksDbWeight::get().reads(1_u64))
-			.saturating_add(RocksDbWeight::get().writes(1_u64))
-	}
 }

pallets/emission0/tests/weights.rs

@@ -1,9 +1,11 @@
 use pallet_emission0::{
-    weight_control::{delegate_weight_control, regain_weight_control, set_weights},
+    weights::{delegate_weight_control, set_weights},
     ConsensusMembers, Error, MaxAllowedWeights, MinStakePerWeight, WeightControlDelegation,
     Weights,
 };
-use test_utils::{add_stake, get_origin, register_empty_agent, Test};
+use test_utils::{
+    add_stake, get_origin, pallet_governance::Allocators, register_empty_agent, Test,
+};
 
 #[test]
 fn delegates_and_regains_weight_control() {
@@ -21,11 +23,6 @@
             Err(Error::<Test>::AgentIsNotRegistered.into())
         );
 
-        assert_eq!(
-            regain_weight_control::<Test>(get_origin(delegator)),
-            Err(Error::<Test>::AgentIsNotDelegating.into())
-        );
-
         register_empty_agent(delegator);
 
         assert_eq!(
@@ -41,10 +38,6 @@
         );
 
         assert!(WeightControlDelegation::<Test>::contains_key(delegator));
-
-        assert_eq!(regain_weight_control::<Test>(get_origin(delegator)), Ok(()));
-
-        assert!(!WeightControlDelegation::<Test>::contains_key(delegator));
     });
 }
 
@@ -56,10 +49,7 @@
 
         let validator = 0;
 
-        assert_eq!(
-            set_weights::<Test>(get_origin(validator), vec![(0, 0); 6]),
-            Err(Error::<Test>::WeightSetTooLarge.into()),
-        );
+        Allocators::<Test>::insert(0, ());
 
         assert_eq!(
             set_weights::<Test>(get_origin(validator), vec![(0, 0); 5]),
@@ -68,6 +58,11 @@
 
         register_empty_agent(validator);
 
+        assert_eq!(
+            set_weights::<Test>(get_origin(validator), vec![(0, 0); 6]),
+            Err(Error::<Test>::WeightSetTooLarge.into()),
+        );
+
         assert_eq!(
             set_weights::<Test>(get_origin(validator), vec![(0, 0); 5]),
             Err(Error::<Test>::NotEnoughStakeToSetWeights.into()),

pallets/governance/api/src/lib.rs

@@ -1,11 +1,13 @@
 #![no_std]
 
-use polkadot_sdk::sp_runtime::Percent;
+use polkadot_sdk::{frame_support::dispatch::DispatchResult, sp_runtime::Percent};
 
 pub trait GovernanceApi<AccountId> {
     fn dao_treasury_address() -> AccountId;
 
     fn treasury_emission_fee() -> Percent;
 
     fn is_whitelisted(key: &AccountId) -> bool;
+
+    fn ensure_allocator(key: &AccountId) -> DispatchResult;
 }