Merge pull request #2235 from opentensor/chore/explicit-admin-window-check

Chore/explicit admin window check

Author: sam0x17

pallets/admin-utils/src/lib.rs

@@ -259,7 +259,8 @@ pub mod pallet {
             netuid: NetUid,
             min_difficulty: u64,
         ) -> DispatchResult {
-            pallet_subtensor::Pallet::<T>::ensure_root_with_rate_limit(origin, netuid)?;
+            ensure_root(origin)?;
+            pallet_subtensor::Pallet::<T>::ensure_admin_window_open(netuid)?;
 
             ensure!(
                 pallet_subtensor::Pallet::<T>::if_subnet_exist(netuid),
@@ -710,7 +711,8 @@ pub mod pallet {
             netuid: NetUid,
             target_registrations_per_interval: u16,
         ) -> DispatchResult {
-            pallet_subtensor::Pallet::<T>::ensure_root_with_rate_limit(origin, netuid)?;
+            ensure_root(origin)?;
+            pallet_subtensor::Pallet::<T>::ensure_admin_window_open(netuid)?;
 
             ensure!(
                 pallet_subtensor::Pallet::<T>::if_subnet_exist(netuid),
@@ -820,7 +822,8 @@ pub mod pallet {
             netuid: NetUid,
             difficulty: u64,
         ) -> DispatchResult {
-            pallet_subtensor::Pallet::<T>::ensure_root_with_rate_limit(origin, netuid)?;
+            ensure_root(origin)?;
+            pallet_subtensor::Pallet::<T>::ensure_admin_window_open(netuid)?;
             ensure!(
                 pallet_subtensor::Pallet::<T>::if_subnet_exist(netuid),
                 Error::<T>::SubnetDoesNotExist
@@ -842,7 +845,8 @@ pub mod pallet {
             netuid: NetUid,
             max_allowed_validators: u16,
         ) -> DispatchResult {
-            pallet_subtensor::Pallet::<T>::ensure_root_with_rate_limit(origin, netuid)?;
+            ensure_root(origin)?;
+            pallet_subtensor::Pallet::<T>::ensure_admin_window_open(netuid)?;
             ensure!(
                 pallet_subtensor::Pallet::<T>::if_subnet_exist(netuid),
                 Error::<T>::SubnetDoesNotExist
@@ -949,7 +953,8 @@ pub mod pallet {
             netuid: NetUid,
             max_registrations_per_block: u16,
         ) -> DispatchResult {
-            pallet_subtensor::Pallet::<T>::ensure_root_with_rate_limit(origin, netuid)?;
+            ensure_root(origin)?;
+            pallet_subtensor::Pallet::<T>::ensure_admin_window_open(netuid)?;
 
             ensure!(
                 pallet_subtensor::Pallet::<T>::if_subnet_exist(netuid),
@@ -1013,7 +1018,8 @@ pub mod pallet {
         .saturating_add(<T as frame_system::Config>::DbWeight::get().reads(3_u64))
         .saturating_add(<T as frame_system::Config>::DbWeight::get().writes(1_u64)))]
         pub fn sudo_set_tempo(origin: OriginFor<T>, netuid: NetUid, tempo: u16) -> DispatchResult {
-            pallet_subtensor::Pallet::<T>::ensure_root_with_rate_limit(origin, netuid)?;
+            ensure_root(origin)?;
+            pallet_subtensor::Pallet::<T>::ensure_admin_window_open(netuid)?;
             ensure!(
                 pallet_subtensor::Pallet::<T>::if_subnet_exist(netuid),
                 Error::<T>::SubnetDoesNotExist
@@ -1929,7 +1935,8 @@ pub mod pallet {
             netuid: NetUid,
             subtoken_enabled: bool,
         ) -> DispatchResult {
-            pallet_subtensor::Pallet::<T>::ensure_root_with_rate_limit(origin, netuid)?;
+            ensure_root(origin)?;
+            pallet_subtensor::Pallet::<T>::ensure_admin_window_open(netuid)?;
             pallet_subtensor::SubtokenEnabled::<T>::set(netuid, subtoken_enabled);
 
             log::debug!(
@@ -2126,7 +2133,8 @@ pub mod pallet {
             netuid: NetUid,
             min_allowed_uids: u16,
         ) -> DispatchResult {
-            pallet_subtensor::Pallet::<T>::ensure_root_with_rate_limit(origin, netuid)?;
+            ensure_root(origin)?;
+            pallet_subtensor::Pallet::<T>::ensure_admin_window_open(netuid)?;
 
             ensure!(
                 pallet_subtensor::Pallet::<T>::if_subnet_exist(netuid),

pallets/subtensor/src/tests/ensure.rs

@@ -63,26 +63,20 @@ fn ensure_subnet_owner_or_root_distinguishes_root_and_owner() {
 }
 
 #[test]
-fn ensure_root_with_rate_limit_blocks_in_freeze_window() {
+fn ensure_admin_window_open_blocks_in_freeze_window() {
     new_test_ext(1).execute_with(|| {
-        let netuid = NetUid::from(1);
+        let netuid = NetUid::from(0);
         let tempo = 10;
         add_network(netuid, 10, 0);
 
-        // Set freeze window to 3
         let freeze_window = 3;
         crate::Pallet::<Test>::set_admin_freeze_window(freeze_window);
 
-        run_to_block((tempo - freeze_window + 1).into());
+        System::set_block_number((tempo - freeze_window).into());
+        assert!(crate::Pallet::<Test>::ensure_admin_window_open(netuid).is_err());
 
-        // Root is blocked in freeze window
-        assert!(
-            crate::Pallet::<Test>::ensure_root_with_rate_limit(
-                <<Test as Config>::RuntimeOrigin>::root(),
-                netuid
-            )
-            .is_err()
-        );
+        System::set_block_number((tempo - freeze_window - 1).into());
+        assert!(crate::Pallet::<Test>::ensure_admin_window_open(netuid).is_ok());
     });
 }
 

pallets/subtensor/src/utils/misc.rs

@@ -1,8 +1,6 @@
 use super::*;
 use crate::Error;
-use crate::system::{
-    ensure_root, ensure_signed, ensure_signed_or_root, pallet_prelude::BlockNumberFor,
-};
+use crate::system::{ensure_signed, ensure_signed_or_root, pallet_prelude::BlockNumberFor};
 use safe_math::*;
 use sp_core::Get;
 use sp_core::U256;
@@ -36,15 +34,6 @@ impl<T: Config> Pallet<T> {
         }
     }
 
-    /// Like `ensure_root` but also prohibits calls during the last N blocks of the tempo.
-    pub fn ensure_root_with_rate_limit(
-        o: T::RuntimeOrigin,
-        netuid: NetUid,
-    ) -> Result<(), DispatchError> {
-        ensure_root(o)?;
-        Self::ensure_admin_window_open(netuid)
-    }
-
     /// Ensure owner-or-root with a set of TransactionType rate checks (owner only).
     pub fn ensure_sn_owner_or_root_with_limits(
         o: T::RuntimeOrigin,