Abehjati/repo-improvement (#395)

* Use a new rustfmt file

* Run cosmwasm action only when needed

* Remove pre-commit from remote-executor action

* Fix formatting

* Run precommit for all files

As previous PR was merged without pre-commit

Author: ali-behjati

.github/workflows/ethereum-contract.yml

@@ -1,14 +1,14 @@
 on:
   pull_request:
-    paths: 
-    - ethereum/**
-    - third_party/pyth/xc-governance-sdk-js/**
+    paths:
+      - ethereum/**
+      - third_party/pyth/xc-governance-sdk-js/**
   push:
     branches:
       - main
-    paths: 
-    - ethereum/**
-    - third_party/pyth/xc-governance-sdk-js/**
+    paths:
+      - ethereum/**
+      - third_party/pyth/xc-governance-sdk-js/**
 
 name: Ethereum Contract
 
@@ -33,7 +33,7 @@ jobs:
         uses: foundry-rs/foundry-toolchain@v1
         with:
           version: nightly
-      
+
       - name: Install Forge dependencies
         run: npm run install-forge-deps
 

.github/workflows/pyth-cosmwasm-contract.yml

@@ -2,9 +2,15 @@ name: Pyth CosmWasm Contract
 
 on:
   pull_request:
+    paths:
+      - cosmwasm/**
+      - third_party/pyth/p2w-sdk/rust/**
   push:
     branches:
       - main
+    paths:
+      - cosmwasm/**
+      - third_party/pyth/p2w-sdk/rust/**
 
 env:
   CARGO_TERM_COLOR: always

.github/workflows/remote-executor.yml

@@ -17,7 +17,6 @@ jobs:
           profile: minimal
           toolchain: nightly
           components: rustfmt, clippy
-      - uses: pre-commit/[email protected]
       - name: Install Solana
         run: |
           sh -c "$(curl -sSfL https://release.solana.com/stable/install)"

.pre-commit-config.yaml

@@ -17,10 +17,10 @@ repos:
   - repo: local
     hooks:
       # Hooks for the remote executor
-      - id: cargo-fmt-executor
-        name: Cargo format executor
+      - id: cargo-fmt-executor-remote-executor
+        name: Cargo format executor for remote executor
         language: "rust"
-        entry: cargo +nightly fmt --manifest-path ./pythnet/remote-executor/Cargo.toml --all
+        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
@@ -30,9 +30,16 @@ repos:
         pass_filenames: false
         files: pythnet/remote-executor/
       # Hooks for the attester
-      - id: cargo-fmt-executor
-        name: Cargo format executor
+      - id: cargo-fmt-executor-attester
+        name: Cargo format executor for attester
         language: "rust"
-        entry: cargo +nightly fmt --manifest-path ./solana/pyth2wormhole/Cargo.toml --all
+        entry: cargo +nightly fmt --manifest-path ./solana/pyth2wormhole/Cargo.toml --all -- --config-path rustfmt.toml
         pass_filenames: false
         files: solana/pyth2wormhole/
+      # Hooks for cosmwasm contract
+      - id: cargo-fmt-executor-cosmwasm
+        name: Cargo format executor form cosmwasm contract
+        language: "rust"
+        entry: cargo +nightly fmt --manifest-path ./cosmwasm/Cargo.toml --all -- --config-path rustfmt.toml
+        pass_filenames: false
+        files: cosmwasm/

cosmwasm/contracts/pyth/src/contract.rs

@@ -1,52 +1,52 @@
-use std::collections::HashSet;
-
-use cosmwasm_std::{
-    entry_point,
-    to_binary,
-    Binary,
-    Deps,
-    DepsMut,
-    Env,
-    MessageInfo,
-    QueryRequest,
-    Response,
-    StdResult,
-    Timestamp,
-    WasmQuery,
-};
-
-use pyth_sdk_cw::{
-    PriceFeed,
-    PriceIdentifier,
-    PriceStatus,
-    ProductIdentifier,
-};
-
-use crate::msg::{
-    ExecuteMsg,
-    InstantiateMsg,
-    MigrateMsg,
-    PriceFeedResponse,
-    QueryMsg,
-};
-use crate::state::{
-    config,
-    config_read,
-    price_info,
-    price_info_read,
-    ConfigInfo,
-    PriceInfo,
-    PythDataSource,
-    VALID_TIME_PERIOD,
+use {
+    crate::{
+        error::PythContractError,
+        msg::{
+            ExecuteMsg,
+            InstantiateMsg,
+            MigrateMsg,
+            PriceFeedResponse,
+            QueryMsg,
+        },
+        state::{
+            config,
+            config_read,
+            price_info,
+            price_info_read,
+            ConfigInfo,
+            PriceInfo,
+            PythDataSource,
+            VALID_TIME_PERIOD,
+        },
+    },
+    cosmwasm_std::{
+        entry_point,
+        to_binary,
+        Binary,
+        Deps,
+        DepsMut,
+        Env,
+        MessageInfo,
+        QueryRequest,
+        Response,
+        StdResult,
+        Timestamp,
+        WasmQuery,
+    },
+    p2w_sdk::BatchPriceAttestation,
+    pyth_sdk_cw::{
+        PriceFeed,
+        PriceIdentifier,
+        PriceStatus,
+        ProductIdentifier,
+    },
+    std::collections::HashSet,
+    wormhole::{
+        msg::QueryMsg as WormholeQueryMsg,
+        state::ParsedVAA,
+    },
 };
 
-use crate::error::PythContractError;
-
-use p2w_sdk::BatchPriceAttestation;
-
-use wormhole::msg::QueryMsg as WormholeQueryMsg;
-use wormhole::state::ParsedVAA;
-
 #[cfg_attr(not(feature = "library"), entry_point)]
 pub fn migrate(_deps: DepsMut, _env: Env, _msg: MigrateMsg) -> StdResult<Response> {
     Ok(Response::new())
@@ -303,27 +303,28 @@ pub fn query_price_feed(deps: Deps, env: Env, address: &[u8]) -> StdResult<Price
                 price_feed: price_info.price_feed,
             })
         }
-        Err(_) => Err(PythContractError::PriceFeedNotFound)?
+        Err(_) => Err(PythContractError::PriceFeedNotFound)?,
     }
 }
 
 #[cfg(test)]
 mod test {
-    use cosmwasm_std::testing::{
-        mock_dependencies,
-        mock_env,
-        mock_info,
-        MockApi,
-        MockQuerier,
-        MockStorage,
-    };
-    use cosmwasm_std::{
-        Addr,
-        OwnedDeps,
+    use {
+        super::*,
+        cosmwasm_std::{
+            testing::{
+                mock_dependencies,
+                mock_env,
+                mock_info,
+                MockApi,
+                MockQuerier,
+                MockStorage,
+            },
+            Addr,
+            OwnedDeps,
+        },
     };
 
-    use super::*;
-
     fn setup_test() -> (OwnedDeps<MockStorage, MockApi, MockQuerier>, Env) {
         (mock_dependencies(), mock_env())
     }

cosmwasm/contracts/pyth/src/error.rs

@@ -1,5 +1,7 @@
-use cosmwasm_std::StdError;
-use thiserror::Error;
+use {
+    cosmwasm_std::StdError,
+    thiserror::Error,
+};
 
 #[derive(Error, Debug)]
 pub enum PythContractError {

cosmwasm/contracts/pyth/src/msg.rs

@@ -1,12 +1,13 @@
-use cosmwasm_std::Binary;
-use schemars::JsonSchema;
-use serde::{
-    Deserialize,
-    Serialize,
+use {
+    crate::state::PythDataSource,
+    cosmwasm_std::Binary,
+    schemars::JsonSchema,
+    serde::{
+        Deserialize,
+        Serialize,
+    },
 };
 
-use crate::state::PythDataSource;
-
 type HumanAddr = String;
 
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]

cosmwasm/contracts/pyth/src/state.rs

@@ -1,29 +1,30 @@
-use std::collections::HashSet;
-use std::time::Duration;
-
-use pyth_sdk_cw::PriceFeed;
-use schemars::JsonSchema;
-use serde::{
-    Deserialize,
-    Serialize,
-};
-
-use cosmwasm_std::{
-    Addr,
-    Binary,
-    Storage,
-    Timestamp,
-};
-
-use cosmwasm_storage::{
-    bucket,
-    bucket_read,
-    singleton,
-    singleton_read,
-    Bucket,
-    ReadonlyBucket,
-    ReadonlySingleton,
-    Singleton,
+use {
+    cosmwasm_std::{
+        Addr,
+        Binary,
+        Storage,
+        Timestamp,
+    },
+    cosmwasm_storage::{
+        bucket,
+        bucket_read,
+        singleton,
+        singleton_read,
+        Bucket,
+        ReadonlyBucket,
+        ReadonlySingleton,
+        Singleton,
+    },
+    pyth_sdk_cw::PriceFeed,
+    schemars::JsonSchema,
+    serde::{
+        Deserialize,
+        Serialize,
+    },
+    std::{
+        collections::HashSet,
+        time::Duration,
+    },
 };
 
 pub static CONFIG_KEY: &[u8] = b"config";