Commit missing merged files

Author: keithtensor

pallets/subtensor/src/root.rs

@@ -643,10 +643,7 @@ impl<T: Config> Pallet<T> {
 
         // --- 2. Calculate and lock the required tokens.
         let lock_amount: u64 = Self::get_network_lock_cost();
-<<<<<<< HEAD
-=======
         log::debug!("network lock_amount: {:?}", lock_amount);
->>>>>>> origin/development
         ensure!(
             Self::can_remove_balance_from_coldkey_account(&coldkey, lock_amount),
             Error::<T>::NotEnoughBalanceToStake

pallets/subtensor/src/staking.rs

@@ -141,53 +141,33 @@ impl<T: Config> Pallet<T> {
             stake_to_be_added
         );
 
-<<<<<<< HEAD
-        // --- 2. Ensure the callers coldkey has enough stake to perform the transaction.
-=======
         // Ensure the callers coldkey has enough stake to perform the transaction.
->>>>>>> origin/development
         ensure!(
             Self::can_remove_balance_from_coldkey_account(&coldkey, stake_to_be_added),
             Error::<T>::NotEnoughBalanceToStake
         );
 
-<<<<<<< HEAD
-        // --- 3. Ensure that the hotkey account exists this is only possible through registration.
-=======
         // Ensure that the hotkey account exists this is only possible through registration.
->>>>>>> origin/development
         ensure!(
             Self::hotkey_account_exists(&hotkey),
             Error::<T>::NotRegistered
         );
 
-<<<<<<< HEAD
-        // --- 4. Ensure that the hotkey allows delegation or that the hotkey is owned by the calling coldkey.
-=======
         // Ensure that the hotkey allows delegation or that the hotkey is owned by the calling coldkey.
->>>>>>> origin/development
         ensure!(
             Self::hotkey_is_delegate(&hotkey) || Self::coldkey_owns_hotkey(&coldkey, &hotkey),
             Error::<T>::NonAssociatedColdKey
         );
 
-<<<<<<< HEAD
-        // --- 5. Ensure we don't exceed stake rate limit
-=======
         // Ensure we don't exceed stake rate limit
->>>>>>> origin/development
         let stakes_this_interval =
             Self::get_stakes_this_interval_for_coldkey_hotkey(&coldkey, &hotkey);
         ensure!(
             stakes_this_interval < Self::get_target_stakes_per_interval(),
             Error::<T>::StakeRateLimitExceeded
         );
 
-<<<<<<< HEAD
-        // --- 6. If this is a nomination stake, check if total stake after adding will be above
-=======
         // If this is a nomination stake, check if total stake after adding will be above
->>>>>>> origin/development
         // the minimum required stake.
 
         // If coldkey is not owner of the hotkey, it's a nomination stake.
@@ -201,30 +181,18 @@ impl<T: Config> Pallet<T> {
             );
         }
 
-<<<<<<< HEAD
-        // --- 7. Ensure the remove operation from the coldkey is a success.
-        let actual_amount_to_stake =
-            Self::remove_balance_from_coldkey_account(&coldkey, stake_to_be_added)?;
-
-        // --- 8. If we reach here, add the balance to the hotkey.
-=======
         // Ensure the remove operation from the coldkey is a success.
         let actual_amount_to_stake =
             Self::remove_balance_from_coldkey_account(&coldkey, stake_to_be_added)?;
 
         // If we reach here, add the balance to the hotkey.
->>>>>>> origin/development
         Self::increase_stake_on_coldkey_hotkey_account(&coldkey, &hotkey, actual_amount_to_stake);
 
         // Set last block for rate limiting
         let block: u64 = Self::get_current_block_as_u64();
         Self::set_last_tx_block(&coldkey, block);
 
-<<<<<<< HEAD
-        // --- 9. Emit the staking event.
-=======
         // Emit the staking event.
->>>>>>> origin/development
         Self::set_stakes_this_interval_for_coldkey_hotkey(
             &coldkey,
             &hotkey,
@@ -238,11 +206,7 @@ impl<T: Config> Pallet<T> {
         );
         Self::deposit_event(Event::StakeAdded(hotkey, actual_amount_to_stake));
 
-<<<<<<< HEAD
-        // --- 10. Ok and return.
-=======
         // Ok and return.
->>>>>>> origin/development
         Ok(())
     }
 
@@ -317,23 +281,15 @@ impl<T: Config> Pallet<T> {
             Error::<T>::NotEnoughStaketoWithdraw
         );
 
-<<<<<<< HEAD
-        // --- 5. Ensure we don't exceed stake rate limit
-=======
         // Ensure we don't exceed stake rate limit
->>>>>>> origin/development
         let unstakes_this_interval =
             Self::get_stakes_this_interval_for_coldkey_hotkey(&coldkey, &hotkey);
         ensure!(
             unstakes_this_interval < Self::get_target_stakes_per_interval(),
             Error::<T>::UnstakeRateLimitExceeded
         );
 
-<<<<<<< HEAD
-        // --- 6. If this is a nomination stake, check if total stake after removing will be above
-=======
         // If this is a nomination stake, check if total stake after removing will be above
->>>>>>> origin/development
         // the minimum required stake.
 
         // If coldkey is not owner of the hotkey, it's a nomination stake.
@@ -347,28 +303,17 @@ impl<T: Config> Pallet<T> {
             );
         }
 
