chore: fix clippy issues (#1049)

Author: srdtrk

packages/proof-api/modules/cosmos-to-eth/src/lib.rs

@@ -391,21 +391,6 @@ impl ProofApiService for CosmosToEthProofApiModuleService {
     }
 }
 
-#[cfg(test)]
-mod tests {
-    use alloy::providers::{Provider, RootProvider};
-
-    #[tokio::test]
-    async fn https_provider_can_fetch_chain_id() {
-        let provider: RootProvider = RootProvider::builder()
-            .connect("https://ethereum-rpc.publicnode.com")
-            .await
-            .expect("connect to HTTPS Ethereum RPC endpoint");
-
-        assert_eq!(provider.get_chain_id().await.unwrap(), 1);
-    }
-}
-
 #[tonic::async_trait]
 impl ProofApiModule for CosmosToEthProofApiModule {
     fn name(&self) -> &'static str {
@@ -477,3 +462,18 @@ impl CosmosToEthTxBuilder {
         matches!(self, Self::Attested(_))
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use alloy::providers::{Provider, RootProvider};
+
+    #[tokio::test]
+    async fn https_provider_can_fetch_chain_id() {
+        let provider: RootProvider = RootProvider::builder()
+            .connect("https://ethereum-rpc.publicnode.com")
+            .await
+            .expect("connect to HTTPS Ethereum RPC endpoint");
+
+        assert_eq!(provider.get_chain_id().await.unwrap(), 1);
+    }
+}

packages/proof-api/modules/eth-to-cosmos/src/lib.rs

@@ -272,21 +272,6 @@ impl ProofApiService for EthToCosmosProofApiModuleService {
     }
 }
 
-#[cfg(test)]
-mod tests {
-    use alloy::providers::{Provider, RootProvider};
-
-    #[tokio::test]
-    async fn https_provider_can_fetch_chain_id() {
-        let provider: RootProvider = RootProvider::builder()
-            .connect("https://ethereum-rpc.publicnode.com")
-            .await
-            .expect("connect to HTTPS Ethereum RPC endpoint");
-
-        assert_eq!(provider.get_chain_id().await.unwrap(), 1);
-    }
-}
-
 #[tonic::async_trait]
 impl ProofApiModule for EthToCosmosProofApiModule {
     fn name(&self) -> &'static str {
@@ -365,3 +350,18 @@ impl EthToCosmosTxBuilder {
         matches!(self, Self::Attested(_))
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use alloy::providers::{Provider, RootProvider};
+
+    #[tokio::test]
+    async fn https_provider_can_fetch_chain_id() {
+        let provider: RootProvider = RootProvider::builder()
+            .connect("https://ethereum-rpc.publicnode.com")
+            .await
+            .expect("connect to HTTPS Ethereum RPC endpoint");
+
+        assert_eq!(provider.get_chain_id().await.unwrap(), 1);
+    }
+}

packages/proof-api/modules/eth-to-eth/src/lib.rs

@@ -275,21 +275,6 @@ impl ProofApiService for EthToEthProofApiModuleService {
     }
 }
 
-#[cfg(test)]
-mod tests {
-    use alloy::providers::{Provider, RootProvider};
-
-    #[tokio::test]
-    async fn https_provider_can_fetch_chain_id() {
-        let provider: RootProvider = RootProvider::builder()
-            .connect("https://ethereum-rpc.publicnode.com")
-            .await
-            .expect("connect to HTTPS Ethereum RPC endpoint");
-
-        assert_eq!(provider.get_chain_id().await.unwrap(), 1);
-    }
-}
-
 #[tonic::async_trait]
 impl ProofApiModule for EthToEthProofApiModule {
     fn name(&self) -> &'static str {
@@ -335,3 +320,18 @@ impl EthToEthTxBuilder {
         }
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use alloy::providers::{Provider, RootProvider};
+
+    #[tokio::test]
+    async fn https_provider_can_fetch_chain_id() {
+        let provider: RootProvider = RootProvider::builder()
+            .connect("https://ethereum-rpc.publicnode.com")
+            .await
+            .expect("connect to HTTPS Ethereum RPC endpoint");
+
+        assert_eq!(provider.get_chain_id().await.unwrap(), 1);
+    }
+}

packages/proof-api/modules/eth-to-solana/src/lib.rs

@@ -292,21 +292,6 @@ impl ProofApiService for EthToSolanaProofApiModuleService {
     }
 }
 
