Skip to content

Commit 852100d

Browse files
ananas-blockananas-block
committed
chore: rename start_offset -> start_queue_index, zkp_batch_size -> limit, num_elements -> limit
1 parent e05df82 commit 852100d

File tree

4 files changed

+34
-34
lines changed

4 files changed

+34
-34
lines changed

‎src/api/method/get_batch_address_update_info.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ use crate::ingester::persist::persisted_state_tree::get_subtrees;
1717
#[serde(deny_unknown_fields, rename_all = "camelCase")]
1818
pub struct GetBatchAddressUpdateInfoRequest {
1919
pub tree: SerializablePubkey,
20-
pub start_offset: Option<u64>,
21-
pub batch_size: u16,
20+
pub start_queue_index: Option<u64>,
21+
pub limit: u16,
2222
}
2323

2424
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, ToSchema, Default)]
@@ -55,7 +55,7 @@ pub async fn get_batch_address_update_info(
5555
conn: &DatabaseConnection,
5656
request: GetBatchAddressUpdateInfoRequest,
5757
) -> Result<GetBatchAddressUpdateInfoResponse, PhotonApiError> {
58-
let batch_size = request.batch_size;
58+
let limit = request.limit;
5959
let merkle_tree_pubkey = request.tree;
6060
let tree_info = TreeInfo::get(&merkle_tree_pubkey.to_string())
6161
.ok_or_else(|| PhotonApiError::UnexpectedError("Failed to get tree info".to_string()))?
@@ -87,8 +87,8 @@ pub async fn get_batch_address_update_info(
8787
None => 1,
8888
};
8989

90-
let offset_condition = match request.start_offset {
91-
Some(start_offset) => format!("AND queue_index >= {}", start_offset),
90+
let offset_condition = match request.start_queue_index {
91+
Some(start_queue_index) => format!("AND queue_index >= {}", start_queue_index),
9292
None => String::new(),
9393
};
9494

@@ -103,7 +103,7 @@ pub async fn get_batch_address_update_info(
103103
LIMIT {}",
104104
format_bytes(merkle_tree.clone(), tx.get_database_backend()),
105105
offset_condition,
106-
batch_size
106+
limit
107107
),
108108
);
109109

‎src/api/method/get_queue_elements.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ use crate::ingester::persist::get_multiple_compressed_leaf_proofs_by_indices;
1818
#[serde(deny_unknown_fields, rename_all = "camelCase")]
1919
pub struct GetQueueElementsRequest {
2020
pub tree: Hash,
21-
pub start_offset: Option<u64>,
22-
pub num_elements: u16,
21+
pub start_queue_index: Option<u64>,
22+
pub limit: u16,
2323
pub queue_type: u8,
2424
}
2525

@@ -57,7 +57,7 @@ pub async fn get_queue_elements(
5757
request: GetQueueElementsRequest,
5858
) -> Result<GetQueueElementsResponse, PhotonApiError> {
5959
let queue_type = QueueType::from(request.queue_type as u64);
60-
let num_elements = request.num_elements;
60+
let limit = request.limit;
6161
let context = Context::extract(conn).await?;
6262
let tx = conn.begin().await?;
6363
if tx.get_database_backend() == DatabaseBackend::Postgres {
@@ -75,16 +75,16 @@ pub async fn get_queue_elements(
7575
QueueType::InputStateV2 => {
7676
query_condition =
7777
query_condition.add(accounts::Column::NullifierQueueIndex.is_not_null());
78-
if let Some(start_offset) = request.start_offset {
78+
if let Some(start_queue_index) = request.start_queue_index {
7979
query_condition = query_condition
80-
.add(accounts::Column::NullifierQueueIndex.gte(start_offset as i64));
80+
.add(accounts::Column::NullifierQueueIndex.gte(start_queue_index as i64));
8181
}
8282
}
8383
QueueType::OutputStateV2 => {
8484
query_condition = query_condition.add(accounts::Column::InOutputQueue.eq(true));
85-
if let Some(start_offset) = request.start_offset {
85+
if let Some(start_queue_index) = request.start_queue_index {
8686
query_condition =
87-
query_condition.add(accounts::Column::LeafIndex.gte(start_offset as i64));
87+
query_condition.add(accounts::Column::LeafIndex.gte(start_queue_index as i64));
8888
}
8989
}
9090
_ => {
@@ -111,7 +111,7 @@ pub async fn get_queue_elements(
111111
};
112112

113113
let queue_elements: Vec<QueueElement> = query
114-
.limit(num_elements as u64)
114+
.limit(limit as u64)
115115
.into_model::<QueueElement>()
116116
.all(&tx)
117117
.await

‎tests/integration_tests/batched_address_tree_tests.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,8 @@ async fn run_batched_address_test(
165165
.api
166166
.get_batch_address_update_info(GetBatchAddressUpdateInfoRequest {
167167
tree: address_tree_pubkey.to_bytes().into(),
168-
start_offset: None,
169-
batch_size: 100,
168+
start_queue_index: None,
169+
limit: 100,
170170
})
171171
.await
172172
.expect("Failed to get address queue elements before batch update");
@@ -213,8 +213,8 @@ async fn run_batched_address_test(
213213
.api
214214
.get_batch_address_update_info(GetBatchAddressUpdateInfoRequest {
215215
tree: address_tree_pubkey.to_bytes().into(),
216-
start_offset: None,
217-
batch_size: 100,
216+
start_queue_index: None,
217+
limit: 100,
218218
})
219219
.await
220220
.expect("Failed to get address queue elements after batch update");

‎tests/integration_tests/batched_state_tree_tests.rs

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -161,9 +161,9 @@ async fn test_batched_tree_transactions(
161161
.api
162162
.get_queue_elements(GetQueueElementsRequest {
163163
tree: merkle_tree_pubkey.to_bytes().into(),
164-
start_offset: None,
164+
start_queue_index: None,
165165
queue_type: QueueType::OutputStateV2 as u8,
166-
num_elements: 100,
166+
limit: 100,
167167
})
168168
.await
169169
.unwrap();
@@ -187,9 +187,9 @@ async fn test_batched_tree_transactions(
187187
.api
188188
.get_queue_elements(GetQueueElementsRequest {
189189
tree: merkle_tree_pubkey.to_bytes().into(),
190-
start_offset: None,
190+
start_queue_index: None,
191191
queue_type: QueueType::InputStateV2 as u8,
192-
num_elements: 100,
192+
limit: 100,
193193
})
194194
.await
195195
.unwrap();
@@ -274,19 +274,19 @@ async fn test_batched_tree_transactions(
274274
.api
275275
.get_queue_elements(GetQueueElementsRequest {
276276
tree: merkle_tree_pubkey.to_bytes().into(),
277-
start_offset: None,
277+
start_queue_index: None,
278278
queue_type: QueueType::OutputStateV2 as u8,
279-
num_elements: 100,
279+
limit: 100,
280280
})
281281
.await
282282
.unwrap();
283283
let pre_input_queue_elements = setup
284284
.api
285285
.get_queue_elements(GetQueueElementsRequest {
286286
tree: merkle_tree_pubkey.to_bytes().into(),
287-
start_offset: None,
287+
start_queue_index: None,
288288
queue_type: QueueType::InputStateV2 as u8,
289-
num_elements: 100,
289+
limit: 100,
290290
})
291291
.await
292292
.unwrap();
@@ -303,19 +303,19 @@ async fn test_batched_tree_transactions(
303303
.api
304304
.get_queue_elements(GetQueueElementsRequest {
305305
tree: merkle_tree_pubkey.to_bytes().into(),
306-
start_offset: None,
306+
start_queue_index: None,
307307
queue_type: QueueType::OutputStateV2 as u8,
308-
num_elements: 100,
308+
limit: 100,
309309
})
310310
.await
311311
.unwrap();
312312
let post_input_queue_elements = setup
313313
.api
314314
.get_queue_elements(GetQueueElementsRequest {
315315
tree: merkle_tree_pubkey.to_bytes().into(),
316-
start_offset: None,
316+
start_queue_index: None,
317317
queue_type: QueueType::InputStateV2 as u8,
318-
num_elements: 100,
318+
limit: 100,
319319
})
320320
.await
321321
.unwrap();
@@ -441,9 +441,9 @@ async fn test_batched_tree_transactions(
441441
.api
442442
.get_queue_elements(GetQueueElementsRequest {
443443
tree: merkle_tree_pubkey.to_bytes().into(),
444-
start_offset: None,
444+
start_queue_index: None,
445445
queue_type: QueueType::OutputStateV2 as u8,
446-
num_elements: 100,
446+
limit: 100,
447447
})
448448
.await
449449
.unwrap();
@@ -457,9 +457,9 @@ async fn test_batched_tree_transactions(
457457
.api
458458
.get_queue_elements(GetQueueElementsRequest {
459459
tree: merkle_tree_pubkey.to_bytes().into(),
460-
start_offset: None,
460+
start_queue_index: None,
461461
queue_type: QueueType::InputStateV2 as u8,
462-
num_elements: 100,
462+
limit: 100,
463463
})
464464
.await
465465
.unwrap();

0 commit comments

Comments
 (0)