Add ChildkeysMinStake, fix clippy, fix tests

Author: gztensor

pallets/subtensor/src/lib.rs

@@ -686,9 +686,9 @@ pub mod pallet {
     }
 
     #[pallet::type_value]
-    /// Default value for minimum stake.
-    pub fn DefaultMinStake<T: Config>() -> u64 {
-        1_000_000_000
+    /// Default minimum stake for setting childkeys.
+    pub fn DefaultChildkeysMinStake<T: Config>() -> u64 {
+        1_000_000_000_000
     }
 
     #[pallet::storage]
@@ -1298,6 +1298,9 @@ pub mod pallet {
     /// ITEM( weights_min_stake )
     pub type WeightsMinStake<T> = StorageValue<_, u64, ValueQuery, DefaultWeightsMinStake<T>>;
     #[pallet::storage]
+    /// ITEM( childkeys_min_stake )
+    pub type ChildkeysMinStake<T> = StorageValue<_, u64, ValueQuery, DefaultChildkeysMinStake<T>>;
+    #[pallet::storage]
     /// --- MAP (netuid, who) --> VecDeque<(hash, commit_block, first_reveal_block, last_reveal_block)> | Stores a queue of commits for an account on a given netuid.
     pub type WeightCommits<T: Config> = StorageDoubleMap<
         _,

pallets/subtensor/src/staking/remove_stake.rs

@@ -1,5 +1,4 @@
 use super::*;
-use sp_core::Get;
 
 impl<T: Config> Pallet<T> {
     /// ---- The implementation for the extrinsic remove_stake: Removes stake from a hotkey account and adds it onto a coldkey.
@@ -92,7 +91,7 @@ impl<T: Config> Pallet<T> {
         Self::clear_small_nomination_if_required(&hotkey, &coldkey, new_stake);
 
         // Check if stake lowered below MinStake and remove Pending children if it did
-        if Self::get_total_stake_for_hotkey(&hotkey) < DefaultMinStake::<T>::get() {
+        if Self::get_total_stake_for_hotkey(&hotkey) < ChildkeysMinStake::<T>::get() {
             Self::get_all_subnet_netuids().iter().for_each(|netuid| {
                 PendingChildKeys::<T>::remove(netuid, &hotkey);
             })

pallets/subtensor/src/staking/set_children.rs

@@ -113,7 +113,7 @@ impl<T: Config> Pallet<T> {
         // (checking with check_weights_min_stake wouldn't work because it considers
         // grandparent stake in this case)
         ensure!(
-            Self::get_total_stake_for_hotkey(&hotkey) >= DefaultMinStake::<T>::get(),
+            Self::get_total_stake_for_hotkey(&hotkey) >= ChildkeysMinStake::<T>::get(),
             Error::<T>::NotEnoughStakeToSetChildkeys
         );
 

pallets/subtensor/src/tests/children.rs

@@ -3,7 +3,7 @@ use super::mock::*;
 use frame_support::{assert_err, assert_noop, assert_ok};
 
 use crate::{utils::rate_limiting::TransactionType, *};
-use sp_core::{Get, U256};
+use sp_core::U256;
 
 // 1: Successful setting of a single child
 // SKIP_WASM_BUILD=1 RUST_LOG=info cargo test --test children -- test_do_set_child_singular_success --exact --nocapture
@@ -3674,7 +3674,7 @@ fn test_do_remove_stake_clears_pending_childkeys() {
         SubtensorModule::increase_stake_on_coldkey_hotkey_account(
             &coldkey,
             &hotkey,
-            100_000_000_000,
+            ChildkeysMinStake::<Test>::get(),
         );
 
         // Attempt to set child
@@ -3687,7 +3687,7 @@ fn test_do_remove_stake_clears_pending_childkeys() {
 
         // Check that pending child exists
         let pending_before = PendingChildKeys::<Test>::get(netuid, hotkey);
-        assert!(pending_before.0.len() > 0);
+        assert!(!pending_before.0.is_empty());
         assert!(pending_before.1 > 0);
 
         // Remove stake
@@ -3720,7 +3720,7 @@ fn test_do_set_child_cooldown_period() {
 
         // Set minimum stake for setting children
         let parent_total_stake_original = TotalHotkeyStake::<Test>::get(parent);
-        TotalHotkeyStake::<Test>::insert(parent, DefaultMinStake::<Test>::get());
+        TotalHotkeyStake::<Test>::insert(parent, ChildkeysMinStake::<Test>::get());
 
         // Schedule parent-child relationship
         assert_ok!(SubtensorModule::do_schedule_children(

pallets/subtensor/src/tests/mock.rs

@@ -208,7 +208,7 @@ impl CanVote<AccountId> for CanVoteToTriumvirate {
     }
 }
 
-use crate::{CollectiveInterface, DefaultMinStake, MemberManagement, TotalHotkeyStake};
+use crate::{ChildkeysMinStake, CollectiveInterface, MemberManagement, TotalHotkeyStake};
 pub struct ManageSenateMembers;
 impl MemberManagement<AccountId> for ManageSenateMembers {
     fn add_member(account: &AccountId) -> DispatchResultWithPostInfo {
@@ -615,7 +615,7 @@ pub fn wait_and_set_pending_children(netuid: u16) {
 pub fn mock_set_children(coldkey: &U256, parent: &U256, netuid: u16, child_vec: &[(u64, U256)]) {
     // Set minimum stake for setting children
     let parent_total_stake_original = TotalHotkeyStake::<Test>::get(parent);
-    TotalHotkeyStake::<Test>::insert(parent, DefaultMinStake::<Test>::get());
+    TotalHotkeyStake::<Test>::insert(parent, ChildkeysMinStake::<Test>::get());
 
     // Set initial parent-child relationship
     assert_ok!(SubtensorModule::do_schedule_children(