Skip to content

Commit e8654bd

Browse files
committed
Fix format
1 parent 2d5ab6a commit e8654bd

File tree

3 files changed

+14
-21
lines changed

3 files changed

+14
-21
lines changed

Makefile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -393,8 +393,6 @@ batcher_send_sp1_task:
393393
--vm_program ../../scripts/test_files/sp1/sp1_fibonacci_4_1_3.elf \
394394
--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657 \
395395
--rpc_url $(RPC_URL) \
396-
--max_fee $(MAX_FEE) \
397-
--private_key 0x224b7eb7449992aac96d631d9677f7bf5888245eef6d6eeda31e62d2f29a83e4 \
398396
--network $(NETWORK)
399397

400398
batcher_send_sp1_burst:
@@ -420,7 +418,6 @@ batcher_send_risc0_task:
420418
--vm_program ../../scripts/test_files/risc_zero/fibonacci_proof_generator/fibonacci_id_2_0.bin \
421419
--public_input ../../scripts/test_files/risc_zero/fibonacci_proof_generator/risc_zero_fibonacci_2_0.pub \
422420
--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657 \
423-
--private_key 0xc7f9f3b5c5a35632e8a8720e84b39d3987bfb01dbfd305bf359d9bb891ec5596 \
424421
--rpc_url $(RPC_URL) \
425422
--network $(NETWORK)
426423

batcher/aligned-batcher/src/lib.rs

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1049,26 +1049,23 @@ impl Batcher {
10491049

10501050
let max_fee = verification_data.max_fee;
10511051
let nonce = verification_data.nonce;
1052-
1053-
info!("ME llega max_fee {}", max_fee);
1054-
1055-
let new_entry = BatchQueueEntry::new(
1056-
verification_data,
1057-
verification_data_comm,
1058-
ws_conn_sink,
1059-
proof_submitter_sig,
1060-
proof_submitter_addr,
1052+
batch_state_lock.batch_queue.push(
1053+
BatchQueueEntry::new(
1054+
verification_data,
1055+
verification_data_comm,
1056+
ws_conn_sink,
1057+
proof_submitter_sig,
1058+
proof_submitter_addr,
1059+
),
1060+
BatchQueueEntryPriority::new(max_fee, nonce),
10611061
);
1062-
let new_entry_priority = BatchQueueEntryPriority::new(max_fee, nonce);
1063-
1064-
batch_state_lock
1065-
.batch_queue
1066-
.push(new_entry, new_entry_priority);
10671062

10681063
let batch_queue_len = batch_state_lock.batch_queue.len();
10691064

1070-
// if max batch qty exceded, remove least priority proof
1065+
// if max batch qty exceded, remove least priority element
10711066
if batch_queue_len > self.max_batch_proof_qty {
1067+
info!("Queue limit exceded, removing least priority element");
1068+
10721069
if let Some(lowest_priority_entry) = batch_state_lock.batch_queue.pop_min() {
10731070
send_message(
10741071
lowest_priority_entry.0.messaging_sink.unwrap(),
@@ -1081,7 +1078,6 @@ impl Batcher {
10811078
// Update metrics
10821079
let queue_len = batch_state_lock.batch_queue.len();
10831080
let queue_size_bytes = calculate_batch_size(&batch_state_lock.batch_queue)?;
1084-
10851081
self.metrics
10861082
.update_queue_metrics(queue_len as i64, queue_size_bytes as i64);
10871083

batcher/aligned-batcher/src/types/batch_queue.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ pub(crate) struct BatchQueueEntry {
2626

2727
#[derive(Clone)]
2828
pub(crate) struct BatchQueueEntryPriority {
29-
pub max_fee: U256,
30-
pub nonce: U256,
29+
max_fee: U256,
30+
nonce: U256,
3131
}
3232

3333
impl BatchQueueEntry {

0 commit comments

Comments
 (0)