Add nightly rustfmt checks (#171)

* Add nightly rustfmt checks * fmt * Add nightly to CI * Try to use basic nightly
free-honey · Mar 30, 2024 · fbbd58f · fbbd58f
1 parent 8cfd04c
commit fbbd58f
Show file tree

Hide file tree

Showing 81 changed files with 1,893 additions and 706 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -20,9 +20,25 @@ jobs:
       run: cargo build --verbose --workspace
     - name: Run tests
       run: cargo test --verbose --workspace
-    - name: Lint
-      run: cargo fmt --all -- --check
     - name: Clippy
       run: cargo clippy --all-targets --all-features -- -D warnings
+
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install latest nightly
+        uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: nightly
+          components: rustfmt
+      - name: Rustfmt check
+        run: cargo +nightly fmt --all -- --check
+
+
+  audit:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
     - name: Audit
       run: cargo audit
diff --git a/.rustfmt.toml b/.rustfmt.toml
@@ -0,0 +1,8 @@
+max_width = 90
+normalize_comments = true
+imports_layout = "Vertical"
+imports_granularity = "Crate"
+trailing_semicolon = false
+edition = "2021"
+use_try_shorthand = true
+use_field_init_shorthand = true
diff --git a/README.md b/README.md
@@ -46,7 +46,7 @@ FYI, CI requires these commands to pass. So, try to run them locally to save you
 ```
 cargo build --workspace
 cargo test --workspace
-cargo fmt --all -- --check
+cargo +nightly fmt --all -- --check
 cargo clippy --all-targets --all-features -- -D warnings
 ```
 

diff --git a/nau-scripts/build.rs b/nau-scripts/build.rs
@@ -1,6 +1,8 @@
 use aiken_lang::ast::Tracing;
-use aiken_project::telemetry::Terminal;
-use aiken_project::Project;
+use aiken_project::{
+    telemetry::Terminal,
+    Project,
+};
 
 const MINT_NFT_PROJECT: &str = "./aiken/mint_nft";
 

diff --git a/nau-scripts/src/one_shot.rs b/nau-scripts/src/one_shot.rs
@@ -1,10 +1,14 @@
-use naumachia::scripts::raw_script::BlueprintFile;
 use naumachia::{
     output::Output as NauOutput,
     scripts::{
         plutus_minting_policy::OneParamPlutusPolicy,
-        plutus_validator::plutus_data::{Constr, PlutusData},
-        ScriptError, ScriptResult,
+        plutus_validator::plutus_data::{
+            Constr,
+            PlutusData,
+        },
+        raw_script::BlueprintFile,
+        ScriptError,
+        ScriptResult,
     },
 };
 
@@ -53,16 +57,16 @@ impl From<OutputReference> for PlutusData {
     }
 }
 
