diff --git a/bin/rtmr-calc/src/main.rs b/bin/rtmr-calc/src/main.rs index d104e82..2817da3 100644 --- a/bin/rtmr-calc/src/main.rs +++ b/bin/rtmr-calc/src/main.rs @@ -160,7 +160,7 @@ fn main() -> Result<()> { let section_table = pe.get_section_table()?; - for section in section_table.iter() { + for section in §ion_table { debug!(section_name = ?section.name()?); } diff --git a/bin/verify-era-proof-attestation/src/core/config.rs b/bin/verify-era-proof-attestation/src/core/config.rs index d77566b..4e0607f 100644 --- a/bin/verify-era-proof-attestation/src/core/config.rs +++ b/bin/verify-era-proof-attestation/src/core/config.rs @@ -260,7 +260,7 @@ fn decode_tdx_mrs( Some(mrs_array) => { let result = mrs_array .into_iter() - .map(|strings| decode_and_combine_mrs(strings, bytes_length)) + .map(|strings| decode_and_combine_mrs(&strings, bytes_length)) .collect::, _>>()?; Ok(Some(result)) } @@ -269,12 +269,12 @@ fn decode_tdx_mrs( // Helper function to decode and combine MRs fn decode_and_combine_mrs( - strings: [String; 5], + strings: &[String; 5], bytes_length: usize, ) -> Result { let mut buffer = BytesMut::with_capacity(bytes_length * 5); - for s in &strings { + for s in strings { if s.len() > (bytes_length * 2) { return Err(hex::FromHexError::InvalidStringLength); } diff --git a/bin/verify-era-proof-attestation/src/error.rs b/bin/verify-era-proof-attestation/src/error.rs index ced5a6a..ec58c78 100644 --- a/bin/verify-era-proof-attestation/src/error.rs +++ b/bin/verify-era-proof-attestation/src/error.rs @@ -96,7 +96,7 @@ impl Error { impl From for Error { fn from(value: reqwest::Error) -> Self { Self::Http { - status_code: value.status().map(|v| v.as_u16()).unwrap_or(0), + status_code: value.status().map_or(0, |v| v.as_u16()), message: value.to_string(), } } diff --git a/bin/verify-era-proof-attestation/src/processor/batch_processor.rs b/bin/verify-era-proof-attestation/src/processor/batch_processor.rs index c7e8cbf..1e814d4 100644 --- a/bin/verify-era-proof-attestation/src/processor/batch_processor.rs +++ b/bin/verify-era-proof-attestation/src/processor/batch_processor.rs @@ -53,7 +53,7 @@ impl BatchProcessor { // Fetch proofs for the current batch across different TEE types let mut proofs = Vec::new(); - for tee_type in self.config.args.tee_types.iter() { + for tee_type in self.config.args.tee_types.iter().copied() { match self .proof_fetcher .get_proofs(token, batch_number, tee_type) diff --git a/bin/verify-era-proof-attestation/src/processor/mod.rs b/bin/verify-era-proof-attestation/src/processor/mod.rs index 75df936..a2bac5b 100644 --- a/bin/verify-era-proof-attestation/src/processor/mod.rs +++ b/bin/verify-era-proof-attestation/src/processor/mod.rs @@ -43,14 +43,14 @@ impl ProcessorFactory { /// Create a new processor based on the provided configuration pub fn create(config: VerifierConfig) -> Result<(ProcessorType, VerifierMode)> { let mode = if let Some((start, end)) = config.args.batch_range { - let processor = OneShotProcessor::new(config.clone(), start, end)?; + let processor = OneShotProcessor::new(config, start, end)?; let mode = VerifierMode::OneShot { start_batch: start, end_batch: end, }; (ProcessorType::OneShot(processor), mode) } else if let Some(start) = config.args.continuous { - let processor = ContinuousProcessor::new(config.clone(), start)?; + let processor = ContinuousProcessor::new(config, start)?; let mode = VerifierMode::Continuous { start_batch: start }; (ProcessorType::Continuous(processor), mode) } else { diff --git a/bin/verify-era-proof-attestation/src/proof/fetcher.rs b/bin/verify-era-proof-attestation/src/proof/fetcher.rs index d8d0322..5da8643 100644 --- a/bin/verify-era-proof-attestation/src/proof/fetcher.rs +++ b/bin/verify-era-proof-attestation/src/proof/fetcher.rs @@ -36,7 +36,7 @@ impl ProofFetcher { &self, token: &CancellationToken, batch_number: L1BatchNumber, - tee_type: &TeeType, + tee_type: TeeType, ) -> Result> { let mut proofs_request = GetProofsRequest::new(batch_number, tee_type); let mut backoff = Duration::from_secs(1); diff --git a/bin/verify-era-proof-attestation/src/proof/types.rs b/bin/verify-era-proof-attestation/src/proof/types.rs index e2362e6..2957083 100644 --- a/bin/verify-era-proof-attestation/src/proof/types.rs +++ b/bin/verify-era-proof-attestation/src/proof/types.rs @@ -17,7 +17,7 @@ pub struct GetProofsRequest { impl GetProofsRequest { /// Create a new request for the given batch number - pub fn new(batch_number: L1BatchNumber, tee_type: &TeeType) -> Self { + pub fn new(batch_number: L1BatchNumber, tee_type: TeeType) -> Self { GetProofsRequest { jsonrpc: "2.0".to_string(), id: 1, diff --git a/bin/verify-era-proof-attestation/src/verification/batch.rs b/bin/verify-era-proof-attestation/src/verification/batch.rs index 5542f05..9eb9200 100644 --- a/bin/verify-era-proof-attestation/src/verification/batch.rs +++ b/bin/verify-era-proof-attestation/src/verification/batch.rs @@ -48,7 +48,7 @@ impl BatchVerifier { let mut total_proofs_count: u32 = 0; let mut verified_proofs_count: u32 = 0; - for proof in proofs.into_iter() { + for proof in proofs { if token.is_cancelled() { tracing::warn!("Stop signal received during batch verification"); return Ok(BatchVerificationResult { diff --git a/bin/verify-era-proof-attestation/src/verification/policy.rs b/bin/verify-era-proof-attestation/src/verification/policy.rs index b925aab..b283e81 100644 --- a/bin/verify-era-proof-attestation/src/verification/policy.rs +++ b/bin/verify-era-proof-attestation/src/verification/policy.rs @@ -24,7 +24,7 @@ impl PolicyEnforcer { match "e.report { Report::SgxEnclave(report_body) => { // Validate TCB level - Self::validate_tcb_level(&attestation_policy.sgx_allowed_tcb_levels, tcblevel)?; + Self::validate_tcb_level(attestation_policy.sgx_allowed_tcb_levels, tcblevel)?; // Validate SGX Advisories for advisory in "e_verification_result.advisories { @@ -50,7 +50,7 @@ impl PolicyEnforcer { } Report::TD10(report_body) => { // Validate TCB level - Self::validate_tcb_level(&attestation_policy.tdx_allowed_tcb_levels, tcblevel)?; + Self::validate_tcb_level(attestation_policy.tdx_allowed_tcb_levels, tcblevel)?; // Validate TDX Advisories for advisory in "e_verification_result.advisories { @@ -74,7 +74,7 @@ impl PolicyEnforcer { } Report::TD15(report_body) => { // Validate TCB level - Self::validate_tcb_level(&attestation_policy.tdx_allowed_tcb_levels, tcblevel)?; + Self::validate_tcb_level(attestation_policy.tdx_allowed_tcb_levels, tcblevel)?; // Validate TDX Advisories for advisory in "e_verification_result.advisories { @@ -101,10 +101,7 @@ impl PolicyEnforcer { } /// Helper method to validate TCB levels - fn validate_tcb_level( - allowed_levels: &EnumSet, - actual_level: TcbLevel, - ) -> Result<()> { + fn validate_tcb_level(allowed_levels: EnumSet, actual_level: TcbLevel) -> Result<()> { if !allowed_levels.contains(actual_level) { let error_msg = format!( "Quote verification failed: TCB level mismatch (expected one of: {allowed_levels:?}, actual: {actual_level})", @@ -116,7 +113,7 @@ impl PolicyEnforcer { /// Helper method to build combined TDX measurement register fn build_tdx_mr(parts: [&[u8]; N]) -> Vec { - parts.into_iter().flatten().cloned().collect() + parts.into_iter().flatten().copied().collect() } /// Check if a policy value matches the actual value diff --git a/crates/intel-dcap-api/src/client/helpers.rs b/crates/intel-dcap-api/src/client/helpers.rs index 1f37070..ee53cc3 100644 --- a/crates/intel-dcap-api/src/client/helpers.rs +++ b/crates/intel-dcap-api/src/client/helpers.rs @@ -193,7 +193,7 @@ impl ApiClient { } /// Checks if a V4-only parameter is provided with a V3 API version. - pub(super) fn check_v4_only_param( + pub(super) fn check_v4_only_param( &self, param_value: Option, param_name: &str, diff --git a/crates/teepot/src/quote/phala.rs b/crates/teepot/src/quote/phala.rs index 0fdafbc..fcbd48e 100644 --- a/crates/teepot/src/quote/phala.rs +++ b/crates/teepot/src/quote/phala.rs @@ -24,7 +24,7 @@ fn extract_header_value( .ok_or_else(|| QuoteError::Unexpected(format!("Missing required header: {header_name}")))? .to_str() .map_err(|e| QuoteError::Unexpected(format!("Invalid header value: {e}"))) - .map(|val| val.to_string()) + .map(str::to_string) } /// Fetch collateral data from Intel's Provisioning Certification Service @@ -74,14 +74,14 @@ pub(crate) fn get_collateral(quote: &[u8]) -> Result { let (collateral, pck_crl, pck_issuer_chain) = result; // Convert QuoteCollateralV3 to Collateral - convert_to_collateral(collateral, pck_crl, pck_issuer_chain) + convert_to_collateral(collateral, &pck_crl, &pck_issuer_chain) } // Helper function to convert QuoteCollateralV3 to Collateral fn convert_to_collateral( collateral: QuoteCollateralV3, - pck_crl: String, - pck_issuer_chain: Bytes, + pck_crl: &str, + pck_issuer_chain: &[u8], ) -> Result { let QuoteCollateralV3 { tcb_info_issuer_chain, @@ -119,7 +119,7 @@ fn convert_to_collateral( root_ca_crl: Box::new([]), // Converted values - pck_crl_issuer_chain: pck_issuer_chain.as_ref().into(), + pck_crl_issuer_chain: pck_issuer_chain.into(), pck_crl: pck_crl.as_bytes().into(), tcb_info_issuer_chain: to_bytes_with_nul(tcb_info_issuer_chain, "tcb_info_issuer_chain")?, tcb_info: to_bytes_with_nul(tcb_info_json, "tcb_info")?,