Add clippy to all rust projects (#400)

Author: ali-behjati

.pre-commit-config.yaml

@@ -17,29 +17,56 @@ repos:
   - repo: local
     hooks:
       # Hooks for the remote executor
-      - id: cargo-fmt-executor-remote-executor
-        name: Cargo format executor for remote executor
+      - id: cargo-fmt-remote-executor
+        name: Cargo format for remote executor
         language: "rust"
         entry: cargo +nightly fmt --manifest-path ./pythnet/remote-executor/Cargo.toml --all -- --config-path rustfmt.toml
         pass_filenames: false
         files: pythnet/remote-executor/
-      - id: cargo-clippy-executor
-        name: Cargo clippy executor
+      - id: cargo-clippy-remote-executor
+        name: Cargo clippy for remote executor
         language: "rust"
-        entry: cargo +nightly clippy --manifest-path ./pythnet/remote-executor/Cargo.toml -- -D warnings
+        entry: cargo +nightly clippy --manifest-path ./pythnet/remote-executor/Cargo.toml --tests --fix --allow-dirty --allow-staged -- -D warnings
         pass_filenames: false
         files: pythnet/remote-executor/
       # Hooks for the attester
-      - id: cargo-fmt-executor-attester
-        name: Cargo format executor for attester
+      - id: cargo-fmt-attester
+        name: Cargo format for attester
         language: "rust"
         entry: cargo +nightly fmt --manifest-path ./solana/pyth2wormhole/Cargo.toml --all -- --config-path rustfmt.toml
         pass_filenames: false
         files: solana/pyth2wormhole/
+      - id: cargo-clippy-attester
+        name: Cargo clippy for attester
+        language: "rust"
+        entry: |
+          bash -c 'EMITTER_ADDRESS=0 BRIDGE_ADDRESS=0 cargo +nightly clippy --manifest-path \
+            ./solana/pyth2wormhole/Cargo.toml --tests --fix --allow-dirty --allow-staged -- -D warnings'
+        pass_filenames: false
+        files: solana/pyth2wormhole/
       # Hooks for cosmwasm contract
-      - id: cargo-fmt-executor-cosmwasm
-        name: Cargo format executor form cosmwasm contract
+      - id: cargo-fmt-cosmwasm
+        name: Cargo format for cosmwasm contract
         language: "rust"
         entry: cargo +nightly fmt --manifest-path ./cosmwasm/Cargo.toml --all -- --config-path rustfmt.toml
         pass_filenames: false
         files: cosmwasm/
+      - id: cargo-clippy-cosmwasm
+        name: Cargo clippy for cosmwasm contract
+        language: "rust"
+        entry: cargo +nightly clippy --manifest-path ./cosmwasm/Cargo.toml --tests --fix --allow-dirty --allow-staged -- -D warnings
+        pass_filenames: false
+        files: cosmwasm/
+      # Hooks for p2w-sdk/rust
+      - id: cargo-fmt-p2w-sdk
+        name: Cargo format for p2w-sdk
+        language: "rust"
+        entry: cargo +nightly fmt --manifest-path ./third_party/pyth/p2w-sdk/rust/Cargo.toml --all -- --config-path rustfmt.toml
+        pass_filenames: false
+        files: third_party/pyth/p2w-sdk/rust/
+      - id: cargo-clippy-p2w-sdk
+        name: Cargo clippy for p2w-sdk
+        language: "rust"
+        entry: cargo +nightly clippy --manifest-path ./third_party/pyth/p2w-sdk/rust/Cargo.toml --tests --fix --allow-dirty --allow-staged -- -D warnings
+        pass_filenames: false
+        files: third_party/pyth/p2w-sdk/rust/

pythnet/remote-executor/programs/remote-executor/src/tests/executor_simulator.rs

@@ -124,24 +124,24 @@ impl ExecutorBench {
         program_test.add_account(program_key, program_account);
         program_test.add_account(programdata_key, programdata_account);
 
-        return ExecutorBench {
+        ExecutorBench {
             program_test,
             program_id: program_key.key(),
             seqno: HashMap::<Pubkey, u64>::new(),
-        };
+        }
     }
 
     /// Start local validator based on the current bench
     pub async fn start(self) -> ExecutorSimulator {
         // Start validator
         let (banks_client, genesis_keypair, recent_blockhash) = self.program_test.start().await;
 
-        return ExecutorSimulator {
+        ExecutorSimulator {
             banks_client,
             payer: genesis_keypair,
             last_blockhash: recent_blockhash,
             program_id: self.program_id,
-        };
+        }
     }
 
     /// Add VAA account with emitter and instructions for consumption by the remote_executor
@@ -168,10 +168,7 @@ impl ExecutorBench {
 
         let payload = ExecutorPayload {
             header:       GovernanceHeader::executor_governance_header(),
-            instructions: instructions
-                .iter()
-                .map(|x| InstructionData::from(x))
-                .collect(),
+            instructions: instructions.iter().map(InstructionData::from).collect(),
         };
 
         let payload_bytes = payload.try_to_vec().unwrap();
@@ -185,7 +182,7 @@ impl ExecutorBench {
                 vaa_signature_account: Pubkey::new_unique(),
                 submission_time: 0,
                 nonce: 0,
-                sequence: self.seqno.get(&emitter).unwrap_or(&0) + 1,
+                sequence: self.seqno.get(emitter).unwrap_or(&0) + 1,
                 emitter_chain,
                 emitter_address: emitter.to_bytes(),
                 payload: payload_bytes,
@@ -211,7 +208,7 @@ impl ExecutorBench {
 
         let vaa_pubkey = Pubkey::new_unique();
         self.program_test.add_account(vaa_pubkey, vaa_account);
-        return vaa_pubkey;
+        vaa_pubkey
     }
 
     // Get executor key of an emitter, useful to construct instructions that will be in the VAA
@@ -298,7 +295,7 @@ impl ExecutorSimulator {
             &self.program_id,
             &self.payer.pubkey(),
             &Pubkey::new(&posted_vaa_data.emitter_address),
-            &posted_vaa_address,
+            posted_vaa_address,
         )
         .to_account_metas(None);
 
@@ -383,12 +380,12 @@ impl ExecutorSimulator {
     }
 }
 
-impl Into<TransactionError> for ExecutorError {
-    fn into(self) -> TransactionError {
+impl From<ExecutorError> for TransactionError {
+    fn from(val: ExecutorError) -> Self {
         TransactionError::InstructionError(
             0,
             InstructionError::try_from(u64::from(ProgramError::from(
-                anchor_lang::prelude::Error::from(self),
+                anchor_lang::prelude::Error::from(val),
             )))
             .unwrap(),
         )

pythnet/remote-executor/programs/remote-executor/src/tests/test_adversarial.rs

@@ -41,7 +41,7 @@ async fn test_adversarial() {
         &emitter,
         &vec![transfer(
             &executor_key,
-            &&receiver,
+            &receiver,
             Rent::default().minimum_balance(0),
         )],
         VaaAttack::None,
@@ -50,7 +50,7 @@ async fn test_adversarial() {
         &emitter,
         &vec![transfer(
             &executor_key,
-            &&receiver,
+            &receiver,
             Rent::default().minimum_balance(0),
         )],
         VaaAttack::WrongData,
@@ -59,7 +59,7 @@ async fn test_adversarial() {
         &emitter,
         &vec![transfer(
             &executor_key,
-            &&receiver,
+            &receiver,
             Rent::default().minimum_balance(0),
         )],
         VaaAttack::WrongOwner,
@@ -68,7 +68,7 @@ async fn test_adversarial() {
         &emitter,
         &vec![transfer(
             &executor_key,
-            &&receiver,
+            &receiver,
             Rent::default().minimum_balance(0),
         )],
         VaaAttack::WrongEmitterChain,
@@ -78,7 +78,7 @@ async fn test_adversarial() {
         &emitter,
         &vec![transfer(
             &executor_key,
-            &&receiver,
+            &receiver,
             Rent::default().minimum_balance(0),
         )],
         VaaAttack::WrongVaaMagic,

solana/pyth2wormhole/Cargo.lock

@@ -39,6 +39,5 @@ warp = "0.3.3"
 http = "0.2.8"
 
 [dev-dependencies]
-pyth-client = "0.5.0"
 solana-program-test = "=1.10.31"
 solana-sdk = "=1.10.31"

solana/pyth2wormhole/client/Cargo.toml

@@ -71,8 +71,7 @@ impl AttestationConfig {
         // Turn the pruned symbols into P2WSymbol structs
         let mut new_symbols_vec = new_symbols
             .drain() // Makes us own the elements and lets us move them
-            .map(|(prod, prices)| iter::zip(iter::repeat(prod), prices)) // Convert to iterator over flat (prod, price) tuples
-            .flatten() // Flatten the tuple iterators
+            .flat_map(|(prod, prices)| iter::zip(iter::repeat(prod), prices)) // Flatten the tuple iterators
             .map(|(prod, price)| P2WSymbol {
                 name:         None,
                 product_addr: prod,
@@ -87,7 +86,7 @@ impl AttestationConfig {
             .find(|g| g.group_name == group_name) // Advances the iterator and returns Some(item) on first hit
         {
             Some(existing_group) => existing_group.symbols.append(&mut new_symbols_vec),
-            None if new_symbols_vec.len() != 0 => {
+            None if !new_symbols_vec.is_empty() => {
                 // Group does not exist, assume defaults
                 let new_group = SymbolGroup {
                     group_name,
@@ -104,7 +103,7 @@ impl AttestationConfig {
     pub fn as_batches(&self, max_batch_size: usize) -> Vec<BatchState> {
         self.symbol_groups
             .iter()
-            .map(move |g| {
+            .flat_map(move |g| {
                 let conditions4closure = g.conditions.clone();
                 let name4closure = g.group_name.clone();
 
@@ -113,12 +112,11 @@ impl AttestationConfig {
                 // Divide group into batches
                 g.symbols
                     .as_slice()
-                    .chunks(max_batch_size.clone())
+                    .chunks(max_batch_size)
                     .map(move |symbols| {
                         BatchState::new(name4closure.clone(), symbols, conditions4closure.clone())
                     })
             })
-            .flatten()
             .collect()
     }
 }
@@ -257,7 +255,7 @@ fn opt_pubkey_string_ser<S>(k_opt: &Option<Pubkey>, ser: S) -> Result<S::Ok, S::
 where
     S: Serializer,
 {
-    let k_str_opt = k_opt.clone().map(|k| k.to_string());
+    let k_str_opt = (*k_opt).map(|k| k.to_string());
 
     Option::<String>::serialize(&k_str_opt, ser)
 }
@@ -352,7 +350,7 @@ mod tests {
                 mock_prod_bytes[31] = sym_idx;
 
                 let mut mock_prices = HashSet::new();
-                for px_idx in 1..=5 {
+                for _px_idx in 1..=5 {
                     let mut mock_price_bytes = [0u8; 32];
                     mock_price_bytes[31] = sym_idx;
                     mock_prices.insert(Pubkey::new_from_array(mock_price_bytes));
@@ -370,7 +368,7 @@ mod tests {
 
         // Should not be created because there's no new symbols to add
         // (we're adding identical mock_new_symbols again)
-        config2.add_symbols(mock_new_symbols.clone(), "default2".to_owned());
+        config2.add_symbols(mock_new_symbols, "default2".to_owned());
 
         assert_ne!(config1, empty_config); // Check that config grows from empty
         assert_eq!(config1, config2); // Check that no changes are made if all symbols are already in there

solana/pyth2wormhole/client/src/attestation_cfg.rs

@@ -157,6 +157,6 @@ impl<'a> BatchState {
             }
         }
 
-        return ret;
+        ret
     }
 }