Merge pull request #1172 from openmina/rustfmt-proof-systems

Rustfmt proof systems

Author: dannywillems

.github/workflows/fmt.yaml

@@ -0,0 +1,19 @@
+name: Format
+
+on:
+  push:
+    branches: [ main, develop ]
+  pull_request:
+
+jobs:
+  format:
+    name: Format using nightly
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
+        with:
+          toolchain: nightly
+          components: rustfmt
+      - name: rustfmt
+        run: make check-format

.github/workflows/lint.yml

@@ -1,4 +1,4 @@
-name: lint
+name: Lint
 
 on:
   push:
@@ -18,12 +18,8 @@ jobs:
       - uses: dtolnay/rust-toolchain@stable
         with:
           toolchain: 1.84
-          components: rustfmt, clippy
-      - name: rustfmt
-        run: cargo fmt --all -- --check
+          components: clippy, rustfmt
       - name: check
-        run: cargo check --all-targets
-        env:
-          RUSTFLAGS: -D warnings
+        run: make check
       - name: clippy
-        run: cargo clippy --all-targets -- -D warnings --allow clippy::mutable_key_type
+        run: make lint

.rustfmt.toml

@@ -0,0 +1,3 @@
+indent_style = "Block"
+imports_granularity = "Crate"
+reorder_imports = true

Makefile

@@ -24,13 +24,17 @@ build-wasm: ## Build WebAssembly node
 check: ## Check code for compilation errors
 	cargo check --all-targets
 
+.PHONY: check-format
+check-format: ## Check code formatting
+	cargo +nightly fmt -- --check
+
 .PHONY: clean
 clean: ## Clean build artifacts
 	cargo clean
 
-.PHONY: fmt
-fmt: ## Format code using rustfmt
-	cargo fmt --all
+.PHONY: format
+format: ## Format code using rustfmt
+	cargo +nightly fmt
 
 .PHONY: lint
 lint: ## Run linter (clippy)

cli/src/commands/misc.rs

@@ -1,6 +1,5 @@
 use libp2p_identity::PeerId;
-use node::account::AccountSecretKey;
-use node::p2p::identity::SecretKey;
+use node::{account::AccountSecretKey, p2p::identity::SecretKey};
 
 #[derive(Debug, clap::Args)]
 pub struct Misc {

cli/src/commands/node/mod.rs

@@ -11,11 +11,12 @@ use node::{
 use openmina_node_account::AccountPublicKey;
 use reqwest::Url;
 
-use node::core::log::inner::Level;
-use node::p2p::connection::outgoing::P2pConnectionOutgoingInitOpts;
-use node::p2p::identity::SecretKey;
-use node::service::Recorder;
-use node::SnarkerStrategy;
+use node::{
+    core::log::inner::Level,
+    p2p::{connection::outgoing::P2pConnectionOutgoingInitOpts, identity::SecretKey},
+    service::Recorder,
+    SnarkerStrategy,
+};
 
 use openmina_node_native::{archive::config::ArchiveStorageOptions, tracing, NodeBuilder};
 

cli/src/exit_with_error.rs

@@ -1,6 +1,5 @@
 use console::style;
-use std::fmt::Display;
-use std::process;
+use std::{fmt::Display, process};
 
 pub fn exit_with_error<E: Display>(error: E) -> ! {
     eprintln!("{} {:#}", style("[ERROR]").red().bold(), error,);

cli/src/main.rs

@@ -66,8 +66,7 @@ fn setup_var_from_single_and_only_thread() {
 /// We store (+ display) panics in non-main threads, and display them all when the main thread panics.
 #[cfg(not(target_family = "wasm"))]
 fn new_hook(info: &PanicHookInfo<'_>) {
-    use std::any::Any;
-    use std::io::Write;
+    use std::{any::Any, io::Write};
 
     fn payload_as_str(payload: &dyn Any) -> &str {
         if let Some(&s) = payload.downcast_ref::<&'static str>() {

core/src/block/mod.rs

@@ -10,9 +10,9 @@ pub mod genesis;
 
 use std::sync::Arc;
 
-pub use mina_p2p_messages::v2::MinaBlockBlockStableV2 as Block;
-pub use mina_p2p_messages::v2::MinaBlockHeaderStableV2 as BlockHeader;
-pub use mina_p2p_messages::v2::StateHash as BlockHash;
+pub use mina_p2p_messages::v2::{
+    MinaBlockBlockStableV2 as Block, MinaBlockHeaderStableV2 as BlockHeader, StateHash as BlockHash,
+};
 
 pub type ArcBlock = Arc<Block>;
 pub type ArcBlockWithHash = BlockWithHash<Arc<Block>>;

core/src/chain_id.rs

@@ -2,8 +2,7 @@ use mina_p2p_messages::v2::{
     MinaBaseProtocolConstantsCheckedValueStableV1, StateHash, UnsignedExtendedUInt32StableV1,
 };
 use multihash::{Blake2b256, Hasher};
-use time::macros::format_description;
-use time::OffsetDateTime;
+use time::{macros::format_description, OffsetDateTime};
 
 use std::{
     fmt::{self, Debug, Display, Formatter},