-#[cfg(test)]
-mod tests {
-    use alloy::providers::{Provider, RootProvider};
-
-    #[tokio::test]
-    async fn https_provider_can_fetch_chain_id() {
-        let provider: RootProvider = RootProvider::builder()
-            .connect("https://ethereum-rpc.publicnode.com")
-            .await
-            .expect("connect to HTTPS Ethereum RPC endpoint");
-
-        assert_eq!(provider.get_chain_id().await.unwrap(), 1);
-    }
-}
-
 #[tonic::async_trait]
 impl ProofApiModule for EthToSolanaProofApiModule {
     fn name(&self) -> &'static str {
@@ -375,3 +360,18 @@ impl EthToSolanaTxBuilder {
         }
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use alloy::providers::{Provider, RootProvider};
+
+    #[tokio::test]
+    async fn https_provider_can_fetch_chain_id() {
+        let provider: RootProvider = RootProvider::builder()
+            .connect("https://ethereum-rpc.publicnode.com")
+            .await
+            .expect("connect to HTTPS Ethereum RPC endpoint");
+
+        assert_eq!(provider.get_chain_id().await.unwrap(), 1);
+    }
+}

packages/proof-api/modules/solana-to-eth/src/lib.rs

@@ -250,21 +250,6 @@ impl ProofApiService for SolanaToEthProofApiModuleService {
     }
 }
 
-#[cfg(test)]
-mod tests {
-    use alloy::providers::{Provider, RootProvider};
-
-    #[tokio::test]
-    async fn https_provider_can_fetch_chain_id() {
-        let provider: RootProvider = RootProvider::builder()
-            .connect("https://ethereum-rpc.publicnode.com")
-            .await
-            .expect("connect to HTTPS Ethereum RPC endpoint");
-
-        assert_eq!(provider.get_chain_id().await.unwrap(), 1);
-    }
-}
-
 #[tonic::async_trait]
 impl ProofApiModule for SolanaToEthProofApiModule {
     fn name(&self) -> &'static str {
@@ -300,3 +285,18 @@ impl SolanaToEthTxBuilder {
         }
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use alloy::providers::{Provider, RootProvider};
+
+    #[tokio::test]
+    async fn https_provider_can_fetch_chain_id() {
+        let provider: RootProvider = RootProvider::builder()
+            .connect("https://ethereum-rpc.publicnode.com")
+            .await
+            .expect("connect to HTTPS Ethereum RPC endpoint");
+
+        assert_eq!(provider.get_chain_id().await.unwrap(), 1);
+    }
+}

programs/operator/src/runners/fixtures/misbehaviour.rs

@@ -1,7 +1,7 @@
 //! Runner for generating `misbehaviour` fixtures
 
 use crate::{
-    cli::command::{fixtures::MisbehaviourCmd, OutputPath},
+    cli::command::{fixtures::MisbehaviourCmd, OutputPath, SP1ELFPaths},
     runners::genesis::SP1ICS07TendermintGenesis,
 };
 use alloy::sol_types::SolValue;
@@ -41,20 +41,19 @@ struct SP1ICS07SubmitMisbehaviourFixture {
     submit_msg: Vec<u8>,
 }
 
+struct SP1Programs {
+    update_client: UpdateClientProgram,
+    membership: MembershipProgram,
+    misbehaviour: MisbehaviourProgram,
+    uc_and_membership: UpdateClientAndMembershipProgram,
+}
+
 /// Writes the proof data for misbehaviour to the given fixture path.
 #[allow(clippy::missing_errors_doc, clippy::missing_panics_doc)]
 pub async fn run(args: MisbehaviourCmd) -> anyhow::Result<()> {
     let misbehaviour: RawMisbehaviour =
         serde_json::from_slice(&std::fs::read(args.misbehaviour_json_path)?)?;
-
-    let update_client_elf = std::fs::read(args.elf_paths.update_client_path)?;
-    let membership_elf = std::fs::read(args.elf_paths.membership_path)?;
-    let misbehaviour_elf = std::fs::read(args.elf_paths.misbehaviour_path)?;
-    let uc_and_membership_elf = std::fs::read(args.elf_paths.uc_and_membership_path)?;
-    let update_client_program = UpdateClientProgram::new(update_client_elf);
-    let membership_program = MembershipProgram::new(membership_elf);
-    let misbehaviour_program = MisbehaviourProgram::new(misbehaviour_elf);
-    let uc_and_membership_program = UpdateClientAndMembershipProgram::new(uc_and_membership_elf);
+    let programs = load_sp1_programs(args.elf_paths)?;
 
     let tm_rpc_client = HttpClient::from_env();
     let sp1_prover = if args.sp1.private_cluster {
@@ -93,28 +92,28 @@ pub async fn run(args: MisbehaviourCmd) -> anyhow::Result<()> {
         args.trust_options.trusting_period,
         args.trust_options.trust_level,
         args.sp1.proof_type,
-        &update_client_program,
-        &membership_program,
-        &uc_and_membership_program,
-        &misbehaviour_program,
+        &programs.update_client,
+        &programs.membership,
+        &programs.uc_and_membership,
+        &programs.misbehaviour,
     )
     .await?;
     let genesis_2 = SP1ICS07TendermintGenesis::from_env(
         &trusted_light_block_2,
         args.trust_options.trusting_period,
         args.trust_options.trust_level,
         args.sp1.proof_type,
-        &update_client_program,
-        &membership_program,
-        &uc_and_membership_program,
-        &misbehaviour_program,
+        &programs.update_client,
+        &programs.membership,
+        &programs.uc_and_membership,
+        &programs.misbehaviour,
     )
     .await?;
     let trusted_consensus_state_1 = ConsensusState::abi_decode(&genesis_1.trusted_consensus_state)?;
     let trusted_consensus_state_2 = ConsensusState::abi_decode(&genesis_2.trusted_consensus_state)?;
     let trusted_client_state_2 = ClientState::abi_decode(&genesis_2.trusted_client_state)?;
     let verify_misbehaviour_prover =
-        SP1ICS07TendermintProver::new(args.sp1.proof_type, &sp1_prover, &misbehaviour_program)
+        SP1ICS07TendermintProver::new(args.sp1.proof_type, &sp1_prover, &programs.misbehaviour)
             .await;
     let now_since_unix = std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH)?;
     let proof_data = verify_misbehaviour_prover
@@ -143,12 +142,32 @@ pub async fn run(args: MisbehaviourCmd) -> anyhow::Result<()> {
         submit_msg: submit_msg.abi_encode(),
     };
 
-    match args.output_path {
+    write_fixture(args.output_path, &fixture)?;
+
+    Ok(())
+}
+
+fn load_sp1_programs(elf_paths: SP1ELFPaths) -> anyhow::Result<SP1Programs> {
+    Ok(SP1Programs {
+        update_client: UpdateClientProgram::new(std::fs::read(elf_paths.update_client_path)?),
+        membership: MembershipProgram::new(std::fs::read(elf_paths.membership_path)?),
+        misbehaviour: MisbehaviourProgram::new(std::fs::read(elf_paths.misbehaviour_path)?),
+        uc_and_membership: UpdateClientAndMembershipProgram::new(std::fs::read(
+            elf_paths.uc_and_membership_path,
+        )?),
+    })
+}
+
+fn write_fixture(
+    output_path: OutputPath,
+    fixture: &SP1ICS07SubmitMisbehaviourFixture,
+) -> anyhow::Result<()> {
+    match output_path {
         OutputPath::File(path) => {
-            std::fs::write(PathBuf::from(path), serde_json::to_string_pretty(&fixture)?)?;
+            std::fs::write(PathBuf::from(path), serde_json::to_string_pretty(fixture)?)?;
         }
         OutputPath::Stdout => {
-            println!("{}", serde_json::to_string_pretty(&fixture)?);
+            println!("{}", serde_json::to_string_pretty(fixture)?);
         }
     }
 

programs/solana/programs/ics07-tendermint/src/instructions/pre_verify_signatures.rs

@@ -138,7 +138,7 @@ fn verify_ed25519_from_sysvar(
 }
 
 #[inline]
-fn load_offsets(data: &[u8]) -> Offsets {
+const fn load_offsets(data: &[u8]) -> Offsets {
     Offsets {
         signature: u16::from_le_bytes([data[2], data[3]]) as usize,
         pubkey: u16::from_le_bytes([data[6], data[7]]) as usize,
@@ -155,7 +155,7 @@ struct Offsets {
 /// Returns `true` only when all three `*_instruction_index` fields equal
 /// `u16::MAX`, meaning the Ed25519 precompile reads signature, pubkey, and
 /// message from its own instruction data (not from another instruction).
-fn all_instruction_indices_inline(data: &[u8]) -> bool {
+const fn all_instruction_indices_inline(data: &[u8]) -> bool {
     let sig_ix = u16::from_le_bytes([
         data[ED25519_SIGNATURE_IX_INDEX_OFFSET],
         data[ED25519_SIGNATURE_IX_INDEX_OFFSET + 1],