Run make format after adding taplo

Author: dannywillems

.rustfmt.toml

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

Cargo.toml

@@ -1,41 +1,41 @@
 [workspace]
 members = [
-    "core",
-    "macros",
-    "ledger",
-    "snark",
-    "p2p",
-    "p2p/testing",
-    "p2p/libp2p-rpc-behaviour",
-    "node",
-    "node/account",
-    "node/common",
-    "node/native",
-    "node/web",
-    "node/invariants",
-    "node/testing",
-    "cli",
-    "cli/replay_dynamic_effects",
-    "vrf",
-
-    "mina-p2p-messages",
-    "ledger",
-    "poseidon",
-
-    "tools/transport",
-    "tools/bootstrap-sandbox",
-    "tools/gossipsub-sandbox",
-    "tools/hash-tool",
-    "tools/ledger-tool",
-    "tools/salsa-simple",
-    "tools/fuzzing",
-    "tools/archive-breadcrumb-compare",
-    "tools/heartbeats-processor",
-    "tools/webrtc-sniffer",
-
-    "producer-dashboard",
-
-    "fuzzer",
+  "core",
+  "macros",
+  "ledger",
+  "snark",
+  "p2p",
+  "p2p/testing",
+  "p2p/libp2p-rpc-behaviour",
+  "node",
+  "node/account",
+  "node/common",
+  "node/native",
+  "node/web",
+  "node/invariants",
+  "node/testing",
+  "cli",
+  "cli/replay_dynamic_effects",
+  "vrf",
+
+  "mina-p2p-messages",
+  "ledger",
+  "poseidon",
+
+  "tools/transport",
+  "tools/bootstrap-sandbox",
+  "tools/gossipsub-sandbox",
+  "tools/hash-tool",
+  "tools/ledger-tool",
+  "tools/salsa-simple",
+  "tools/fuzzing",
+  "tools/archive-breadcrumb-compare",
+  "tools/heartbeats-processor",
+  "tools/webrtc-sniffer",
+
+  "producer-dashboard",
+
+  "fuzzer",
 ]
 
 resolver = "2"
@@ -46,31 +46,31 @@ arithmetic_side_effects = "warn"
 indexing_slicing = "warn"
 
 [workspace.dependencies]
+ledger = { path = "ledger", package = "mina-tree" }
 mina-p2p-messages = { path = "mina-p2p-messages" }
 poseidon = { path = "poseidon" }
-ledger = { path = "ledger", package = "mina-tree" }
 
+mina-curves = { git = "https://github.com/openmina/proof-systems", rev = "f461b4b" }
 mina-hasher = { git = "https://github.com/openmina/proof-systems", rev = "f461b4b" }
 mina-signer = { git = "https://github.com/openmina/proof-systems", rev = "f461b4b" }
-mina-curves = { git = "https://github.com/openmina/proof-systems", rev = "f461b4b" }
 # UNCOMMENTED_IN_CI mina-curves = { git = "https://github.com/openmina/proof-systems", rev = "f461b4b", features = [ "32x9" ] }
-o1-utils = { git = "https://github.com/openmina/proof-systems", rev = "f461b4b" }
 kimchi = { git = "https://github.com/openmina/proof-systems", rev = "f461b4b" }
 mina-poseidon = { git = "https://github.com/openmina/proof-systems", rev = "f461b4b" }
+o1-utils = { git = "https://github.com/openmina/proof-systems", rev = "f461b4b" }
 poly-commitment = { git = "https://github.com/openmina/proof-systems", rev = "f461b4b" }
 
+juniper = { version = "0.16" }
 libp2p = { git = "https://github.com/openmina/rust-libp2p", rev = "5c44c7d9", default-features = false }
-vrf = { path = "vrf" }
+linkme = "0.3.22"
 openmina-node-account = { path = "node/account" }
 redux = { git = "https://github.com/openmina/redux-rs.git", rev = "ab14890c", features = [
-    "serde",
+  "serde",
 ] }
 serde = "1.0.190"
 serde_json = "1.0.107"
 serde_with = { version = "3.7.0", features = ["hex"] }
-linkme = "0.3.22"
 static_assertions = "1.1.0"
-juniper = { version = "0.16" }
+vrf = { path = "vrf" }
 
 ark-ff = { version = "0.3.0", features = ["parallel", "asm", "std"] }
 # UNCOMMENTED_IN_CI ark-ff = { version = "0.3.0", features = [ "parallel", "asm", "std", "32x9" ] }

cli/Cargo.toml

@@ -9,39 +9,39 @@ name = "openmina"
 path = "src/main.rs"
 
 [dependencies]
-sha2 = "0.10"
 hex = "0.4"
-rand = "0.8.0"
-serde = "1.0.158"
+ledger = { workspace = true }
+libp2p-identity = { version = "=0.2.7", features = ["peerid"] }
+mina-p2p-messages = { workspace = true }
 num_cpus = "1.0"
+rand = "0.8.0"
 rayon = "1.5"
