Skip to content

Commit e33b6e5

Browse files
feat: add public getters to BaselinePoolState and BaselineLiquidity
Adds accessor methods needed by downstream consumers (cefi) to decompose pool state for ring buffer transport: - BaselinePoolState::liquidity() / liquidity_mut() - BaselineLiquidity::tick_spacing(), start_tick(), start_sqrt_price(), start_liquidity() Removes duplicate get_baseline_liquidity/get_baseline_liquidity_mut, get_current_tick, get_tick_spacing in favor of the cleaner names. Co-Authored-By: Frankenstein <263438330+frankenstien-dev@users.noreply.github.com>
1 parent c6c9ce2 commit e33b6e5

6 files changed

Lines changed: 21 additions & 37 deletions

File tree

crates/uni-v4-common/src/pools.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ impl<T: V4Network> UniswapPools<T> {
164164
continue;
165165
};
166166

167-
let baseline = pool.value_mut().get_baseline_liquidity_mut();
167+
let baseline = pool.value_mut().liquidity_mut();
168168

169169
// Merge new ticks with existing ones
170170
baseline.initialized_ticks_mut().extend(ticks);

crates/uni-v4-structure/src/lib.rs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -340,11 +340,5 @@ impl<T: V4Network> BaselinePoolState<T> {
340340

341341
pub fn liquidity(&self) -> &BaselineLiquidity { &self.liquidity }
342342

343-
pub fn get_baseline_liquidity(&self) -> &BaselineLiquidity {
344-
&self.liquidity
345-
}
346-
347-
pub fn get_baseline_liquidity_mut(&mut self) -> &mut BaselineLiquidity {
348-
&mut self.liquidity
349-
}
343+
pub fn liquidity_mut(&mut self) -> &mut BaselineLiquidity { &mut self.liquidity }
350344
}

crates/uni-v4-structure/src/liquidity_base.rs

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -320,16 +320,6 @@ impl BaselineLiquidity {
320320
self.initialized_ticks.keys().max().copied()
321321
}
322322

323-
/// Get the current tick
324-
pub fn get_current_tick(&self) -> i32 {
325-
self.start_tick
326-
}
327-
328-
/// Get the tick spacing
329-
pub fn get_tick_spacing(&self) -> i32 {
330-
self.tick_spacing
331-
}
332-
333323
pub fn tick_spacing(&self) -> i32 { self.tick_spacing }
334324

335325
pub fn start_tick(&self) -> i32 { self.start_tick }