-pub fn get_parameterized_script() -> ScriptResult<OneParamPlutusPolicy<OutputReference, ()>> {
+pub fn get_parameterized_script(
+) -> ScriptResult<OneParamPlutusPolicy<OutputReference, ()>> {
     let script_file: BlueprintFile = serde_json::from_str(BLUEPRINT)
         .map_err(|e| ScriptError::FailedToConstruct(e.to_string()))?;
-    let validator_blueprint =
-        script_file
-            .get_validator(VALIDATOR_NAME)
-            .ok_or(ScriptError::FailedToConstruct(format!(
-                "Validator not listed in Blueprint: {:?}",
-                VALIDATOR_NAME
-            )))?;
+    let validator_blueprint = script_file.get_validator(VALIDATOR_NAME).ok_or(
+        ScriptError::FailedToConstruct(format!(
+            "Validator not listed in Blueprint: {:?}",
+            VALIDATOR_NAME
+        )),
+    )?;
     let raw_script_validator = OneParamPlutusPolicy::from_blueprint(validator_blueprint)
         .map_err(|e| ScriptError::FailedToConstruct(e.to_string()))?;
     Ok(raw_script_validator)
@@ -72,10 +76,17 @@ pub fn get_parameterized_script() -> ScriptResult<OneParamPlutusPolicy<OutputRef
 #[cfg(test)]
 mod tests {
     use super::*;
-    use naumachia::output::Output;
-    use naumachia::scripts::context::{pub_key_hash_from_address_if_available, ContextBuilder};
-    use naumachia::scripts::MintingPolicy;
-    use naumachia::Address;
+    use naumachia::{
+        output::Output,
+        scripts::{
+            context::{
+                pub_key_hash_from_address_if_available,
+                ContextBuilder,
+            },
+            MintingPolicy,
+        },
+        Address,
+    };
 
     #[test]
     fn execute__succeeds_when_output_included() {

diff --git a/sample-dApps/always-succeeds-contract/build.rs b/sample-dApps/always-succeeds-contract/build.rs
@@ -1,6 +1,8 @@
 use aiken_lang::ast::Tracing;
-use aiken_project::telemetry::Terminal;
-use aiken_project::Project;
+use aiken_project::{
+    telemetry::Terminal,
+    Project,
+};
 
 const PROJECT: &str = "./always_succeeds";
 

diff --git a/sample-dApps/always-succeeds-contract/src/logic.rs b/sample-dApps/always-succeeds-contract/src/logic.rs
@@ -1,10 +1,18 @@
 use crate::logic::script::get_script;
 use async_trait::async_trait;
-use naumachia::logic::error::{SCLogicError, SCLogicResult};
 use naumachia::{
     ledger_client::LedgerClient,
-    logic::SCLogic,
-    output::{Output, OutputId},
+    logic::{
+        error::{
+            SCLogicError,
+            SCLogicResult,
+        },
+        SCLogic,
+    },
+    output::{
+        Output,
+        OutputId,
+    },
     policy_id::PolicyId,
     scripts::Validator,
     transaction::TxActions,
@@ -54,7 +62,9 @@ impl SCLogic for AlwaysSucceedsLogic {
         ledger_client: &LC,
     ) -> SCLogicResult<TxActions<Self::Datums, Self::Redeemers>> {
         match endpoint {
-            AlwaysSucceedsEndpoints::Lock { amount } => impl_lock(ledger_client, amount).await,
+            AlwaysSucceedsEndpoints::Lock { amount } => {
+                impl_lock(ledger_client, amount).await
+            }
             AlwaysSucceedsEndpoints::Claim { output_id } => {
                 impl_claim(ledger_client, output_id).await
             }

diff --git a/sample-dApps/always-succeeds-contract/src/logic/script.rs b/sample-dApps/always-succeeds-contract/src/logic/script.rs
@@ -1,20 +1,22 @@
-use naumachia::scripts::plutus_validator::PlutusValidator;
-use naumachia::scripts::raw_script::BlueprintFile;
-use naumachia::scripts::{ScriptError, ScriptResult};
+use naumachia::scripts::{
+    plutus_validator::PlutusValidator,
+    raw_script::BlueprintFile,
+    ScriptError,
+    ScriptResult,
+};
 
 const BLUEPRINT: &str = include_str!("../../always_succeeds/plutus.json");
 const VALIDATOR_NAME: &str = "always_true.spend";
 
 pub fn get_script() -> ScriptResult<PlutusValidator<(), ()>> {
     let script_file: BlueprintFile = serde_json::from_str(BLUEPRINT)
         .map_err(|e| ScriptError::FailedToConstruct(e.to_string()))?;
-    let validator_blueprint =
-        script_file
-            .get_validator(VALIDATOR_NAME)
-            .ok_or(ScriptError::FailedToConstruct(format!(
-                "Validator not listed in Blueprint: {:?}",
-                VALIDATOR_NAME
-            )))?;
+    let validator_blueprint = script_file.get_validator(VALIDATOR_NAME).ok_or(
+        ScriptError::FailedToConstruct(format!(
+            "Validator not listed in Blueprint: {:?}",
+            VALIDATOR_NAME
+        )),
+    )?;
     let raw_script_validator = PlutusValidator::from_blueprint(validator_blueprint)
         .map_err(|e| ScriptError::FailedToConstruct(e.to_string()))?;
     Ok(raw_script_validator)
@@ -23,9 +25,16 @@ pub fn get_script() -> ScriptResult<PlutusValidator<(), ()>> {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use naumachia::scripts::context::{pub_key_hash_from_address_if_available, ContextBuilder};
-    use naumachia::scripts::Validator;
-    use naumachia::Address;
+    use naumachia::{
+        scripts::{
+            context::{
+                pub_key_hash_from_address_if_available,
+                ContextBuilder,
+            },
+            Validator,
+        },
+        Address,
+    };
 
     #[test]
     fn test() {

diff --git a/sample-dApps/always-succeeds-contract/src/logic/tests.rs b/sample-dApps/always-succeeds-contract/src/logic/tests.rs
@@ -1,7 +1,13 @@
 use super::*;
-use naumachia::ledger_client::test_ledger_client::TestLedgerClientBuilder;
-use naumachia::smart_contract::{SmartContract, SmartContractTrait};
-use naumachia::{Address, Network};
+use naumachia::{
+    ledger_client::test_ledger_client::TestLedgerClientBuilder,
+    smart_contract::{
+        SmartContract,
+        SmartContractTrait,
+    },
+    Address,
+    Network,
+};
 
 #[tokio::test]
 async fn lock_and_claim() {

diff --git a/sample-dApps/always-succeeds-contract/src/main.rs b/sample-dApps/always-succeeds-contract/src/main.rs
@@ -1,11 +1,16 @@
 use always_succeeds_contract::logic::{
-    AlwaysSucceedsEndpoints, AlwaysSucceedsLogic, AlwaysSucceedsLookupResponses,
+    AlwaysSucceedsEndpoints,
+    AlwaysSucceedsLogic,
+    AlwaysSucceedsLookupResponses,
     AlwaysSucceedsLookups,
 };
 use clap::Parser;
 use naumachia::{
     output::OutputId,
-    smart_contract::{SmartContract, SmartContractTrait},
+    smart_contract::{
+        SmartContract,
+        SmartContractTrait,
+    },
     trireme_ledger_client::get_trireme_ledger_client_from_file,
 };
 

diff --git a/sample-dApps/checking_account/build.rs b/sample-dApps/checking_account/build.rs
@@ -1,6 +1,8 @@
 use aiken_lang::ast::Tracing;
-use aiken_project::telemetry::Terminal;
-use aiken_project::Project;
+use aiken_project::{
+    telemetry::Terminal,
+    Project,
+};
 
 const PROJECT: &str = "./checking";
 

diff --git a/sample-dApps/checking_account/checking/aiken.lock b/sample-dApps/checking_account/checking/aiken.lock
@@ -13,4 +13,4 @@ requirements = []
 source = "github"
 
 [etags]
-"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1708887379, nanos_since_epoch = 415727333 }, "cf946239d3dd481ed41f20e56bf24910b5229ea35aa171a708edc2a47fc20a7b"]
+"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1711836891, nanos_since_epoch = 667346334 }, "2a710731e0127ec3e21c6c3962a0254c98602e7428b33fc4fcaa67ab368ce1b1"]
diff --git a/sample-dApps/checking_account/src/datum.rs b/sample-dApps/checking_account/src/datum.rs
@@ -1,5 +1,10 @@
-use naumachia::scripts::context::PubKeyHash;
-use naumachia::scripts::plutus_validator::plutus_data::{Constr, PlutusData};
+use naumachia::scripts::{
+    context::PubKeyHash,
+    plutus_validator::plutus_data::{
+        Constr,
+        PlutusData,
+    },
+};
 
 #[derive(Debug, Clone, Eq, PartialEq, Hash)]
 pub enum CheckingAccountDatums {
@@ -149,7 +154,7 @@ fn allowed_puller(fields: &[PlutusData]) -> Result<CheckingAccountDatums, ()> {
     let datum = CheckingAccountDatums::AllowedPuller(AllowedPuller {
         owner,
         puller,
-        amount_lovelace: amount_lovelace as u64, //TODO
+        amount_lovelace: amount_lovelace as u64, // TODO
         next_pull,
         period,
         spending_token,

diff --git a/sample-dApps/checking_account/src/endpoints/add_puller.rs b/sample-dApps/checking_account/src/endpoints/add_puller.rs
@@ -1,14 +1,26 @@
 use crate::{
-    pull_validator, spend_token_policy, AllowedPuller, CheckingAccountDatums, CheckingAccountError,
+    pull_validator,
+    spend_token_policy,
+    AllowedPuller,
+    CheckingAccountDatums,
+    CheckingAccountError,
     SPEND_TOKEN_ASSET_NAME,
 };
-use naumachia::logic::error::{SCLogicError, SCLogicResult};
 use naumachia::{
     ledger_client::LedgerClient,
+    logic::error::{
+        SCLogicError,
+        SCLogicResult,
+    },
     policy_id::PolicyId,
-    scripts::context::{pub_key_hash_from_address_if_available, PubKeyHash},
-    scripts::MintingPolicy,
-    scripts::Validator,
+    scripts::{
+        context::{
+            pub_key_hash_from_address_if_available,
+            PubKeyHash,
+        },
+        MintingPolicy,
+        Validator,
+    },
     transaction::TxActions,
     values::Values,
 };
@@ -29,9 +41,10 @@ pub async fn add_puller<LC: LedgerClient<CheckingAccountDatums, ()>>(
         .signer_base_address()
         .await
         .map_err(|e| SCLogicError::Endpoint(Box::new(e)))?;
-    let owner = pub_key_hash_from_address_if_available(&me).ok_or(SCLogicError::Endpoint(
-        Box::new(CheckingAccountError::InvalidAddress(me.clone())),
-    ))?;
+    let owner =
+        pub_key_hash_from_address_if_available(&me).ok_or(SCLogicError::Endpoint(
+            Box::new(CheckingAccountError::InvalidAddress(me.clone())),
+        ))?;
 
     let nft_id_bytes = hex::decode(checking_account_nft_id).unwrap();
     let my_pubkey = pub_key_hash_from_address_if_available(&me).unwrap();

diff --git a/sample-dApps/checking_account/src/endpoints/fund_account.rs b/sample-dApps/checking_account/src/endpoints/fund_account.rs
@@ -1,7 +1,17 @@
-use crate::{checking_account_validator, CheckingAccountDatums, CheckingAccountError};
-use naumachia::logic::error::{SCLogicError, SCLogicResult};
+use crate::{
+    checking_account_validator,
+    CheckingAccountDatums,
+    CheckingAccountError,
+};
 use naumachia::{
-    ledger_client::LedgerClient, output::OutputId, policy_id::PolicyId, scripts::Validator,
+    ledger_client::LedgerClient,
+    logic::error::{
+        SCLogicError,
+        SCLogicResult,
+    },
+    output::OutputId,
+    policy_id::PolicyId,
+    scripts::Validator,
     transaction::TxActions,
 };
 

diff --git a/sample-dApps/checking_account/src/endpoints/init_account.rs b/sample-dApps/checking_account/src/endpoints/init_account.rs
@@ -1,16 +1,29 @@
 use crate::{
-    checking_account_validator, spend_token_policy, CheckingAccount, CheckingAccountDatums,
-    CheckingAccountError, CHECKING_ACCOUNT_NFT_ASSET_NAME,
+    checking_account_validator,
+    spend_token_policy,
+    CheckingAccount,
+    CheckingAccountDatums,
+    CheckingAccountError,
+    CHECKING_ACCOUNT_NFT_ASSET_NAME,
+};
+use nau_scripts::{
+    one_shot,
+    one_shot::OutputReference,
 };
-use nau_scripts::{one_shot, one_shot::OutputReference};
-use naumachia::logic::error::{SCLogicError, SCLogicResult};
 use naumachia::{
     ledger_client::LedgerClient,
+    logic::error::{
+        SCLogicError,
+        SCLogicResult,
+    },
     output::Output,
     policy_id::PolicyId,
-    scripts::context::pub_key_hash_from_address_if_available,
-    scripts::Validator,
-    scripts::{MintingPolicy, ScriptError},
+    scripts::{
+        context::pub_key_hash_from_address_if_available,
+        MintingPolicy,
+        ScriptError,
+        Validator,
+    },
     transaction::TxActions,
     values::Values,
 };