-tokio = { version = "1.26.0" }
-libp2p-identity = { version = "=0.2.7", features = ["peerid"] }
 redux = { workspace = true }
-ledger = { workspace = true }
-mina-p2p-messages = { workspace = true }
+serde = "1.0.158"
+sha2 = "0.10"
+tokio = { version = "1.26.0" }
 vrf = { workspace = true }
 
-console = "0.15.5"
-clap = { version = "4.3", features = [ "derive", "env" ] }
-time = { version = "0.3", features = ["formatting", "macros", "parsing"] }
 anyhow = "1.0.81"
+clap = { version = "4.3", features = ["derive", "env"] }
+console = "0.15.5"
 reqwest = { version = "0.11.24", features = ["blocking", "json"] }
+time = { version = "0.3", features = ["formatting", "macros", "parsing"] }
 
-openmina-core = { path = "../core" }
-node = { path = "../node", features = ["replay"] }
-openmina-node-native = { path = "../node/native" }
-openmina-node-account = { path = "../node/account" }
+backtrace = "0.3"
 bytes = "1.4.0"
-tracing = "0.1.37"
-nix = { version = "0.26.2", features = ["signal"] }
-shellexpand = "3.1.0"
 dialoguer = "0.10.4"
+nix = { version = "0.26.2", features = ["signal"] }
+node = { path = "../node", features = ["replay"] }
+openmina-core = { path = "../core" }
+openmina-node-account = { path = "../node/account" }
+openmina-node-native = { path = "../node/native" }
 serde_json = "1.0.107"
-backtrace = "0.3"
+shellexpand = "3.1.0"
+tracing = "0.1.37"
 
 [target.'cfg(not(target_family = "wasm"))'.dependencies]
-redux = { workspace = true, features=["serializable_callbacks"] }
+redux = { workspace = true, features = ["serializable_callbacks"] }
 tikv-jemallocator = "0.6"
 
 [dev-dependencies]

cli/replay_dynamic_effects/Cargo.toml

@@ -10,5 +10,5 @@ name = "replay_dynamic_effects"
 
 [dependencies]
 node = { path = "../../node", features = ["replay"] }
-openmina-node-native = { path = "../../node/native" }
 openmina-node-invariants = { path = "../../node/invariants" }
+openmina-node-native = { path = "../../node/native" }

clippy.toml

@@ -1 +1 @@
-allow-unwrap-in-tests=true
+allow-unwrap-in-tests = true

core/Cargo.toml

@@ -5,42 +5,39 @@ edition = "2021"
 license = "Apache-2.0"
 
 [dependencies]
-lazy_static = "1.4.0"
-once_cell = "1"
-serde = { version = "1.0.147", features = ["rc"] }
-serde_json = "1.0"
-slab = { version = "0.4.7", features = ["serde"] }
-tracing = { version = "0.1", features = ["std"] }
-sha2 = "0.10.6"
+argon2 = { version = "0.5.3", features = ["std"] }
+base64 = "0.22"
 binprot = { git = "https://github.com/openmina/binprot-rs", rev = "400b52c" }
 binprot_derive = { git = "https://github.com/openmina/binprot-rs", rev = "400b52c" }
-rand = "0.8.0"
-redux = { workspace = true }
-tokio = { version = "1.26", features = ["sync"] }
+bs58 = "0.4.0"
+crypto_secretbox = { version = "0.1.1", features = ["std"] }
 flume = { version = "0.11.1", features = ["async", "spin"] }
-time = { version = "0.3", features = ["formatting", "macros", "parsing"] }
+lazy_static = "1.4.0"
 md5 = "0.7.0"
 multihash = { version = "0.18.1", features = ["blake2b"] }
-openmina-macros = { path = "../macros" }
+once_cell = "1"
 openmina-fuzzer = { path = "../fuzzer", optional = true }
-argon2 = { version = "0.5.3", features = ["std"] }
-crypto_secretbox = { version = "0.1.1", features = ["std"] }
-base64 = "0.22"
-bs58 = "0.4.0"
+openmina-macros = { path = "../macros" }
+rand = "0.8.0"
+redux = { workspace = true }
+serde = { version = "1.0.147", features = ["rc"] }
+serde_json = "1.0"
+sha2 = "0.10.6"
+slab = { version = "0.4.7", features = ["serde"] }
 thiserror = "1.0.37"
+time = { version = "0.3", features = ["formatting", "macros", "parsing"] }
+tokio = { version = "1.26", features = ["sync"] }
+tracing = { version = "0.1", features = ["std"] }
 
 graphannis-malloc_size_of = { workspace = true }
 graphannis-malloc_size_of_derive = { workspace = true }
 
+ark-ff = { workspace = true }
+hex = "0.4.3"
+libp2p-identity = { version = "=0.2.7", features = ["serde", "peerid"] }
 mina-hasher = { workspace = true }
 mina-p2p-messages = { workspace = true }
 poseidon = { workspace = true }
