Use new active index lookup functions

Author: ales-otf

pallets/swap/src/lib.rs

@@ -1040,7 +1040,7 @@ where
     /// Get fees above a tick
     ///
     fn get_fees_above(&mut self, tick_index: TickIndex, quote: bool) -> U64F64 {
-        let maybe_tick_index = tick_index.find_closest_lower_active(&self.state_ops);
+        let maybe_tick_index = self.find_closest_lower_active_tick_index(tick_index);
         let current_tick = self.get_current_tick_index();
 
         if let Some(tick_index) = maybe_tick_index {
@@ -1072,7 +1072,7 @@ where
 
     /// Get fees below a tick
     fn get_fees_below(&mut self, tick_index: TickIndex, quote: bool) -> U64F64 {
-        let maybe_tick_index = tick_index.find_closest_lower_active(&self.state_ops);
+        let maybe_tick_index = self.find_closest_lower_active_tick_index(tick_index);
         let current_tick = self.get_current_tick_index();
 
         if let Some(tick_index) = maybe_tick_index {

pallets/swap/src/tick.rs

@@ -373,54 +373,6 @@ impl TickIndex {
             }
         }
     }
-
-    /// Find the closest lower active tick index
-    pub fn find_closest_lower_active<Ops, AccountIdType>(&self, ops: &Ops) -> Option<Self>
-    where
-        AccountIdType: Eq,
-        Ops: SwapDataOperations<AccountIdType>,
-    {
-        // TODO: Implement without iteration
-        let mut current_index = *self;
-        loop {
-            if current_index.get() < Self::MIN.get() {
-                return None;
-            }
-            if ops.get_tick_by_index(current_index).is_some() {
-                return Some(current_index);
-            }
-
-            // Create a new index with value one less
-            match current_index.prev() {
-                Ok(next_index) => current_index = next_index,
-                Err(_) => return None, // Return None if we go out of bounds
-            }
-        }
-    }
-
-    /// Find the closest higher active tick index
-    pub fn find_closest_higher_active<Ops, AccountIdType>(&self, ops: &Ops) -> Option<Self>
-    where
-        AccountIdType: Eq,
-        Ops: SwapDataOperations<AccountIdType>,
-    {
-        // TODO: Implement without iteration
-        let mut current_index = *self;
-        loop {
-            if current_index.get() > Self::MAX.get() {
-                return None;
-            }
-            if ops.get_tick_by_index(current_index).is_some() {
-                return Some(current_index);
-            }
-
-            // Create a new index with value one more
-            match current_index.next() {
-                Ok(next_index) => current_index = next_index,
-                Err(_) => return None, // Return None if we go out of bounds
-            }
-        }
-    }
 }
 
 /// A bitmap representation of a tick index position across the three-layer structure