GRIN/nym
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cargo: try out inheriting workspace metadata (#2853)

Browse Source 
* cargo: add log as a workspace dependency

* cargo: add authors to top-level workspace

* cargo: add a few more entried to workspace package
This commit is contained in:
Jon Häggblad
2023-01-18 10:13:11 +01:00
committed by GitHub
parent 48def795d9
commit e548d6f1f8
31 changed files with 42 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.toml
+9
View File
@@ -95,3 +95,12 @@ default-members = [
]
exclude = ["explorer", "contracts", "clients/webassembly", "nym-wallet", "nym-connect"]
[workspace.package]
authors = ["Nym Technologies SA"]
repository = "https://github.com/nymtech/nym"
homepage = "https://nymtech.net"
edition = "2021"
[workspace.dependencies]
log = "0.4"
clients/client-core/Cargo.toml
+1 -1
View File
@@ -13,7 +13,7 @@ dirs = "4.0"
dashmap = "5.4.0"
futures = "0.3"
humantime-serde = "1.0"
log = "0.4"
log = { workspace = true }
rand = { version = "0.7.3", features = ["wasm-bindgen"] }
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0.89"
clients/native/Cargo.toml
+1 -1
View File
@@ -23,7 +23,7 @@ url = "2.2"
clap = { version = "4.0", features = ["cargo", "derive"] }
dirs = "4.0"
lazy_static = "1.4.0"
log = "0.4" # self explanatory
log = { workspace = true } # self explanatory
pretty_env_logger = "0.4" # for formatting log messages
rand = { version = "0.7.3", features = ["wasm-bindgen"] } # rng-related traits + some rng implementation to use
serde = { version = "1.0.104", features = ["derive"] } # for config serialization/deserialization
clients/socks5/Cargo.toml
+1 -1
View File
@@ -15,7 +15,7 @@ clap = { version = "4.0", features = ["cargo", "derive"] }
dirs = "4.0"
futures = "0.3"
lazy_static = "1.4.0"
log = "0.4"
log = { workspace = true }
pin-project = "1.0"
pretty_env_logger = "0.4"
rand = { version = "0.7.3", features = ["wasm-bindgen"] }
common/client-connections/Cargo.toml
+1 -1
View File
@@ -7,4 +7,4 @@ edition = "2021"
[dependencies]
futures = "0.3"
log = "0.4.17"
log = { workspace = true }
common/client-libs/gateway-client/Cargo.toml
+1 -1
View File
@@ -10,7 +10,7 @@ edition = "2021"
# TODO: (for this and other crates), similarly to 'tokio', import only required "futures" modules rather than
# the entire crate
futures = "0.3"
log = "0.4"
log = { workspace = true }
thiserror = "1.0"
url = "2.2"
rand = { version = "0.7.3", features = ["wasm-bindgen"] }
common/client-libs/mixnet-client/Cargo.toml
+1 -1
View File
@@ -8,7 +8,7 @@ edition = "2021"
[dependencies]
futures = "0.3"
log = "0.4.8"
log = { workspace = true }
tokio = { version = "1.24.1", features = ["time", "net", "rt"] }
tokio-util = { version = "0.7.4", features = ["codec"] }
common/client-libs/validator-client/Cargo.toml
+1 -1
View File
@@ -22,7 +22,7 @@ serde = { version = "1", features = ["derive"] }
serde_json = "1"
reqwest = { version = "0.11", features = ["json"] }
thiserror = "1"
log = "0.4"
log = { workspace = true }
url = { version = "2.2", features = ["serde"] }
tokio = { version = "1.24.1", features = ["sync", "time"] }
futures = "0.3"
common/commands/Cargo.toml
+2 -2
View File
@@ -1,7 +1,7 @@
[package]
name = "nym-cli-commands"
version = "1.0.0"
authors = ["Nym Technologies SA"]
authors.workspace = true
edition = "2021"
[dependencies]
@@ -15,7 +15,7 @@ cw-utils = { version = "0.13.4" }
handlebars = "3.0.1"
humantime-serde = "1.0"
k256 = { version = "0.10", features = ["ecdsa", "sha256"] }
log = "0.4"
log = { workspace = true }
rand = {version = "0.6", features = ["std"] }
serde = { version = "1.0", features = ["derive"] }
serde_json = "1"
common/config/Cargo.toml
+1 -1
View File
@@ -9,7 +9,7 @@ edition = "2021"
[dependencies]
cfg-if = "1.0.0"
handlebars = "3.0.1"
log = "0.4"
log = { workspace = true }
serde = { version = "1.0", features = ["derive"] }
toml = "0.5.6"
url = "2.2"
common/cosmwasm-smart-contracts/mixnet-contract/Cargo.toml
+1 -1
View File
@@ -19,7 +19,7 @@ serde_json = "1.0.0"
humantime-serde = "1.1.1"
# TO CHECK WHETHER STILL NEEDED:
log = "0.4.14"
log = { workspace = true }
time = { version = "0.3.6", features = ["parsing", "formatting"] }
ts-rs = { version = "6.1.2", optional = true }
common/credential-storage/Cargo.toml
+1 -1
View File
@@ -8,7 +8,7 @@ edition = "2021"
[dependencies]
async-trait = { version = "0.1.51" }
log = "0.4"
log = { workspace = true }
sqlx = { version = "0.5", features = ["runtime-tokio-rustls", "sqlite", "macros", "migrate"]}
thiserror = "1.0"
tokio = { version = "1.24.1", features = [ "rt-multi-thread", "net", "signal", "fs" ] }
common/inclusion-probability/Cargo.toml
+1 -1
View File
@@ -6,6 +6,6 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
log = "0.4.17"
log = { workspace = true }
rand = "0.8.5"
thiserror = "1.0.32"
common/logging/Cargo.toml
+1 -1
View File
@@ -6,5 +6,5 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
log = "0.4.0"
log = { workspace = true }
pretty_env_logger = "0.4.0"
common/mixnode-common/Cargo.toml
+1 -1
View File
@@ -10,7 +10,7 @@ edition = "2021"
bytes = "1.0"
futures = "0.3"
humantime-serde = "1.0"
log = "0.4"
log = { workspace = true }
rand = "0.8"
serde = { version = "1.0", features = ["derive"] }
tokio = { version = "1.24.1", features = ["time", "macros", "rt", "net", "io-util"] }
common/nymsphinx/chunking/Cargo.toml
+1 -1
View File
@@ -7,7 +7,7 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
log = "0.4.8"
log = { workspace = true }
rand = { version = "0.7.3", features = ["wasm-bindgen"] }
thiserror = "1.0.37"
common/socks5/ordered-buffer/Cargo.toml
+1 -1
View File
@@ -7,5 +7,5 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
log = "0.4"
log = { workspace = true }
thiserror = "1.0.37"
common/socks5/proxy-helpers/Cargo.toml
+1 -1
View File
@@ -13,7 +13,7 @@ tokio-util = { version = "0.7.4", features = [ "io" ] } # reason for getting thi
# their `read_buf` [from the util crate] replacement rather than having to rethink/reimplement `AvailableReader` with the new AsyncRead trait definition.
# In the long run, the dependency should probably get removed in favour of pure-tokio implementation, but for time being it's fine.
futures = "0.3"
log = "0.4"
log = { workspace = true }
# internal
client-connections = { path = "../../client-connections" }
common/statistics/Cargo.toml
+1 -1
View File
@@ -10,7 +10,7 @@ edition = "2021"
[dependencies]
async-trait = { version = "0.1.51" }
log = "0.4"
log = { workspace = true }
reqwest = { version = "0.11", features = ["json"] }
serde = { version = "1.0", features = ["derive"] }
serde_json = "1"
common/task/Cargo.toml
+1 -1
View File
@@ -7,7 +7,7 @@ edition = "2021"
[dependencies]
futures = "0.3"
log = "0.4"
log = { workspace = true }
thiserror = "1.0.37"
tokio = { version = "1.24.1", features = ["macros", "sync"] }
common/topology/Cargo.toml
+1 -1
View File
@@ -8,7 +8,7 @@ edition = "2021"
[dependencies]
bs58 = "0.4"
log = "0.4"
log = { workspace = true }
rand = { version = "0.7.3", features = ["wasm-bindgen"] }
thiserror = "1.0.37"
common/types/Cargo.toml
+2 -2
View File
@@ -2,13 +2,13 @@
name = "nym-types"
version = "1.0.0"
description = "Nym common types"
authors = ["Nym Technologies SA"]
authors.workspace = true
edition = "2021"
rust-version = "1.58"
[dependencies]
eyre = "0.6.5"
log = "0.4"
log = { workspace = true }
itertools = "0.10"
reqwest = "0.11.9"
schemars = "0.8"
explorer-api/Cargo.toml
+1 -1
View File
@@ -11,7 +11,7 @@ clap = { version = "4.0", features = ["cargo", "derive"] }
humantime-serde = "1.0"
isocountry = "0.3.2"
itertools = "0.10.3"
log = "0.4.0"
log = { workspace = true }
okapi = { version = "0.7.0-rc.1", features = ["impl_json_schema"] }
pretty_env_logger = "0.4.0"
reqwest = "0.11.4"
gateway/Cargo.toml
+1 -1
View File
@@ -27,7 +27,7 @@ dotenv = "0.15.0"
futures = "0.3"
humantime-serde = "1.0.1"
lazy_static = "1.4.0"
log = "0.4"
log = { workspace = true }
once_cell = "1.7.2"
pretty_env_logger = "0.4"
rand = "0.7"
gateway/gateway-requests/Cargo.toml
+1 -1
View File
@@ -12,7 +12,7 @@ edition = "2021"
[dependencies]
bs58 = "0.4.0"
futures = "0.3.15"
log = "0.4.14"
log = { workspace = true }
nymsphinx = { path = "../../common/nymsphinx" }
rand = { version = "0.7.3", features = ["wasm-bindgen"] }
serde = { version = "1.0", features = ["derive"] }
mixnode/Cargo.toml
+1 -1
View File
@@ -26,7 +26,7 @@ dotenv = "0.15.0"
futures = "0.3.0"
humantime-serde = "1.0"
lazy_static = "1.4.0"
log = "0.4.0"
log = { workspace = true }
pretty_env_logger = "0.4.0"
rand = "0.7.3"
rocket = { version = "0.5.0-rc.2", features = ["json"] }
nym-api/Cargo.toml
+1 -1
View File
@@ -26,7 +26,7 @@ dotenv = "0.15.0"
futures = "0.3.24"
humantime-serde = "1.0"
lazy_static = "1.4.0"
log = "0.4.17"
log = { workspace = true }
pin-project = "1.0"
pretty_env_logger = "0.4.0"
rand = "0.8.5"
sdk/rust/nym-sdk/Cargo.toml
+1 -1
View File
@@ -16,7 +16,7 @@ nymsphinx = { path = "../../../common/nymsphinx" }
task = { path = "../../../common/task" }
futures = "0.3"
log = "0.4"
log = { workspace = true }
rand = { version = "0.7.3" }
tap = "1.0.1"
thiserror = "1.0.38"
service-providers/network-requester/Cargo.toml
+1 -1
View File
@@ -16,7 +16,7 @@ clap = {version = "4.0", features = ["derive"]}
dirs = "4.0"
futures = "0.3.24"
ipnetwork = "0.20.0"
log = "0.4.17"
log = { workspace = true }
pretty_env_logger = "0.4.0"
publicsuffix = "1.5" # Can't update this until bip updates to support newer idna version
rand = "0.7.3"
service-providers/network-statistics/Cargo.toml
+1 -1
View File
@@ -7,7 +7,7 @@ edition = "2021"
[dependencies]
dirs = "4.0"
log = "0.4"
log = { workspace = true }
pretty_env_logger = "0.4"
rocket = { version = "0.5.0-rc.2", features = ["json"] }
serde = { version = "1.0", features = ["derive"] }
tools/nym-cli/Cargo.toml
+2 -2
View File
@@ -1,7 +1,7 @@
[package]
name = "nym-cli"
version = "1.1.6"
authors = ["Nym Technologies SA"]
authors.workspace = true
edition = "2021"
[dependencies]
@@ -11,7 +11,7 @@ clap = { version = "4.0", features = ["derive"] }
clap_complete = "4.0"
clap_complete_fig = "4.0"
dotenv = "0.15.0"
log = "0.4"
log = { workspace = true }
pretty_env_logger = "0.4"
serde = { version = "1", features = ["derive"] }
serde_json = "1"