Format with cargo fmt

Author: gregzaitsev

pallets/admin-utils/tests/tests.rs

@@ -1073,11 +1073,17 @@ fn test_sudo_set_tx_delegate_take_rate_limit() {
             ),
             Err(DispatchError::BadOrigin.into())
         );
-        assert_eq!(SubtensorModule::get_tx_delegate_take_rate_limit(), init_value);
+        assert_eq!(
+            SubtensorModule::get_tx_delegate_take_rate_limit(),
+            init_value
+        );
         assert_ok!(AdminUtils::sudo_set_tx_delegate_take_rate_limit(
             <<Test as Config>::RuntimeOrigin>::root(),
             to_be_set
         ));
-        assert_eq!(SubtensorModule::get_tx_delegate_take_rate_limit(), to_be_set);
+        assert_eq!(
+            SubtensorModule::get_tx_delegate_take_rate_limit(),
+            to_be_set
+        );
     });
 }

pallets/subtensor/src/lib.rs

@@ -596,7 +596,8 @@ pub mod pallet {
     #[pallet::storage] // --- ITEM ( tx_rate_limit )
     pub(super) type TxRateLimit<T> = StorageValue<_, u64, ValueQuery, DefaultTxRateLimit<T>>;
     #[pallet::storage] // --- ITEM ( tx_rate_limit )
-    pub(super) type TxDelegateTakeRateLimit<T> = StorageValue<_, u64, ValueQuery, DefaultTxDelegateTakeRateLimit<T>>;
+    pub(super) type TxDelegateTakeRateLimit<T> =
+        StorageValue<_, u64, ValueQuery, DefaultTxDelegateTakeRateLimit<T>>;
     #[pallet::storage] // --- MAP ( key ) --> last_block
     pub(super) type LastTxBlock<T: Config> =
         StorageMap<_, Identity, T::AccountId, u64, ValueQuery, DefaultLastTxBlock<T>>;
@@ -912,7 +913,7 @@ pub mod pallet {
         MinBurnSet(u16, u64),          // --- Event created when setting min burn on a network.
         TxRateLimitSet(u64),           // --- Event created when setting the transaction rate limit.
         TxDelegateTakeRateLimitSet(u64), // --- Event created when setting the delegate take transaction rate limit.
-        Sudid(DispatchResult),         // --- Event created when a sudo call is done.
+        Sudid(DispatchResult),           // --- Event created when a sudo call is done.
         RegistrationAllowed(u16, bool), // --- Event created when registration is allowed/disallowed for a subnet.
         PowRegistrationAllowed(u16, bool), // --- Event created when POW registration is allowed/disallowed for a subnet.
         TempoSet(u16, u16),                // --- Event created when setting tempo on a network
@@ -927,8 +928,8 @@ pub mod pallet {
         NetworkMinLockCostSet(u64),   // Event created when the network minimum locking cost is set.
         SubnetLimitSet(u16),          // Event created when the maximum number of subnets is set
         NetworkLockCostReductionIntervalSet(u64), // Event created when the lock cost reduction is set
-        TakeDecreased( T::AccountId, T::AccountId, u16 ), // Event created when the take for a delegate is decreased.
-        TakeIncreased( T::AccountId, T::AccountId, u16 ), // Event created when the take for a delegate is increased.
+        TakeDecreased(T::AccountId, T::AccountId, u16), // Event created when the take for a delegate is decreased.
+        TakeIncreased(T::AccountId, T::AccountId, u16), // Event created when the take for a delegate is increased.
         HotkeySwapped {
             coldkey: T::AccountId,
             old_hotkey: T::AccountId,

pallets/subtensor/src/staking.rs

@@ -70,10 +70,7 @@ impl<T: Config> Pallet<T> {
 
         // --- 5.1 Ensure take is within the 0 ..= InitialDefaultTake (18%) range
         let max_take = T::InitialDefaultTake::get();
-        ensure!(
-            take <= max_take,
-            Error::<T>::InvalidTake
-        );
+        ensure!(take <= max_take, Error::<T>::InvalidTake);
 
         // --- 6. Delegate the key.
         Self::delegate_hotkey(&hotkey, take);
@@ -138,10 +135,7 @@ impl<T: Config> Pallet<T> {
 
         // --- 3. Ensure we are always strictly decreasing, never increasing take
         if let Ok(current_take) = Delegates::<T>::try_get(&hotkey) {
-            ensure!(
-                take < current_take,
-                Error::<T>::InvalidTake
-            );
+            ensure!(take < current_take, Error::<T>::InvalidTake);
         }
 
         // --- 4. Set the new take value.
@@ -206,23 +200,20 @@ impl<T: Config> Pallet<T> {
 
         // --- 3. Ensure we are strinctly increasing take
         if let Ok(current_take) = Delegates::<T>::try_get(&hotkey) {
-            ensure!(
-                take > current_take,
-                Error::<T>::InvalidTake
-            );
+            ensure!(take > current_take, Error::<T>::InvalidTake);
         }
 
         // --- 4. Ensure take is within the 0 ..= InitialDefaultTake (18%) range
         let max_take = T::InitialDefaultTake::get();
-        ensure!(
-            take <= max_take,
-            Error::<T>::InvalidTake
-        );
+        ensure!(take <= max_take, Error::<T>::InvalidTake);
 
         // --- 5. Enforce the rate limit (independently on do_add_stake rate limits)
         let block: u64 = Self::get_current_block_as_u64();
         ensure!(
-            !Self::exceeds_tx_delegate_take_rate_limit(Self::get_last_tx_block_delegate_take(&coldkey), block),
+            !Self::exceeds_tx_delegate_take_rate_limit(
+                Self::get_last_tx_block_delegate_take(&coldkey),
+                block
+            ),
             Error::<T>::TxRateLimitExceeded
         );
 

pallets/subtensor/src/utils.rs

@@ -288,10 +288,7 @@ impl<T: Config> Pallet<T> {
     // ========================
     // ===== Take checks ======
     // ========================
-    pub fn do_take_checks(
-        coldkey: &T::AccountId,
-        hotkey: &T::AccountId,
-    ) -> Result<(), Error<T>> {
+    pub fn do_take_checks(coldkey: &T::AccountId, hotkey: &T::AccountId) -> Result<(), Error<T>> {
         // Ensure we are delegating a known key.
         ensure!(
             Self::hotkey_account_exists(hotkey),

pallets/subtensor/tests/staking.rs

@@ -2705,8 +2705,8 @@ fn test_remove_stake_below_minimum_threshold() {
 #[test]
 fn test_delegate_take_limit() {
     new_test_ext(1).execute_with(|| {
-        assert_eq!(InitialDefaultTake::get() >= u16::MAX/2, true);
-        assert_eq!(InitialDefaultTake::get() <= u16::MAX-1, true);
+        assert_eq!(InitialDefaultTake::get() >= u16::MAX / 2, true);
+        assert_eq!(InitialDefaultTake::get() <= u16::MAX - 1, true);
     });
 }
 
@@ -2886,7 +2886,10 @@ fn test_delegate_take_can_be_increased_to_limit() {
             hotkey0,
             InitialDefaultTake::get()
         ));
-        assert_eq!(SubtensorModule::get_hotkey_take(&hotkey0), InitialDefaultTake::get());
+        assert_eq!(
+            SubtensorModule::get_hotkey_take(&hotkey0),
+            InitialDefaultTake::get()
+        );
     });
 }
 
@@ -2914,7 +2917,7 @@ fn test_delegate_take_can_not_be_set_beyond_limit() {
                 SubtensorModule::do_become_delegate(
                     <<Test as Config>::RuntimeOrigin>::signed(coldkey0),
                     hotkey0,
-                    InitialDefaultTake::get()+1
+                    InitialDefaultTake::get() + 1
                 ),
                 Err(Error::<Test>::InvalidTake.into())
             );
@@ -2954,7 +2957,7 @@ fn test_delegate_take_can_not_be_increased_beyond_limit() {
                 SubtensorModule::do_increase_take(
                     <<Test as Config>::RuntimeOrigin>::signed(coldkey0),
                     hotkey0,
-                    InitialDefaultTake::get()+1
+                    InitialDefaultTake::get() + 1
                 ),
                 Err(Error::<Test>::InvalidTake.into())
             );
@@ -3007,6 +3010,5 @@ fn test_rate_limits_enforced_on_increase_take() {
             u16::MAX / 10
         ));
         assert_eq!(SubtensorModule::get_hotkey_take(&hotkey0), u16::MAX / 10);
-
     });
 }