crates/uni-v4-upkeeper/src/baseline_pool_factory.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -743,10 +743,10 @@ where
743743
pool_state: &BaselinePoolState<T>,
744744
block_number: Option<u64>
745745
) -> bool {
746-
let baseline = pool_state.get_baseline_liquidity();
746+
let baseline = pool_state.liquidity();
747747

748-
let current_tick = baseline.get_current_tick();
749-
let tick_spacing = baseline.get_tick_spacing();
748+
let current_tick = baseline.start_tick();
749+
let tick_spacing = baseline.tick_spacing();
750750

751751
// Get min and max initialized ticks
752752
let Some(min_tick) = baseline.get_min_initialized_tick() else {

crates/uni-v4/tests/l1_integration_test.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -194,14 +194,14 @@ async fn test_pool_state_consistency() {
194194
for pool_id in &tracked_pool_ids {
195195
if let Some(pool_ref) = updated_pools.get_pools().get(pool_id) {
196196
let pool_state = pool_ref.value();
197-
let baseline = pool_state.get_baseline_liquidity();
197+
let baseline = pool_state.liquidity();
198198

199199
// Capture complete state
200200
let snapshot = PoolStateSnapshot {
201-
current_tick: baseline.get_current_tick(),
201+
current_tick: baseline.start_tick(),
202202
current_liquidity: pool_state.current_liquidity(),
203203
sqrt_price: pool_state.current_price(),
204-
tick_spacing: baseline.get_tick_spacing(),
204+
tick_spacing: baseline.tick_spacing(),
205205
initialized_ticks: baseline.initialized_ticks().clone()
206206
};
207207

@@ -248,18 +248,18 @@ async fn test_pool_state_consistency() {
248248
match (service1_state, fresh_pool_ref) {
249249
(Some(service1_snapshot), Some(fresh_ref)) => {
250250
let fresh = fresh_ref.value();
251-
let fresh_baseline = fresh.get_baseline_liquidity();
251+
let fresh_baseline = fresh.liquidity();
252252

253253
// Compare basic state
254254
let mut mismatches = Vec::new();
255255
let mut subset_valid = true;
256256

257257
// Check basic metrics
258-
if service1_snapshot.current_tick != fresh_baseline.get_current_tick() {
258+
if service1_snapshot.current_tick != fresh_baseline.start_tick() {
259259
mismatches.push(format!(
260260
"current tick: {} vs {}",
261261
service1_snapshot.current_tick,
262-
fresh_baseline.get_current_tick()
262+
fresh_baseline.start_tick()
263263
));
264264
}
265265
if service1_snapshot.current_liquidity != fresh.current_liquidity() {
@@ -276,11 +276,11 @@ async fn test_pool_state_consistency() {
276276
fresh.current_price()
277277
));
278278
}
279-
if service1_snapshot.tick_spacing != fresh_baseline.get_tick_spacing() {
279+
if service1_snapshot.tick_spacing != fresh_baseline.tick_spacing() {
280280
mismatches.push(format!(
281281
"tick spacing: {} vs {}",
282282
service1_snapshot.tick_spacing,
283-
fresh_baseline.get_tick_spacing()
283+
fresh_baseline.tick_spacing()
284284
));
285285
}
286286

crates/uni-v4/tests/l2_integration_test.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -194,14 +194,14 @@ async fn test_pool_state_consistency() {
194194
for pool_id in &tracked_pool_ids {
195195
if let Some(pool_ref) = updated_pools.get_pools().get(pool_id) {
196196
let pool_state = pool_ref.value();
197-
let baseline = pool_state.get_baseline_liquidity();
197+
let baseline = pool_state.liquidity();
198198

199199
// Capture complete state
200200
let snapshot = PoolStateSnapshot {
201-
current_tick: baseline.get_current_tick(),
201+
current_tick: baseline.start_tick(),
202202
current_liquidity: pool_state.current_liquidity(),
203203
sqrt_price: pool_state.current_price(),
204-
tick_spacing: baseline.get_tick_spacing(),
204+
tick_spacing: baseline.tick_spacing(),
205205
initialized_ticks: baseline.initialized_ticks().clone()
206206
};
207207

@@ -248,18 +248,18 @@ async fn test_pool_state_consistency() {
248248
match (service1_state, fresh_pool_ref) {
249249
(Some(service1_snapshot), Some(fresh_ref)) => {
250250
let fresh = fresh_ref.value();
251-
let fresh_baseline = fresh.get_baseline_liquidity();
251+
let fresh_baseline = fresh.liquidity();
252252

253253
// Compare basic state
254254
let mut mismatches = Vec::new();
255255
let mut subset_valid = true;
256256

257257
// Check basic metrics
258-
if service1_snapshot.current_tick != fresh_baseline.get_current_tick() {
258+
if service1_snapshot.current_tick != fresh_baseline.start_tick() {
259259
mismatches.push(format!(
260260
"current tick: {} vs {}",
261261
service1_snapshot.current_tick,
262-
fresh_baseline.get_current_tick()
262+
fresh_baseline.start_tick()
263263
));
264264
}
265265
if service1_snapshot.current_liquidity != fresh.current_liquidity() {
@@ -276,11 +276,11 @@ async fn test_pool_state_consistency() {
276276
fresh.current_price()
277277
));
278278
}
279-
if service1_snapshot.tick_spacing != fresh_baseline.get_tick_spacing() {
279+
if service1_snapshot.tick_spacing != fresh_baseline.tick_spacing() {
280280
mismatches.push(format!(
281281
"tick spacing: {} vs {}",
282282
service1_snapshot.tick_spacing,
283-
fresh_baseline.get_tick_spacing()
283+
fresh_baseline.tick_spacing()
284284
));
285285
}
286286

0 commit comments

Comments
 (0)