clean

Author: guibescos

.github/workflows/ci-pre-commit.yml

@@ -23,7 +23,6 @@ jobs:
           toolchain: 1.82.0
       - name: Install Rust versions
         run: |
-          rustup install 1.66.1
           rustup install 1.73.0
       - name: Install protoc
         uses: arduino/setup-protoc@v3

.github/workflows/ci-remote-executor.yml

@@ -15,14 +15,12 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.66.1
+          toolchain: 1.73.0
           components: rustfmt, clippy
           override: true
       - name: Install Solana
         run: |
-          wget http://nz2.archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2_amd64.deb
-          sudo dpkg -i libssl1.1_1.1.1f-1ubuntu2_amd64.deb
-          sh -c "$(curl -sSfL https://release.solana.com/v1.14.18/install)"
+          sh -c "$(curl -sSfL https://release.solana.com/v1.18.23/install)"
           echo "/home/runner/.local/share/solana/install/active_release/bin" >> $GITHUB_PATH
       - name: Run executor tests
         run: cargo test-bpf --manifest-path ./governance/remote_executor/Cargo.toml

.pre-commit-config.yaml

@@ -39,13 +39,13 @@ repos:
       - id: cargo-fmt-remote-executor
         name: Cargo format for remote executor
         language: "rust"
-        entry: cargo +1.66.1 fmt --manifest-path ./governance/remote_executor/Cargo.toml --all
+        entry: cargo +1.73.0 fmt --manifest-path ./governance/remote_executor/Cargo.toml --all
         pass_filenames: false
         files: governance/remote_executor
       - id: cargo-clippy-remote-executor
         name: Cargo clippy for remote executor
         language: "rust"
-        entry: cargo +1.66.1 clippy --manifest-path ./governance/remote_executor/Cargo.toml --tests -- --deny warnings
+        entry: cargo +1.73.0 clippy --manifest-path ./governance/remote_executor/Cargo.toml --tests -- --deny warnings
         pass_filenames: false
         files: governance/remote_executor
       # Hooks for cosmwasm contract

governance/remote_executor/programs/remote-executor/src/tests/executor_simulator.rs

@@ -9,7 +9,7 @@ use {
         CLAIM_RECORD_SEED, EXECUTOR_KEY_SEED,
     },
     anchor_lang::{
-        prelude::{AccountMeta, ProgramError, Pubkey, Rent, UpgradeableLoaderState},
+        prelude::{AccountMeta, ProgramError, Pubkey, Rent},
         solana_program::hash::Hash,
         AccountDeserialize, AnchorDeserialize, AnchorSerialize,
         InstructionData as AnchorInstructionData, Key, Owner, ToAccountMetas,
@@ -18,7 +18,14 @@ use {
         read_file, BanksClient, BanksClientError, ProgramTest, ProgramTestBanksClientExt,
     },
     solana_sdk::{
-        account::Account, bpf_loader, bpf_loader_upgradeable, instruction::{Instruction, InstructionError}, signature::Keypair, signer::Signer, stake_history::Epoch, system_instruction, transaction::{Transaction, TransactionError}
+        account::Account,
+        bpf_loader,
+        instruction::{Instruction, InstructionError},
+        signature::Keypair,
+        signer::Signer,
+        stake_history::Epoch,
+        system_instruction,
+        transaction::{Transaction, TransactionError},
     },
     std::{collections::HashMap, path::Path},
     wormhole_sdk::Chain,
@@ -47,7 +54,7 @@ pub enum VaaAttack {
 impl ExecutorBench {
     /// Deploys the executor program as upgradable
     pub fn new() -> ExecutorBench {
-        let mut bpf_data = read_file(
+        let bpf_data = read_file(
             std::env::current_dir()
                 .unwrap()
                 .join(Path::new("../../target/deploy/remote_executor.so")),
@@ -227,7 +234,16 @@ impl ExecutorSimulator {
         signers: &Vec<&Keypair>,
         executor_attack: ExecutorAttack,
     ) -> Result<(), BanksClientError> {
-        let posted_vaa_data: AnchorVaa = AnchorVaa::try_from_slice(&self.banks_client.get_account(*posted_vaa_address).await.unwrap().unwrap().data[..]).unwrap();
+        let posted_vaa_data: AnchorVaa = AnchorVaa::try_from_slice(
+            &self
+                .banks_client
+                .get_account(*posted_vaa_address)
+                .await
+                .unwrap()
+                .unwrap()
+                .data[..],
+        )
+        .unwrap();
 
         let mut account_metas = crate::accounts::ExecutePostedVaa::populate(
             &self.program_id,

governance/remote_executor/rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "1.71.1"
+channel = "1.73.0"