Update fmt

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

@@ -31,7 +31,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: nightly-2024-12-03
+          toolchain: 1.87.0
           components: rustfmt
 
       - name: Run pre-commit on all files

.pre-commit-config.yaml

@@ -5,7 +5,7 @@ repos:
       - id: cargo-fmt-workspace
         name: Cargo format for workspace
         language: "rust"
-        entry: cargo +nightly-2024-12-03 fmt --manifest-path ./Cargo.toml --all -- --config-path rustfmt.toml
+        entry: cargo +1.87.0 fmt --manifest-path ./Cargo.toml --all
         pass_filenames: false
         types_or: ["rust", "cargo", "cargo-lock"]
         files: .

src/config.rs

@@ -4,7 +4,7 @@ use clap::Parser;
 pub struct RunOptions {
     /// The API key to use for auction server authentication.
     #[arg(long = "pythnet-url", env = "PYTHNET_URL")]
-    pub pythnet_url:     String,
+    pub pythnet_url: String,
     /// Path to the file containing the secret key.
     #[arg(long = "secret-key", env = "SECRET_KEY")]
     pub secret_key_path: String,
@@ -14,5 +14,5 @@ pub struct RunOptions {
         env = "WORMHOLE_PID",
         default_value = "H3fxXJ86ADW2PNuDDmZJg6mzTtPxkYCpNuQUTgmJ7AjU"
     )]
-    pub wormhole_pid:    String,
+    pub wormhole_pid: String,
 }

src/main.rs

@@ -8,38 +8,24 @@ use {
     solana_client::{
         nonblocking::pubsub_client::PubsubClient,
         pubsub_client::PubsubClientError,
-        rpc_config::{
-            RpcAccountInfoConfig,
-            RpcProgramAccountsConfig,
-        },
-        rpc_filter::{
-            Memcmp,
-            RpcFilterType,
-        },
+        rpc_config::{RpcAccountInfoConfig, RpcProgramAccountsConfig},
+        rpc_filter::{Memcmp, RpcFilterType},
     },
     solana_sdk::pubkey::Pubkey,
-    std::{
-        fs,
-        str::FromStr,
-        time::Duration,
-    },
+    std::{fs, str::FromStr, time::Duration},
     tokio::time::sleep,
     tokio_stream::StreamExt,
-    wormhole_sdk::{
-        vaa::Body,
-        Address,
-        Chain,
-    },
+    wormhole_sdk::{vaa::Body, Address, Chain},
 };
 
 mod config;
 mod posted_message;
 mod signed_body;
 
 struct ListenerConfig {
-    ws_url:              String,
-    secret_key:          SecretKey,
-    wormhole_pid:        Pubkey,
+    ws_url: String,
+    secret_key: SecretKey,
+    wormhole_pid: Pubkey,
     accumulator_address: Pubkey,
 }
 
@@ -58,20 +44,18 @@ async fn run_listener(config: ListenerConfig) -> Result<(), PubsubClientError> {
         .program_subscribe(
             &config.wormhole_pid,
             Some(RpcProgramAccountsConfig {
-                filters:        Some(vec![RpcFilterType::Memcmp(Memcmp::new(
+                filters: Some(vec![RpcFilterType::Memcmp(Memcmp::new(
                     0,
                     solana_client::rpc_filter::MemcmpEncodedBytes::Bytes(b"msu".to_vec()),
                 ))]),
                 account_config: RpcAccountInfoConfig {
-                    encoding:         Some(UiAccountEncoding::Base64),
-                    data_slice:       None,
-                    commitment:       Some(
-                        solana_sdk::commitment_config::CommitmentConfig::confirmed(),
-                    ),
+                    encoding: Some(UiAccountEncoding::Base64),
+                    data_slice: None,
+                    commitment: Some(solana_sdk::commitment_config::CommitmentConfig::confirmed()),
                     min_context_slot: None,
                 },
-                with_context:   None,
-                sort_results:   None,
+                with_context: None,
+                sort_results: None,
             }),
         )
         .await?;
@@ -109,13 +93,13 @@ async fn run_listener(config: ListenerConfig) -> Result<(), PubsubClientError> {
         }
 
         let body = Body {
-            timestamp:         unreliable_data.submission_time,
-            nonce:             unreliable_data.nonce,
-            emitter_chain:     unreliable_data.emitter_chain.into(),
-            emitter_address:   Address(unreliable_data.emitter_address),
-            sequence:          unreliable_data.sequence,
+            timestamp: unreliable_data.submission_time,
+            nonce: unreliable_data.nonce,
+            emitter_chain: unreliable_data.emitter_chain.into(),
+            emitter_address: Address(unreliable_data.emitter_address),
+            sequence: unreliable_data.sequence,
             consistency_level: unreliable_data.consistency_level,
-            payload:           unreliable_data.payload.clone(),
+            payload: unreliable_data.payload.clone(),
         };
 
         match SignedBody::try_new(body, config.secret_key) {

src/posted_message.rs

@@ -1,22 +1,9 @@
 use {
-    borsh::{
-        BorshDeserialize,
-        BorshSerialize,
-    },
-    serde::{
-        Deserialize,
-        Serialize,
-    },
+    borsh::{BorshDeserialize, BorshSerialize},
+    serde::{Deserialize, Serialize},
     std::{
-        io::{
-            Error,
-            ErrorKind::InvalidData,
-            Write,
-        },
-        ops::{
-            Deref,
-            DerefMut,
-        },
+        io::{Error, ErrorKind::InvalidData, Write},
+        ops::{Deref, DerefMut},
     },
 };
 

src/signed_body.rs

@@ -1,18 +1,14 @@
 use {
-    secp256k1::{
-        Message,
-        Secp256k1,
-        SecretKey,
-    },
+    secp256k1::{Message, Secp256k1, SecretKey},
     serde::Serialize,
     wormhole_sdk::vaa::Body,
 };
 
 #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
 pub struct SignedBody<P> {
-    pub version:   u8,
+    pub version: u8,
     pub signature: [u8; 65],
-    pub body:      Body<P>,
+    pub body: Body<P>,
 }
 
 impl<P: Serialize> SignedBody<P> {