-hex = "0.4.3"
-ark-ff = { workspace = true }
-libp2p-identity = { version = "=0.2.7", features = [
-    "serde",
-    "peerid"
-] }
 
 [target.'cfg(not(target_family = "wasm"))'.dependencies]
 redux = { workspace = true, features = ["serializable_callbacks"] }

fuzzer/Cargo.toml

@@ -5,8 +5,8 @@ edition = "2021"
 license = "Apache-2.0"
 
 [dependencies]
-rand = { version = "0.8", features = [ "small_rng" ] }
-rand_distr = "0.4.3"
 lazy_static = "1.4.0"
-serde = { workspace = true, features = [ "derive" ] }
+rand = { version = "0.8", features = ["small_rng"] }
+rand_distr = "0.4.3"
+serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }

ledger/Cargo.toml

@@ -17,39 +17,39 @@ crate-type = ["staticlib", "cdylib", "lib"]
 # https://stackoverflow.com/a/73023306
 
 [dependencies]
-openmina-core = { path = "../core" }
-redux = { workspace = true }
+juniper = { workspace = true }
+kimchi = { workspace = true }
+mina-curves = { workspace = true }
 mina-hasher = { workspace = true }
+mina-poseidon = { workspace = true }
 mina-signer = { workspace = true }
-mina-curves = { workspace = true }
 o1-utils = { workspace = true }
-kimchi = { workspace = true }
-mina-poseidon = { workspace = true }
+openmina-core = { path = "../core" }
+openmina-macros = { path = "../macros" }
 poly-commitment = { workspace = true }
-juniper = { workspace = true }
 poseidon = { workspace = true }
-openmina-macros = { path = "../macros" }
+redux = { workspace = true }
 strum = "0.26.2"
 strum_macros = "0.26.4"
 
 bs58 = "0.4.0"
 mina-p2p-messages = { workspace = true }
 
-sha2 = "0.10"
 base64 = "0.13"
 lazy_static = "1.4.0"
 libc = "0.2"
+sha2 = "0.10"
 
 # oracle = { path = "../oracle" }
 # mina-curves = { path = "../curves" }
 # o1-utils = { path = "../utils" }
 
 itertools = "0.10"
 
+ark-ec = { version = "0.3.0", features = ["std"] }
 ark-ff = { workspace = true }
-ark-ec = { version = "0.3.0", features = [ "std" ] }
-ark-serialize = { version = "0.3.0", features = [ "std" ] }
-ark-poly = { version = "0.3.0", features = [ "std" ] }
+ark-poly = { version = "0.3.0", features = ["std"] }
+ark-serialize = { version = "0.3.0", features = ["std"] }
 
 rayon = "1.5"
 
@@ -58,21 +58,23 @@ hex = "0.4.3"
 num-bigint = "0.4"
 
 once_cell = "1"
-rand = {version = "0.8", features = [ "small_rng" ] }
-uuid = { version = "1", features = [ "v4" ] }
+rand = { version = "0.8", features = ["small_rng"] }
+uuid = { version = "1", features = ["v4"] }
 
+postcard = { version = "1.0.9", features = ["use-std"] }
 serde = { version = "1.0", features = ["rc"] }
 serde_json = { version = "1.0", features = ["float_roundtrip"] }
-postcard = { version = "1.0.9", features = ["use-std"] }
 
+anyhow = "1.0.75"
 backtrace = "0.3"
-derive_more = "0.99.17"
 blake2 = "0.10"
 crc32fast = "1"
+derive_more = "0.99.17"
+fraction = { version = "=0.15.1", default-features = false, features = [
+  "with-serde-support",
+] }
 serde_with = "3.6.1"
-anyhow = "1.0.75"
 thiserror = "1.0.60"
-fraction = { version = "=0.15.1", default-features = false, features = ["with-serde-support"] }
 
 [target.'cfg(target_family = "wasm")'.dependencies]
 getrandom = { version = "0.2", features = ["js"] }
@@ -94,7 +96,18 @@ rsa = "0.9"
 
 [target.'cfg(target_family = "wasm")'.dev-dependencies]
 wasm-bindgen-test = "0.3.0"
-web-sys = { version = "0.3", features = ["Blob", "DedicatedWorkerGlobalScope", "MessageEvent", "Url", "Worker", "WorkerType", "WorkerOptions", "console", "Window", "Performance" ] }
+web-sys = { version = "0.3", features = [
+  "Blob",
+  "DedicatedWorkerGlobalScope",
+  "MessageEvent",
+  "Url",
+  "Worker",
+  "WorkerType",
+  "WorkerOptions",
+  "console",
+  "Window",
+  "Performance",
+] }
 
 [features]
 # Put zstd behind a feature, cargo always re-compile it without touching the files

macros/Cargo.toml

@@ -3,7 +3,7 @@ name = "openmina-macros"
 version = "0.16.0"
 edition = "2021"
 license = "Apache-2.0"
-authors = [ "Alexander Koptelov <[email protected]>" ]
+authors = ["Alexander Koptelov <[email protected]>"]
 
 [lib]
 proc-macro = true