Remove SubnetLimit

Author: gztensor

pallets/admin-utils/src/lib.rs

@@ -910,12 +910,8 @@ pub mod pallet {
 			DispatchClass::Operational,
 			Pays::No
 		))]
-        pub fn sudo_set_subnet_limit(origin: OriginFor<T>, max_subnets: u16) -> DispatchResult {
+        pub fn sudo_set_subnet_limit(origin: OriginFor<T>, _max_subnets: u16) -> DispatchResult {
             ensure_root(origin)?;
-            pallet_subtensor::Pallet::<T>::set_max_subnets(max_subnets);
-
-            log::debug!("SubnetLimit( max_subnets: {:?} ) ", max_subnets);
-
             Ok(())
         }
 

pallets/admin-utils/src/tests/mock.rs

@@ -123,7 +123,7 @@ parameter_types! {
     pub const InitialNetworkMinLockCost: u64 = 100_000_000_000;
     pub const InitialSubnetOwnerCut: u16 = 0; // 0%. 100% of rewards go to validators + miners.
     pub const InitialNetworkLockReductionInterval: u64 = 2; // 2 blocks.
-    pub const InitialSubnetLimit: u16 = 10; // Max 10 subnets.
+    // pub const InitialSubnetLimit: u16 = 10; // (DEPRECATED)
     pub const InitialNetworkRateLimit: u64 = 0;
     pub const InitialKeySwapCost: u64 = 1_000_000_000;
     pub const InitialAlphaHigh: u16 = 58982; // Represents 0.9 as per the production default
@@ -188,14 +188,11 @@ impl pallet_subtensor::Config for Test {
     type InitialNetworkMinLockCost = InitialNetworkMinLockCost;
     type InitialSubnetOwnerCut = InitialSubnetOwnerCut;
     type InitialNetworkLockReductionInterval = InitialNetworkLockReductionInterval;
-    type InitialSubnetLimit = InitialSubnetLimit;
     type InitialNetworkRateLimit = InitialNetworkRateLimit;
     type KeySwapCost = InitialKeySwapCost;
     type AlphaHigh = InitialAlphaHigh;
     type AlphaLow = InitialAlphaLow;
     type LiquidAlphaOn = InitialLiquidAlphaOn;
-    // type InitialHotkeyEmissionTempo = InitialHotkeyEmissionTempo; // (DEPRECATED)
-    // type InitialNetworkMaxStake = InitialNetworkMaxStake; // (DEPRECATED)
     type Preimages = ();
     type InitialColdkeySwapScheduleDuration = InitialColdkeySwapScheduleDuration;
     type InitialDissolveNetworkScheduleDuration = InitialDissolveNetworkScheduleDuration;

pallets/admin-utils/src/tests/mod.rs

@@ -850,30 +850,6 @@ fn test_sudo_set_rao_recycled() {
     });
 }
 
-#[test]
-fn test_sudo_set_subnet_limit() {
-    new_test_ext().execute_with(|| {
-        let netuid: u16 = 1;
-        let to_be_set: u16 = 10;
-        add_network(netuid, 10);
-
-        let init_value: u16 = SubtensorModule::get_max_subnets();
-        assert_eq!(
-            AdminUtils::sudo_set_subnet_limit(
-                <<Test as Config>::RuntimeOrigin>::signed(U256::from(1)),
-                to_be_set
-            ),
-            Err(DispatchError::BadOrigin)
-        );
-        assert_eq!(SubtensorModule::get_max_subnets(), init_value);
-        assert_ok!(AdminUtils::sudo_set_subnet_limit(
-            <<Test as Config>::RuntimeOrigin>::root(),
-            to_be_set
-        ));
-        assert_eq!(SubtensorModule::get_max_subnets(), to_be_set);
-    });
-}
-
 #[test]
 fn test_sudo_set_network_lock_reduction_interval() {
     new_test_ext().execute_with(|| {

pallets/subtensor/src/lib.rs

@@ -501,11 +501,6 @@ pub mod pallet {
         T::InitialSubnetOwnerCut::get()
     }
     #[pallet::type_value]
-    /// Default value for subnet limit.
-    pub fn DefaultSubnetLimit<T: Config>() -> u16 {
-        T::InitialSubnetLimit::get()
-    }
-    #[pallet::type_value]
     /// Default value for network rate limit.
     pub fn DefaultNetworkRateLimit<T: Config>() -> u64 {
         if cfg!(feature = "pow-faucet") {
@@ -1045,9 +1040,6 @@ pub mod pallet {
     pub type MaxRegistrationsPerBlock<T> =
         StorageMap<_, Identity, u16, u16, ValueQuery, DefaultMaxRegistrationsPerBlock<T>>;
     #[pallet::storage]
-    /// --- ITEM( maximum_number_of_networks )
-    pub type SubnetLimit<T> = StorageValue<_, u16, ValueQuery, DefaultSubnetLimit<T>>;
-    #[pallet::storage]
     /// --- ITEM( total_number_of_existing_networks )
     pub type TotalNetworks<T> = StorageValue<_, u16, ValueQuery>;
     #[pallet::storage]

pallets/subtensor/src/macros/config.rs

@@ -180,9 +180,6 @@ mod config {
         /// Initial lock reduction interval.
         #[pallet::constant]
         type InitialNetworkLockReductionInterval: Get<u64>;
-        /// Initial max allowed subnets
-        #[pallet::constant]
-        type InitialSubnetLimit: Get<u16>;
         /// Initial network creation rate limit
         #[pallet::constant]
         type InitialNetworkRateLimit: Get<u64>;

pallets/subtensor/src/macros/events.rs

@@ -122,7 +122,7 @@ mod events {
         /// the network minimum locking cost is set.
         NetworkMinLockCostSet(u64),
         /// the maximum number of subnets is set
-        SubnetLimitSet(u16),
+        // SubnetLimitSet(u16),
         /// the lock cost reduction is set
         NetworkLockCostReductionIntervalSet(u64),
         /// the take for a delegate is decreased.

pallets/subtensor/src/macros/hooks.rs

@@ -79,7 +79,9 @@ mod hooks {
 				// Set the min difficulty across all subnets to a new minimum
 				.saturating_add(migrations::migrate_set_min_difficulty::migrate_set_min_difficulty::<T>())
                 // Remove Stake map entries
-				.saturating_add(migrations::migrate_remove_stake_map::migrate_remove_stake_map::<T>());
+				.saturating_add(migrations::migrate_remove_stake_map::migrate_remove_stake_map::<T>())
+                // Remove unused maps entries
+				.saturating_add(migrations::migrate_remove_unused_maps_and_values::migrate_remove_unused_maps_and_values::<T>());
             weight
         }
 

pallets/subtensor/src/migrations/migrate_remove_unused_maps.rs renamed to pallets/subtensor/src/migrations/migrate_remove_unused_maps_and_values.rs

@@ -2,7 +2,7 @@ use super::*;
 use crate::HasMigrationRun;
 use frame_support::{traits::Get, weights::Weight};
 use scale_info::prelude::string::String;
-use sp_io::{KillStorageResult, hashing::twox_128, storage::clear_prefix};
+use sp_io::{KillStorageResult, hashing::twox_128, storage::{clear, clear_prefix}};
 
 fn remove_prefix<T: Config>(old_map: &str, weight: &mut Weight) {
     let mut prefix = Vec::new();
@@ -28,8 +28,8 @@ fn remove_prefix<T: Config>(old_map: &str, weight: &mut Weight) {
     *weight = (*weight).saturating_add(T::DbWeight::get().writes(removed_entries_count));
 }
 
-pub fn migrate_remove_unused_maps<T: Config>() -> Weight {
-    let migration_name = b"migrate_remove_unused_maps".to_vec();
+pub fn migrate_remove_unused_maps_and_values<T: Config>() -> Weight {
+    let migration_name = b"migrate_remove_unused_maps_and_values".to_vec();
     let mut weight = T::DbWeight::get().reads(1);
 
     if HasMigrationRun::<T>::get(&migration_name) {
@@ -51,6 +51,9 @@ pub fn migrate_remove_unused_maps<T: Config>() -> Weight {
     // Remove NetworkMaxStake
     remove_prefix::<T>("NetworkMaxStake", &mut weight);
 
+    // Remove SubnetLimit
+    clear(b"SubtensorModule::SubnetLimit");
+
     // Mark Migration as Completed
     HasMigrationRun::<T>::insert(&migration_name, true);
     weight = weight.saturating_add(T::DbWeight::get().writes(1));

pallets/subtensor/src/migrations/mod.rs

@@ -10,7 +10,7 @@ pub mod migrate_init_total_issuance;
 pub mod migrate_populate_owned_hotkeys;
 pub mod migrate_rao;
 pub mod migrate_remove_stake_map;
-pub mod migrate_remove_unused_maps;
+pub mod migrate_remove_unused_maps_and_values;
 pub mod migrate_set_min_burn;
 pub mod migrate_set_min_difficulty;
 pub mod migrate_stake_threshold;

pallets/subtensor/src/subnets/subnet.rs

@@ -25,26 +25,6 @@ impl<T: Config> Pallet<T> {
         TotalNetworks::<T>::get()
     }
 
-    /// Fetches the max number of subnet
-    ///
-    /// This function retrieves the max number of subnet.
-    ///
-    /// # Returns:
-    /// * 'u16': The max number of subnet
-    ///
-    pub fn get_max_subnets() -> u16 {
-        SubnetLimit::<T>::get()
-    }
-
-    /// Sets the max number of subnet
-    ///
-    /// This function sets the max number of subnet.
-    ///
-    pub fn set_max_subnets(limit: u16) {
-        SubnetLimit::<T>::put(limit);
-        Self::deposit_event(Event::SubnetLimitSet(limit));
-    }
-
     /// Returns true if the subnetwork exists.
     ///
     /// This function checks if a subnetwork with the given UID exists.