From b2e99c4a8fe3ee038b204d54d8202667c4bdaa54 Mon Sep 17 00:00:00 2001 From: jonesmarvin8 <83104039+jonesmarvin8@users.noreply.github.com> Date: Fri, 20 Mar 2026 11:16:29 -0400 Subject: [PATCH] clippy fixes --- indexer/service/configs/indexer_config.json | 4 +- nssa/src/signature/private_key.rs | 9 +- wallet/src/chain_storage.rs | 134 ++++++-------------- 3 files changed, 45 insertions(+), 102 deletions(-) diff --git a/indexer/service/configs/indexer_config.json b/indexer/service/configs/indexer_config.json index 8b68d062..30ae0e64 100644 --- a/indexer/service/configs/indexer_config.json +++ b/indexer/service/configs/indexer_config.json @@ -1,6 +1,6 @@ { - "home": "./indexer/service", - "consensus_info_polling_interval": "60s", + "home": ".", + "consensus_info_polling_interval": "1s", "bedrock_client_config": { "addr": "http://localhost:8080", "backoff": { diff --git a/nssa/src/signature/private_key.rs b/nssa/src/signature/private_key.rs index 5a8a7dd9..ecb38749 100644 --- a/nssa/src/signature/private_key.rs +++ b/nssa/src/signature/private_key.rs @@ -1,5 +1,6 @@ use std::str::FromStr; +use risc0_zkvm::sha::{Impl, Sha256 as _}; use rand::{Rng as _, rngs::OsRng}; use serde_with::{DeserializeFromStr, SerializeDisplay}; @@ -64,15 +65,15 @@ impl PrivateKey { pub fn tweak(value: &[u8; 32]) -> Result { assert!(Self::is_valid_key(*value)); - let sk = secp256k1::SecretKey::from_byte_array(*value).unwrap(); + let sk = secp256k1::SecretKey::from_byte_array(*value).expect("Expect a valid secret key"); let mut bytes = vec![]; let pk = secp256k1::PublicKey::from_secret_key(&secp256k1::Secp256k1::new(), &sk); bytes.extend_from_slice(&secp256k1::PublicKey::serialize(&pk)); - let hashed: [u8; 32] = Impl::hash_bytes(&bytes).as_bytes().try_into().unwrap(); + let hashed: [u8; 32] = Impl::hash_bytes(&bytes).as_bytes().try_into().expect("Sha256 outputs a 32-byte array"); - PrivateKey::try_new( - sk.add_tweak(&secp256k1::Scalar::from_be_bytes(hashed).unwrap()) + Self::try_new( + sk.add_tweak(&secp256k1::Scalar::from_be_bytes(hashed).expect("Expect a valid secp256k1 Scalar")) .expect("Expect a valid Scalar") .secret_bytes(), ) diff --git a/wallet/src/chain_storage.rs b/wallet/src/chain_storage.rs index 65800568..a88e0b8b 100644 --- a/wallet/src/chain_storage.rs +++ b/wallet/src/chain_storage.rs @@ -20,6 +20,10 @@ pub struct WalletChainStore { } impl WalletChainStore { + #[expect( + clippy::wildcard_enum_match_arm, + reason = "We perform search for specific variants only" + )] pub fn new( config: WalletConfig, persistent_accounts: Vec, @@ -157,110 +161,48 @@ impl WalletChainStore { #[cfg(test)] mod tests { + use std::str::FromStr as _; + use key_protocol::key_management::key_tree::{ - keys_private::ChildKeysPrivate, keys_public::ChildKeysPublic, traits::KeyNode, + keys_private::ChildKeysPrivate, keys_public::ChildKeysPublic, traits::KeyNode as _, }; + use nssa::PrivateKey; use super::*; use crate::config::{ - InitialAccountData, PersistentAccountDataPrivate, PersistentAccountDataPublic, + InitialAccountData, InitialAccountDataPublic, PersistentAccountDataPrivate, + PersistentAccountDataPublic, }; fn create_initial_accounts() -> Vec { - let initial_acc1 = serde_json::from_str( - r#"{ - "Public": { - "account_id": "jZvdpERLqEkzk6CAz6vDuDJ1wx5aoyFpDa1VFmRvuPX", - "pub_sign_key": [ - 157, - 102, - 173, - 116, - 76, - 167, - 130, - 165, - 77, - 104, - 14, - 233, - 114, - 43, - 180, - 98, - 59, - 187, - 165, - 28, - 80, - 130, - 126, - 164, - 224, - 181, - 203, - 53, - 31, - 168, - 169, - 23 - ] - } - }"#, - ) - .unwrap(); - - let initial_acc2 = serde_json::from_str( - r#"{ - "Public": { - "account_id": "3jQfsyRyvVpBfdkZegf8QpjfcDq1M5RAXB4H4eJ4kTtf", - "pub_sign_key": [ - 230, - 17, - 4, - 52, - 87, - 162, - 72, - 137, - 119, - 205, - 163, - 211, - 118, - 157, - 15, - 164, - 67, - 12, - 124, - 50, - 159, - 23, - 184, - 6, - 109, - 154, - 2, - 219, - 147, - 239, - 125, - 20 - ] - } - }"#, - ) - .unwrap(); - - let initial_accounts = vec![initial_acc1, initial_acc2]; - - initial_accounts + vec![ + InitialAccountData::Public(InitialAccountDataPublic { + account_id: nssa::AccountId::from_str( + "CbgR6tj5kWx5oziiFptM7jMvrQeYY3Mzaao6ciuhSr2r", + ) + .unwrap(), + pub_sign_key: PrivateKey::try_new([ + 127, 39, 48, 152, 242, 91, 113, 230, 192, 5, 169, 81, 159, 38, 120, 218, 141, + 28, 127, 1, 246, 162, 119, 120, 226, 217, 148, 138, 189, 249, 1, 251, + ]) + .unwrap(), + }), + InitialAccountData::Public(InitialAccountDataPublic { + account_id: nssa::AccountId::from_str( + "2RHZhw9h534Zr3eq2RGhQete2Hh667foECzXPmSkGni2", + ) + .unwrap(), + pub_sign_key: PrivateKey::try_new([ + 244, 52, 248, 116, 23, 32, 1, 69, 134, 174, 67, 53, 109, 42, 236, 98, 87, 218, + 8, 98, 34, 246, 4, 221, 183, 93, 105, 115, 59, 134, 252, 76, + ]) + .unwrap(), + }), + ] } fn create_sample_wallet_config() -> WalletConfig { WalletConfig { - override_rust_log: None, sequencer_addr: "http://127.0.0.1".parse().unwrap(), seq_poll_timeout: std::time::Duration::from_secs(12), seq_tx_poll_max_blocks: 5, @@ -281,19 +223,19 @@ mod tests { chain_index: ChainIndex::root(), data: public_data, }), - PersistentAccountData::Private(PersistentAccountDataPrivate { + PersistentAccountData::Private(Box::new(PersistentAccountDataPrivate { account_id: private_data.account_id(), chain_index: ChainIndex::root(), data: private_data, - }), + })), ] } #[test] - fn test_new_initializes_correctly() { + fn new_initializes_correctly() { let config = create_sample_wallet_config(); let accs = create_sample_persistent_accounts(); - let _ = WalletChainStore::new(config.clone(), accs, HashMap::new()).unwrap(); + let _ = WalletChainStore::new(config, accs, HashMap::new()).unwrap(); } }