fix: clippy

Author: think-in-universe

kms/src/ckd.rs

@@ -32,21 +32,6 @@ const OUTPUT_SECRET_SIZE: usize = 32;
 const APP_ID_DERIVATION_PREFIX: &str = "near-mpc v0.1.0 app_id derivation:";
 const KMS_ROOT_KEY_DERIVATION_PATH: &str = "kms-root-key";
 
-/// MPC configuration for key derivation
-#[derive(Debug, Clone)]
-pub struct MpcConfig {
-    /// MPC contract ID (e.g., "v1.signer.testnet")
-    pub mpc_contract_id: String,
-    /// MPC domain ID for BLS12-381 (usually 2)
-    pub mpc_domain_id: u64,
-    /// MPC public key for the domain (BLS12-381 G2) in NEAR format
-    pub mpc_public_key: String,
-    /// NEAR KMS contract ID
-    pub kms_contract_id: String,
-    /// NEAR RPC URL
-    pub near_rpc_url: String,
-}
-
 #[derive(Clone, Debug, Deserialize)]
 pub struct Bls12381G1PublicKey(String);
 
@@ -208,7 +193,7 @@ pub fn derive_final_key(
 pub fn derive_root_key_from_mpc(
     mpc_response: &CkdResponse,
     ephemeral_private_key: Scalar,
-    mpc_config: &MpcConfig,
+    mpc_public_key: &str,
     kms_account_id: &str,
 ) -> Result<[u8; OUTPUT_SECRET_SIZE]> {
     // Derive app_id (must match MPC contract derivation)
@@ -219,7 +204,7 @@ pub fn derive_root_key_from_mpc(
         &mpc_response.big_y,
         &mpc_response.big_c,
         ephemeral_private_key,
-        &mpc_config.mpc_public_key,
+        mpc_public_key,
         &app_id,
     )?;
 

kms/src/near_kms_client.rs

@@ -10,7 +10,6 @@
 use anyhow::{Context, Result};
 use byte_slice_cast::AsByteSlice;
 use fs_err as fs;
-use hex;
 use near_api::{
     types::{AccountId, Data},
     Contract, NetworkConfig, SecretKey, Signer,
@@ -258,9 +257,7 @@ pub fn load_or_generate_near_signer(config: &KmsConfig) -> Result<Option<InMemor
 ///
 /// # Errors
 /// Returns an error if the public key is not ED25519 (only ED25519 keys are supported for NEAR implicit accounts)
-pub fn near_public_key_to_report_data(
-    public_key: &near_crypto::PublicKey,
-) -> Result<[u8; 64]> {
+pub fn near_public_key_to_report_data(public_key: &near_crypto::PublicKey) -> Result<[u8; 64]> {
     const REPORT_DATA_SIZE: usize = 64;
     const BINARY_VERSION_SIZE: usize = 2;
     const PUBLIC_KEYS_HASH_SIZE: usize = 48;
@@ -359,11 +356,17 @@ mod tests {
 
         // Verify hash bytes are non-zero (bytes 2-50 should contain the hash)
         let hash_section = &report_data[2..50];
-        assert!(!hash_section.iter().all(|&b| b == 0), "Hash should not be all zeros");
+        assert!(
+            !hash_section.iter().all(|&b| b == 0),
+            "Hash should not be all zeros"
+        );
 
         // Verify padding bytes are zero (bytes 50-64 should be zero)
         let padding_section = &report_data[50..64];
-        assert!(padding_section.iter().all(|&b| b == 0), "Padding should be zeros");
+        assert!(
+            padding_section.iter().all(|&b| b == 0),
+            "Padding should be zeros"
+        );
     }
 
     #[test]

kms/src/onboard_service.rs

@@ -22,11 +22,11 @@ use ra_tls::{
 };
 use safe_write::safe_write;
 
-use crate::ckd::{
-    derive_root_key_from_mpc, g1_to_near_format, generate_ephemeral_keypair, MpcConfig,
-};
+use crate::ckd::{derive_root_key_from_mpc, g1_to_near_format, generate_ephemeral_keypair};
 use crate::config::{AuthApi, KmsConfig};
-use crate::near_kms_client::{load_or_generate_near_signer, near_public_key_to_report_data, NearKmsClient};
+use crate::near_kms_client::{
+    load_or_generate_near_signer, near_public_key_to_report_data, NearKmsClient,
+};
 use dcap_qvl::collateral;
 use near_api::NetworkConfig;
 use ra_tls::kdf;
@@ -426,7 +426,10 @@ async fn try_derive_keys_from_mpc(
     let mpc_domain_id = near.mpc_domain_id;
 
     let network_id = near.network_id.as_deref().unwrap_or("testnet");
-    let network_config = NetworkConfig::from_rpc_url(network_id, rpc_url.parse().unwrap());
+    let network_config = NetworkConfig::from_rpc_url(
+        network_id,
+        rpc_url.parse().context("Failed to parse RPC URL")?,
+    );
 
     // Load or generate NEAR signer (implicit account)
     let signer = load_or_generate_near_signer(cfg)?;
@@ -471,15 +474,6 @@ async fn try_derive_keys_from_mpc(
 
     tracing::debug!("Generated ephemeral BLS12-381 keypair");
 
-    // Create MPC config
-    let mpc_config = MpcConfig {
-        mpc_contract_id: mpc_contract_id.clone(),
-        mpc_domain_id,
-        mpc_public_key: mpc_public_key.clone(),
-        kms_contract_id: kms_contract_id.clone(),
-        near_rpc_url: rpc_url.to_string(),
-    };
-
     // Get TDX attestation (quote, collateral, tcb_info) for KMS contract
     // The KMS contract's request_kms_root_key() requires attestation verification
     let (quote_hex, collateral_json, tcb_info_json) = if quote_enabled {
@@ -498,7 +492,7 @@ async fn try_derive_keys_from_mpc(
         let quote_bytes = attestation
             .into_inner()
             .tdx_quote()
-            .and_then(|q| Some(q.quote.clone()))
+            .map(|q| q.quote.clone())
             .context("Failed to get TDX quote bytes")?;
         let quote_hex = hex::encode(&quote_bytes);
 
@@ -552,7 +546,7 @@ async fn try_derive_keys_from_mpc(
     let root_key = derive_root_key_from_mpc(
         &mpc_response,
         ephemeral_private_key,
-        &mpc_config,
+        &mpc_public_key,
         kms_contract_id,
     )
     .context("Failed to derive root key from MPC response")?;