-<<<<<<< HEAD
-        // --- 7. We remove the balance from the hotkey.
-        Self::decrease_stake_on_coldkey_hotkey_account(&coldkey, &hotkey, stake_to_be_removed);
-
-        // --- 8. We add the balancer to the coldkey.  If the above fails we will not credit this coldkey.
-=======
         // We remove the balance from the hotkey.
         Self::decrease_stake_on_coldkey_hotkey_account(&coldkey, &hotkey, stake_to_be_removed);
 
         // We add the balancer to the coldkey.  If the above fails we will not credit this coldkey.
->>>>>>> origin/development
         Self::add_balance_to_coldkey_account(&coldkey, stake_to_be_removed);
 
         // Set last block for rate limiting
         let block: u64 = Self::get_current_block_as_u64();
         Self::set_last_tx_block(&coldkey, block);
 
-<<<<<<< HEAD
-        // --- 9. Emit the unstaking event.
-=======
         // Emit the unstaking event.
->>>>>>> origin/development
         Self::set_stakes_this_interval_for_coldkey_hotkey(
             &coldkey,
             &hotkey,
@@ -382,11 +327,7 @@ impl<T: Config> Pallet<T> {
         );
         Self::deposit_event(Event::StakeRemoved(hotkey, stake_to_be_removed));
 
-<<<<<<< HEAD
-        // --- 10. Done and ok.
-=======
         // Done and ok.
->>>>>>> origin/development
         Ok(())
     }
 
@@ -610,15 +551,9 @@ impl<T: Config> Pallet<T> {
             if stake < Self::get_nominator_min_required_stake() {
                 // Remove the stake from the nominator account. (this is a more forceful unstake operation which )
                 // Actually deletes the staking account.
-<<<<<<< HEAD
-                Self::empty_stake_on_coldkey_hotkey_account(&coldkey, &hotkey);
-                // Add the stake to the coldkey account.
-                Self::add_balance_to_coldkey_account(&coldkey, stake);
-=======
                 Self::empty_stake_on_coldkey_hotkey_account(coldkey, hotkey);
-                // Convert the removed stake back to balance and add it to the coldkey account.
+                // Add the stake to the coldkey account.
                 Self::add_balance_to_coldkey_account(coldkey, stake);
->>>>>>> origin/development
             }
         }
     }
@@ -705,7 +640,6 @@ impl<T: Config> Pallet<T> {
                 hotkey,
             )
         {
-<<<<<<< HEAD
             // Remove the stake from the coldkey - hotkey pairing.
             Self::decrease_stake_on_coldkey_hotkey_account(
                 &delegate_coldkey_i,
@@ -718,15 +652,6 @@ impl<T: Config> Pallet<T> {
                 &delegate_coldkey_i,
                 stake_i,
             );
-=======
-            // Stake is successfully converted to balance.
-
-            // Remove the stake from the coldkey - hotkey pairing.
-            Self::decrease_stake_on_coldkey_hotkey_account(&delegate_coldkey_i, hotkey, stake_i);
-
-            // Add the balance to the coldkey account.
-            Self::add_balance_to_coldkey_account(&delegate_coldkey_i, stake_i);
->>>>>>> origin/development
         }
     }
 }