improve efficiency

Author: JohnReedV

pallets/swap/src/pallet/impls.rs

@@ -1362,23 +1362,22 @@ impl<T: Config> Pallet<T> {
         let mechid = T::SubnetInfo::mechanism(netuid.into());
         let v3_initialized = SwapV3Initialized::<T>::get(netuid);
         let user_lp_enabled =
-            <Self as subtensor_swap_interface::SwapHandler<T::AccountId>>::is_user_liquidity_enabled(netuid);
+        <Self as subtensor_swap_interface::SwapHandler<T::AccountId>>::is_user_liquidity_enabled(netuid);
 
         let is_v3_mode = mechid == 1 && v3_initialized;
 
         if is_v3_mode {
             // -------- V3: close every position, aggregate refunds, clear state --------
 
-            // 1) Snapshot all (owner, position_id) under this netuid to avoid iterator aliasing.
+            // 1) Snapshot all (owner, position_id).
             struct CloseItem<A> {
                 owner: A,
                 pos_id: PositionId,
             }
             let mut to_close: sp_std::vec::Vec<CloseItem<T::AccountId>> = sp_std::vec::Vec::new();
-            for ((n, owner, pos_id), _pos) in Positions::<T>::iter() {
-                if n == netuid {
-                    to_close.push(CloseItem { owner, pos_id });
-                }
+
+            for ((owner, pos_id), _pos) in Positions::<T>::iter_prefix((netuid,)) {
+                to_close.push(CloseItem { owner, pos_id });
             }
 
             let protocol_account = Self::protocol_account_id();
@@ -1428,22 +1427,17 @@ impl<T: Config> Pallet<T> {
                 ActiveTickIndexManager::<T>::remove(netuid, ti);
             }
 
-            // 5) Clear storage:
-            // Positions (StorageNMap) – prefix is **(netuid,)** not just netuid.
+            // 5) Clear storage for this netuid.
             let _ = Positions::<T>::clear_prefix((netuid,), u32::MAX, None);
-
-            // Ticks (DoubleMap) – OK to pass netuid as first key.
             let _ = Ticks::<T>::clear_prefix(netuid, u32::MAX, None);
 
-            // Fee globals, price/tick/liquidity, v3 init flag.
             FeeGlobalTao::<T>::remove(netuid);
             FeeGlobalAlpha::<T>::remove(netuid);
             CurrentLiquidity::<T>::remove(netuid);
             CurrentTick::<T>::remove(netuid);
             AlphaSqrtPrice::<T>::remove(netuid);
             SwapV3Initialized::<T>::remove(netuid);
 
-            // Active tick bitmap words (StorageNMap) – prefix is **(netuid,)**.
             let _ = TickIndexBitmapWords::<T>::clear_prefix((netuid,), u32::MAX, None);
             FeeRate::<T>::remove(netuid);
             EnabledUserLiquidity::<T>::remove(netuid);

pallets/swap/src/pallet/tests.rs

@@ -2295,8 +2295,8 @@ fn refund_alpha_single_provider_exact() {
         let (_pos_id, tao_needed, alpha_needed) =
             Pallet::<Test>::do_add_liquidity(netuid, &cold, &hot, tick_low, tick_high, liquidity)
                 .expect("add alpha-only liquidity");
-        assert_eq!(tao_needed, 0, "alpha‑only position must not require TAO");
-        assert!(alpha_needed > 0, "alpha‑only position must require ALPHA");
+        assert_eq!(tao_needed, 0, "alpha-only position must not require TAO");
+        assert!(alpha_needed > 0, "alpha-only position must require ALPHA");
 
         // --- Snapshot BEFORE we withdraw funds (baseline for conservation).
         let alpha_before_hot =