From 7cabd141feb420a89f846aa0b9f1b6102992e7dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bruno=20Fran=C3=A7a?= Date: Sun, 6 Oct 2024 03:15:35 +0100 Subject: [PATCH] Format --- node/.config/nextest.toml | 2 +- node/actors/bft/Cargo.toml | 44 +++++++++--------- node/actors/executor/Cargo.toml | 40 ++++++++--------- node/clippy.toml | 2 +- node/deny.toml | 14 +++--- node/libs/concurrency/Cargo.toml | 36 +++++++-------- node/libs/crypto/Cargo.toml | 42 ++++++++--------- node/libs/protobuf/Cargo.toml | 42 ++++++++--------- node/libs/protobuf_build/Cargo.toml | 32 ++++++------- node/libs/roles/Cargo.toml | 40 ++++++++--------- node/libs/storage/Cargo.toml | 40 ++++++++--------- node/libs/utils/Cargo.toml | 22 ++++----- node/tests/Cargo.toml | 28 ++++++------ node/tools/Cargo.toml | 70 ++++++++++++++--------------- 14 files changed, 227 insertions(+), 227 deletions(-) diff --git a/node/.config/nextest.toml b/node/.config/nextest.toml index ae557799..558ce287 100644 --- a/node/.config/nextest.toml +++ b/node/.config/nextest.toml @@ -42,5 +42,5 @@ final-status-level = "all" [[profile.ci.overrides]] # Force end-to-end tests to run sequentially and exclusively with all other tests -filter = "test(/::end_to_end::/)" +filter = "test(/::end_to_end::/)" threads-required = "num-test-threads" diff --git a/node/actors/bft/Cargo.toml b/node/actors/bft/Cargo.toml index 911bc0bc..70d09bd3 100644 --- a/node/actors/bft/Cargo.toml +++ b/node/actors/bft/Cargo.toml @@ -1,36 +1,36 @@ [package] -name = "zksync_consensus_bft" -version.workspace = true -edition.workspace = true -authors.workspace = true -homepage.workspace = true -license.workspace = true +authors.workspace = true +description = "ZKsync consensus bft actor" +edition.workspace = true +homepage.workspace = true +keywords.workspace = true +license.workspace = true +name = "zksync_consensus_bft" repository.workspace = true -keywords.workspace = true -description = "ZKsync consensus bft actor" +version.workspace = true [dependencies] -zksync_concurrency.workspace = true -zksync_consensus_crypto.workspace = true +zksync_concurrency.workspace = true +zksync_consensus_crypto.workspace = true zksync_consensus_network.workspace = true -zksync_consensus_roles.workspace = true +zksync_consensus_roles.workspace = true zksync_consensus_storage.workspace = true -zksync_consensus_utils.workspace = true -zksync_protobuf.workspace = true +zksync_consensus_utils.workspace = true +zksync_protobuf.workspace = true -anyhow.workspace = true +anyhow.workspace = true async-trait.workspace = true -once_cell.workspace = true -rand.workspace = true -thiserror.workspace = true -tracing.workspace = true -vise.workspace = true +once_cell.workspace = true +rand.workspace = true +thiserror.workspace = true +tracing.workspace = true +vise.workspace = true [dev-dependencies] -tokio = { workspace = true, features = ["full","test-util"]} -assert_matches.workspace = true +assert_matches.workspace = true pretty_assertions.workspace = true -test-casing.workspace = true +test-casing.workspace = true +tokio = { workspace = true, features = ["full", "test-util"] } [lints] workspace = true diff --git a/node/actors/executor/Cargo.toml b/node/actors/executor/Cargo.toml index 128d9167..a652df00 100644 --- a/node/actors/executor/Cargo.toml +++ b/node/actors/executor/Cargo.toml @@ -1,34 +1,34 @@ [package] -name = "zksync_consensus_executor" -version.workspace = true -edition.workspace = true -authors.workspace = true -homepage.workspace = true -license.workspace = true +authors.workspace = true +description = "ZKsync consensus executor actor" +edition.workspace = true +homepage.workspace = true +keywords.workspace = true +license.workspace = true +name = "zksync_consensus_executor" repository.workspace = true -keywords.workspace = true -description = "ZKsync consensus executor actor" +version.workspace = true [dependencies] -zksync_concurrency.workspace = true -zksync_consensus_bft.workspace = true -zksync_consensus_crypto.workspace = true +zksync_concurrency.workspace = true +zksync_consensus_bft.workspace = true +zksync_consensus_crypto.workspace = true zksync_consensus_network.workspace = true -zksync_consensus_roles.workspace = true +zksync_consensus_roles.workspace = true zksync_consensus_storage.workspace = true -zksync_consensus_utils.workspace = true -zksync_protobuf.workspace = true +zksync_consensus_utils.workspace = true +zksync_protobuf.workspace = true -anyhow.workspace = true +anyhow.workspace = true async-trait.workspace = true -rand.workspace = true -semver.workspace = true -tracing.workspace = true -vise.workspace = true +rand.workspace = true +semver.workspace = true +tracing.workspace = true +vise.workspace = true [dev-dependencies] test-casing.workspace = true -tokio.workspace = true +tokio.workspace = true [lints] workspace = true diff --git a/node/clippy.toml b/node/clippy.toml index 5e0d86e6..6b5cca0f 100644 --- a/node/clippy.toml +++ b/node/clippy.toml @@ -1,2 +1,2 @@ enum-variant-size-threshold = 500 -missing-docs-in-crate-items = true \ No newline at end of file +missing-docs-in-crate-items = true diff --git a/node/deny.toml b/node/deny.toml index a20c3658..b5bda861 100644 --- a/node/deny.toml +++ b/node/deny.toml @@ -1,8 +1,8 @@ [graph] # We only check dependencies against these platforms. targets = [ - { triple = "x86_64-unknown-linux-musl" }, { triple = "x86_64-apple-darwin" }, + { triple = "x86_64-unknown-linux-musl" }, ] [licenses] @@ -14,9 +14,9 @@ allow = [ "Apache-2.0", "BSD-2-Clause", "BSD-3-Clause", - "OpenSSL", "ISC", "MIT", + "OpenSSL", "Unicode-DFS-2016", # Weak copyleft licenses "MPL-2.0", @@ -31,7 +31,7 @@ name = "ring" # license, for third_party/fiat, which, unlike other third_party directories, is # compiled into non-test libraries, is included below." # OpenSSL - Obviously -expression = "MIT" +expression = "MIT" license-files = [{ path = "LICENSE", hash = 0xbd0eed23 }] [bans] @@ -53,14 +53,14 @@ skip = [ { name = "base64", version = "0.21.7" }, # Old versions required by vise-exporter. - { name = "http", version = "0.2.12"}, - { name = "http-body", version = "0.4.6"}, - { name = "hyper", version = "0.14.28"}, + { name = "http", version = "0.2.12" }, + { name = "http-body", version = "0.4.6" }, + { name = "hyper", version = "0.14.28" }, # Old version required by rand. { name = "zerocopy", version = "0.6.6" }, ] [sources] +unknown-git = "deny" unknown-registry = "deny" -unknown-git = "deny" diff --git a/node/libs/concurrency/Cargo.toml b/node/libs/concurrency/Cargo.toml index a87980ac..2a79cbb3 100644 --- a/node/libs/concurrency/Cargo.toml +++ b/node/libs/concurrency/Cargo.toml @@ -1,26 +1,26 @@ [package] -name = "zksync_concurrency" -version.workspace = true -edition.workspace = true -authors.workspace = true -homepage.workspace = true -license.workspace = true +authors.workspace = true +description = "Structured concurrency framework" +edition.workspace = true +homepage.workspace = true +keywords.workspace = true +license.workspace = true +name = "zksync_concurrency" repository.workspace = true -keywords.workspace = true -description = "Structured concurrency framework" +version.workspace = true [dependencies] -anyhow.workspace = true -once_cell.workspace = true -pin-project.workspace = true -rand.workspace = true -sha3.workspace = true -thiserror.workspace = true -time.workspace = true -tokio.workspace = true -tracing.workspace = true +anyhow.workspace = true +once_cell.workspace = true +pin-project.workspace = true +rand.workspace = true +sha3.workspace = true +thiserror.workspace = true +time.workspace = true +tokio.workspace = true tracing-subscriber.workspace = true -vise.workspace = true +tracing.workspace = true +vise.workspace = true [lints] workspace = true diff --git a/node/libs/crypto/Cargo.toml b/node/libs/crypto/Cargo.toml index 0cb53a29..682deedf 100644 --- a/node/libs/crypto/Cargo.toml +++ b/node/libs/crypto/Cargo.toml @@ -1,28 +1,28 @@ [package] -name = "zksync_consensus_crypto" -version.workspace = true -edition.workspace = true -authors.workspace = true -homepage.workspace = true -license.workspace = true +authors.workspace = true +description = "ZKsync consensus cryptographic utilities" +edition.workspace = true +homepage.workspace = true +keywords.workspace = true +license.workspace = true +name = "zksync_consensus_crypto" repository.workspace = true -keywords.workspace = true -description = "ZKsync consensus cryptographic utilities" +version.workspace = true [dependencies] -anyhow.workspace = true -blst.workspace = true -ed25519-dalek.workspace = true +anyhow.workspace = true +blst.workspace = true +ed25519-dalek.workspace = true elliptic-curve.workspace = true -hex.workspace = true -k256.workspace = true -num-bigint.workspace = true -num-traits.workspace = true -rand.workspace = true -sha3.workspace = true -thiserror.workspace = true -tracing.workspace = true -zeroize.workspace = true +hex.workspace = true +k256.workspace = true +num-bigint.workspace = true +num-traits.workspace = true +rand.workspace = true +sha3.workspace = true +thiserror.workspace = true +tracing.workspace = true +zeroize.workspace = true [dev-dependencies] criterion.workspace = true @@ -31,5 +31,5 @@ criterion.workspace = true workspace = true [[bench]] -name = "bench" harness = false +name = "bench" diff --git a/node/libs/protobuf/Cargo.toml b/node/libs/protobuf/Cargo.toml index 64cd3c12..afa981fe 100644 --- a/node/libs/protobuf/Cargo.toml +++ b/node/libs/protobuf/Cargo.toml @@ -1,34 +1,34 @@ [package] -name = "zksync_protobuf" -version.workspace = true -edition.workspace = true -authors.workspace = true -homepage.workspace = true -license.workspace = true +authors.workspace = true +description = "ZKsync consensus protobuf types and utilities" +edition.workspace = true +homepage.workspace = true +keywords.workspace = true +license.workspace = true +links = "zksync_protobuf_proto" +name = "zksync_protobuf" repository.workspace = true -keywords.workspace = true -links = "zksync_protobuf_proto" -description = "ZKsync consensus protobuf types and utilities" +version.workspace = true [dependencies] -zksync_concurrency.workspace = true +zksync_concurrency.workspace = true zksync_consensus_utils.workspace = true -anyhow.workspace = true -bit-vec.workspace = true -once_cell.workspace = true -prost.workspace = true -prost-reflect.workspace = true +anyhow.workspace = true +bit-vec.workspace = true +once_cell.workspace = true +prost-reflect.workspace = true +prost.workspace = true quick-protobuf.workspace = true -rand.workspace = true -serde.workspace = true -serde_json.workspace = true -serde_yaml.workspace = true +rand.workspace = true +serde.workspace = true +serde_json.workspace = true +serde_yaml.workspace = true [dev-dependencies] -tokio.workspace = true -tracing.workspace = true +tokio.workspace = true tracing-subscriber.workspace = true +tracing.workspace = true [build-dependencies] zksync_protobuf_build.workspace = true diff --git a/node/libs/protobuf_build/Cargo.toml b/node/libs/protobuf_build/Cargo.toml index 8150a8d6..889cc5e1 100644 --- a/node/libs/protobuf_build/Cargo.toml +++ b/node/libs/protobuf_build/Cargo.toml @@ -1,24 +1,24 @@ [package] -name = "zksync_protobuf_build" -version.workspace = true -edition.workspace = true -authors.workspace = true -homepage.workspace = true -license.workspace = true +authors.workspace = true +description = "ZKsync consensus protobuf codegen" +edition.workspace = true +homepage.workspace = true +keywords.workspace = true +license.workspace = true +name = "zksync_protobuf_build" repository.workspace = true -keywords.workspace = true -description = "ZKsync consensus protobuf codegen" +version.workspace = true [dependencies] -anyhow.workspace = true -heck.workspace = true -prettyplease.workspace = true -proc-macro2.workspace = true -prost-build.workspace = true +anyhow.workspace = true +heck.workspace = true +prettyplease.workspace = true +proc-macro2.workspace = true +prost-build.workspace = true prost-reflect.workspace = true -protox.workspace = true -quote.workspace = true -syn.workspace = true +protox.workspace = true +quote.workspace = true +syn.workspace = true [lints] workspace = true diff --git a/node/libs/roles/Cargo.toml b/node/libs/roles/Cargo.toml index 52e1656c..07be3ff1 100644 --- a/node/libs/roles/Cargo.toml +++ b/node/libs/roles/Cargo.toml @@ -1,30 +1,30 @@ [package] -name = "zksync_consensus_roles" -version.workspace = true -edition.workspace = true -authors.workspace = true -homepage.workspace = true -license.workspace = true +authors.workspace = true +description = "ZKsync consensus node role types" +edition.workspace = true +homepage.workspace = true +keywords.workspace = true +license.workspace = true +links = "zksync_consensus_roles_proto" +name = "zksync_consensus_roles" repository.workspace = true -keywords.workspace = true -links = "zksync_consensus_roles_proto" -description = "ZKsync consensus node role types" +version.workspace = true [dependencies] -zksync_concurrency.workspace = true +zksync_concurrency.workspace = true zksync_consensus_crypto.workspace = true -zksync_consensus_utils.workspace = true -zksync_protobuf.workspace = true +zksync_consensus_utils.workspace = true +zksync_protobuf.workspace = true -anyhow.workspace = true -bit-vec.workspace = true -hex.workspace = true -prost.workspace = true -rand.workspace = true -serde.workspace = true -thiserror.workspace = true -tracing.workspace = true +anyhow.workspace = true +bit-vec.workspace = true +hex.workspace = true num-bigint.workspace = true +prost.workspace = true +rand.workspace = true +serde.workspace = true +thiserror.workspace = true +tracing.workspace = true [dev-dependencies] assert_matches.workspace = true diff --git a/node/libs/storage/Cargo.toml b/node/libs/storage/Cargo.toml index 5989b005..2b27fc67 100644 --- a/node/libs/storage/Cargo.toml +++ b/node/libs/storage/Cargo.toml @@ -1,33 +1,33 @@ [package] -name = "zksync_consensus_storage" -version.workspace = true -edition.workspace = true -authors.workspace = true -homepage.workspace = true -license.workspace = true +authors.workspace = true +description = "ZKsync consensus storage" +edition.workspace = true +homepage.workspace = true +keywords.workspace = true +license.workspace = true +name = "zksync_consensus_storage" repository.workspace = true -keywords.workspace = true -description = "ZKsync consensus storage" +version.workspace = true [dependencies] -zksync_concurrency.workspace = true -zksync_consensus_roles.workspace = true +zksync_concurrency.workspace = true zksync_consensus_crypto.workspace = true -zksync_protobuf.workspace = true +zksync_consensus_roles.workspace = true +zksync_protobuf.workspace = true -anyhow.workspace = true +anyhow.workspace = true async-trait.workspace = true -prost.workspace = true -rand.workspace = true -thiserror.workspace = true -tracing.workspace = true -vise.workspace = true +prost.workspace = true +rand.workspace = true +thiserror.workspace = true +tracing.workspace = true +vise.workspace = true [dev-dependencies] assert_matches.workspace = true -tempfile.workspace = true -test-casing.workspace = true -tokio.workspace = true +tempfile.workspace = true +test-casing.workspace = true +tokio.workspace = true [build-dependencies] zksync_protobuf_build.workspace = true diff --git a/node/libs/utils/Cargo.toml b/node/libs/utils/Cargo.toml index bd92cbd0..6c01fb62 100644 --- a/node/libs/utils/Cargo.toml +++ b/node/libs/utils/Cargo.toml @@ -1,19 +1,19 @@ [package] -name = "zksync_consensus_utils" -version.workspace = true -edition.workspace = true -authors.workspace = true -homepage.workspace = true -license.workspace = true +authors.workspace = true +description = "ZKsync consensus utilities" +edition.workspace = true +homepage.workspace = true +keywords.workspace = true +license.workspace = true +name = "zksync_consensus_utils" repository.workspace = true -keywords.workspace = true -description = "ZKsync consensus utilities" +version.workspace = true [dependencies] +anyhow.workspace = true +rand.workspace = true +thiserror.workspace = true zksync_concurrency.workspace = true -rand.workspace = true -thiserror.workspace = true -anyhow.workspace = true [lints] workspace = true diff --git a/node/tests/Cargo.toml b/node/tests/Cargo.toml index 7f1e33ce..7cec9aae 100644 --- a/node/tests/Cargo.toml +++ b/node/tests/Cargo.toml @@ -1,24 +1,24 @@ [package] -name = "tester" -version.workspace = true -edition.workspace = true -authors.workspace = true -homepage.workspace = true -license.workspace = true +authors.workspace = true +edition.workspace = true +homepage.workspace = true +keywords.workspace = true +license.workspace = true +name = "tester" +publish = false repository.workspace = true -keywords.workspace = true -publish = false +version.workspace = true [dependencies] zksync_consensus_tools.workspace = true -serde_json.workspace = true -tokio.workspace = true -jsonrpsee.workspace = true -clap.workspace = true -tracing.workspace = true -anyhow.workspace = true +anyhow.workspace = true +clap.workspace = true +jsonrpsee.workspace = true +serde_json.workspace = true +tokio.workspace = true tracing-subscriber.workspace = true +tracing.workspace = true [lints] workspace = true diff --git a/node/tools/Cargo.toml b/node/tools/Cargo.toml index 2134e4b1..fa904c9b 100644 --- a/node/tools/Cargo.toml +++ b/node/tools/Cargo.toml @@ -1,45 +1,45 @@ [package] -name = "zksync_consensus_tools" -version.workspace = true -edition.workspace = true -authors.workspace = true -homepage.workspace = true -license.workspace = true +authors.workspace = true +default-run = "executor" +description = "ZKsync consensus tools" +edition.workspace = true +homepage.workspace = true +keywords.workspace = true +license.workspace = true +name = "zksync_consensus_tools" +publish = false repository.workspace = true -keywords.workspace = true -publish = false -default-run = "executor" -description = "ZKsync consensus tools" +version.workspace = true [dependencies] -zksync_concurrency.workspace = true -zksync_consensus_bft.workspace = true -zksync_consensus_crypto.workspace = true +zksync_concurrency.workspace = true +zksync_consensus_bft.workspace = true +zksync_consensus_crypto.workspace = true zksync_consensus_executor.workspace = true -zksync_consensus_roles.workspace = true -zksync_consensus_storage.workspace = true -zksync_consensus_utils.workspace = true -zksync_consensus_network.workspace = true -zksync_protobuf.workspace = true +zksync_consensus_network.workspace = true +zksync_consensus_roles.workspace = true +zksync_consensus_storage.workspace = true +zksync_consensus_utils.workspace = true +zksync_protobuf.workspace = true -anyhow.workspace = true -async-trait.workspace = true -clap.workspace = true -prost.workspace = true -rand.workspace = true -rocksdb.workspace = true -serde.workspace = true -serde_json.workspace = true -tokio.workspace = true -tracing.workspace = true +anyhow.workspace = true +async-trait.workspace = true +clap.workspace = true +jsonrpsee.workspace = true +k8s-openapi.workspace = true +kube.workspace = true +prost.workspace = true +rand.workspace = true +rocksdb.workspace = true +rustls-pemfile.workspace = true +serde.workspace = true +serde_json.workspace = true +tokio-rustls.workspace = true +tokio.workspace = true +tower.workspace = true tracing-subscriber.workspace = true -vise-exporter.workspace = true -jsonrpsee.workspace = true -tower.workspace = true -kube.workspace = true -k8s-openapi.workspace = true -tokio-rustls.workspace = true -rustls-pemfile.workspace = true +tracing.workspace = true +vise-exporter.workspace = true [dev-dependencies] tempfile.workspace = true