Skip to content

Commit 31230f1

Browse files
committed
chore: address more clippy warnings
1 parent 555be57 commit 31230f1

File tree

11 files changed

+1994
-2162
lines changed

11 files changed

+1994
-2162
lines changed

aggregation_mode/batcher/src/payments.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ impl PaymentsPoller {
6969
Self {
7070
db,
7171
proof_aggregation_service,
72-
rpc_provider: rpc_provider,
72+
rpc_provider,
7373
}
7474
}
7575

@@ -109,7 +109,7 @@ impl PaymentsPoller {
109109
tracing::warn!("Skipping payment event for {address}: missing tx hash");
110110
continue;
111111
};
112-
let tx_hash = format!("{:#x}", tx_hash);
112+
let tx_hash = format!("{tx_hash:#x}");
113113

114114
let Ok(amount) = BigDecimal::from_str(&payment_event.amount.to_string()) else {
115115
continue;

aggregation_mode/batcher/src/server/http.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -219,10 +219,8 @@ impl BatcherServer {
219219
"merkle_path": merkle_path
220220
})))
221221
}
222-
Err(_) => {
223-
return HttpResponse::InternalServerError()
224-
.json(AppResponse::new_unsucessfull("Internal server error", 500))
225-
}
222+
Err(_) => HttpResponse::InternalServerError()
223+
.json(AppResponse::new_unsucessfull("Internal server error", 500)),
226224
}
227225
}
228226
}

aggregation_mode/proof_aggregator/aggregation_programs/risc0/src/chunk_aggregator_main.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ risc0_zkvm::guest::entry!(main);
88

99
// Generated with `make proof_aggregator_write_program_ids` and copied from program_ids.json
1010
pub const USER_PROOFS_AGGREGATOR_PROGRAM_IMAGE_ID: [u8; 32] = [
11-
253, 36, 51, 43, 163, 223, 190, 136, 60, 123, 233, 240, 170, 213, 170, 76, 117, 219, 15, 0, 47,
12-
81, 218, 228, 232, 218, 86, 42, 145, 190, 144, 161,
11+
86, 146, 102, 198, 206, 75, 142, 66, 123, 251, 236, 150, 2, 205, 75, 142, 237, 255, 93, 54, 2,
12+
16, 190, 188, 246, 3, 188, 241, 235, 64, 220, 228,
1313
];
1414

1515
fn main() {
@@ -33,8 +33,7 @@ fn main() {
3333
.try_into()
3434
.expect("Public input to be the chunk merkle root");
3535

36-
let leaves_commitment: Vec<Hash32> =
37-
leaves_commitment.into_iter().map(|el| Hash32(el)).collect();
36+
let leaves_commitment: Vec<Hash32> = leaves_commitment.into_iter().map(Hash32).collect();
3837
let merkle_tree = MerkleTree::<Hash32>::build(&leaves_commitment).unwrap();
3938
assert!(merkle_root == merkle_tree.root);
4039

aggregation_mode/proof_aggregator/aggregation_programs/risc0/src/user_proofs_aggregator_main.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ fn main() {
1010
let input = env::read::<UserProofsAggregatorInput>();
1111

1212
for proof in &input.proofs_image_id_and_pub_inputs {
13-
env::verify(proof.image_id.clone(), &proof.public_inputs)
14-
.expect("proof to be verified correctly");
13+
env::verify(proof.image_id, &proof.public_inputs).expect("proof to be verified correctly");
1514
}
1615

1716
let merkle_tree =

aggregation_mode/proof_aggregator/aggregation_programs/sp1/src/chunk_aggregator_main.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@ pub fn main() {
3333
.expect("Public input to be the hash of the chunk tree");
3434

3535
// Reconstruct the merkle tree and verify that the roots match
36-
let leaves_commitment: Vec<Hash32> =
37-
leaves_commitment.into_iter().map(|el| Hash32(el)).collect();
36+
let leaves_commitment: Vec<Hash32> = leaves_commitment.into_iter().map(Hash32).collect();
3837
let merkle_tree: MerkleTree<Hash32> = MerkleTree::build(&leaves_commitment).unwrap();
3938
assert!(merkle_tree.root == merkle_root);
4039

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"risc0_chunk_aggregator_image_id": "0xd8cfdd5410c70395c0a1af1842a0148428cc46e353355faccfba694dd4862dbf",
3-
"risc0_user_proofs_aggregator_image_id": "0xfd24332ba3dfbe883c7be9f0aad5aa4c75db0f002f51dae4e8da562a91be90a1",
4-
"risc0_user_proofs_aggregator_image_id_bytes": "[253, 36, 51, 43, 163, 223, 190, 136, 60, 123, 233, 240, 170, 213, 170, 76, 117, 219, 15, 0, 47, 81, 218, 228, 232, 218, 86, 42, 145, 190, 144, 161]",
5-
"sp1_chunk_aggregator_vk_hash": "0x007df9874549bf8d4c135c40eae4a1b182677356699e528ba0305b3dcc774090",
2+
"risc0_chunk_aggregator_image_id": "0x8908f01022827e80a5de71908c16ee44f4a467236df20f62e7c994491629d74c",
3+
"risc0_user_proofs_aggregator_image_id": "0x569266c6ce4b8e427bfbec9602cd4b8eedff5d360210bebcf603bcf1eb40dce4",
4+
"risc0_user_proofs_aggregator_image_id_bytes": "[86, 146, 102, 198, 206, 75, 142, 66, 123, 251, 236, 150, 2, 205, 75, 142, 237, 255, 93, 54, 2, 16, 190, 188, 246, 3, 188, 241, 235, 64, 220, 228]",
5+
"sp1_chunk_aggregator_vk_hash": "0x00d6e32a34f68ea643362b96615591c94ee0bf99ee871740ab2337966a4f77af",
66
"sp1_user_proofs_aggregator_vk_hash": "0x00a0fe3e73d4dd5f66369c60629213c8a037da04f8f68724c8a15ed1d20a0d5e",
77
"sp1_user_proofs_aggregator_vk_hash_words": "[1350508345, 1966561241, 1188269068, 690044042, 29282343, 1675238547, 289586595, 1376390494]"
88
}

contracts/scripts/anvil/state/alignedlayer-deployed-anvil-state.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

contracts/scripts/anvil/state/eigenlayer-deployed-anvil-state.json

Lines changed: 1974 additions & 2137 deletions
Large diffs are not rendered by default.

contracts/scripts/anvil/state/risc0-deployed-anvil-state.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

contracts/scripts/anvil/state/sp1-deployed-anvil-state.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)