-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* feat: add `TickBitMap` and `TickBitMapProvider` Introduce `TickBitMap` and `TickBitMapProvider` for improved tick data management. Updated `TickMap` to utilize these abstractions, simplifying code. Also, upgraded dependencies to latest versions. * Update `get_word` function in `tick_bit_map.rs` Changed the return value handling of `get_word` to dereference the reference directly, improving readability and potentially slightly optimizing performance. This change ensures consistency with Rust's idiomatic handling of references.
- Loading branch information
Showing
4 changed files
with
85 additions
and
41 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| //! ## Tick Bit Map | ||
| //! The [`TickBitMapProvider`] trait provides | ||
| //! [`TickBitMapProvider::next_initialized_tick_within_one_word`] for a tick bit map that implements | ||
| //! [`TickBitMapProvider::get_word`]. | ||
|
|
||
| use crate::prelude::*; | ||
| use alloy::uint; | ||
| use alloy_primitives::{aliases::I24, U256}; | ||
| use rustc_hash::FxHashMap; | ||
|
|
||
| pub type TickBitMap<I = I24> = FxHashMap<I, U256>; | ||
|
|
||
| /// Provides [`Self::next_initialized_tick_within_one_word`] for a tick bit map that implements | ||
| /// [`Self::get_word`] | ||
| pub trait TickBitMapProvider { | ||
| type Index: TickIndex; | ||
|
|
||
| /// Get a bit map word at a specific index | ||
| fn get_word(&self, index: Self::Index) -> U256; | ||
|
|
||
| #[inline] | ||
| fn next_initialized_tick_within_one_word( | ||
| &self, | ||
| tick: Self::Index, | ||
| lte: bool, | ||
| tick_spacing: Self::Index, | ||
| ) -> Result<(Self::Index, bool), Error> { | ||
| let compressed = tick.compress(tick_spacing); | ||
| if lte { | ||
| let (word_pos, bit_pos) = compressed.position(); | ||
| // all the 1s at or to the right of the current `bit_pos` | ||
| // (2 << bitPos) may overflow but fine since 2 << 255 = 0 | ||
| let mask = (TWO << bit_pos) - uint!(1_U256); | ||
| let word = self.get_word(word_pos); | ||
| let masked = word & mask; | ||
| let initialized = masked != U256::ZERO; | ||
| let msb = if initialized { | ||
| masked.most_significant_bit() as u8 as i32 | ||
| } else { | ||
| 0 | ||
| } | ||
| .try_into() | ||
| .unwrap(); | ||
| let next = ((word_pos << 8) + msb) * tick_spacing; | ||
| Ok((next, initialized)) | ||
| } else { | ||
| // start from the word of the next tick, since the current tick state doesn't matter | ||
| let compressed = compressed + Self::Index::ONE; | ||
| let (word_pos, bit_pos) = compressed.position(); | ||
| // all the 1s at or to the left of the `bit_pos` | ||
| let mask = U256::ZERO - (uint!(1_U256) << bit_pos); | ||
| let word = self.get_word(word_pos); | ||
| let masked = word & mask; | ||
| let initialized = masked != U256::ZERO; | ||
| let lsb = if initialized { | ||
| masked.least_significant_bit() as u8 as i32 | ||
| } else { | ||
| 255 | ||
| } | ||
| .try_into() | ||
| .unwrap(); | ||
| let next = ((word_pos << 8) + lsb) * tick_spacing; | ||
| Ok((next, initialized)) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| impl<I: TickIndex> TickBitMapProvider for TickBitMap<I> { | ||
| type Index = I; | ||
|
|
||
| #[inline] | ||
| fn get_word(&self, index: Self::Index) -> U256 { | ||
| *self.get(&index).unwrap_or(&U256::ZERO) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters