From f9b87164e7abb99a5170b50e293a2060175fab8e Mon Sep 17 00:00:00 2001 From: Simon B Date: Sun, 25 Mar 2018 19:44:27 +0200 Subject: [PATCH] Idiomatic cargo toml (#862) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Specify versions SemVer-style - slog and serde * Comments for not update-able pre-1.0 crates: - urlencoded at "0.5" since 0.6+ lacks trait `plugin::Plugin>` * alpha-sort deps * Specify versions SemVer-style - backtrace, bitflags, blake2-rfc, bodyparser, built, byteorder - chrono, clap, demonize, enum_primitive, env_logger - failure, failure_derive, futures - hyper, iron, itertools, lazy_static, libc - memmap, mount, net2, num_bigint, prettytable-rs - rand, regex, rocksdb, router, siphasher - term, time, tokio-core, tokio-retry, urlencoded, uuid, walkdir, zip --- Cargo.toml | 22 +++++++++++----------- api/Cargo.toml | 24 ++++++++++++------------ chain/Cargo.toml | 19 ++++++++++--------- config/Cargo.toml | 6 +++--- core/Cargo.toml | 22 +++++++++++----------- core/fuzz/Cargo.toml | 3 +-- grin/Cargo.toml | 28 ++++++++++++++-------------- keychain/Cargo.toml | 16 ++++++++-------- p2p/Cargo.toml | 20 ++++++++++---------- pool/Cargo.toml | 12 ++++++------ pow/Cargo.toml | 14 +++++++------- store/Cargo.toml | 18 +++++++++--------- util/Cargo.toml | 22 +++++++++++----------- wallet/Cargo.toml | 40 ++++++++++++++++++++-------------------- 14 files changed, 133 insertions(+), 133 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index c5a4fe200..88b4a8465 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,15 +14,15 @@ name = "grin" path = "src/bin/grin.rs" [dependencies] -blake2-rfc = "~0.2.17" -clap = "^2.23.3" -daemonize = "^0.2.3" -serde = "~1.0.8" -serde_json = "~1.0.7" -slog = { version = "^2.0.12", features = ["max_level_trace", "release_max_level_trace"] } -term = "~0.4.6" -time = "^0.1" -chrono = "^0.4.0" +blake2-rfc = "0.2" +chrono = "0.4" +clap = "2.23" +daemonize = "0.2" +serde = "1" +serde_json = "1" +slog = { version = "2", features = ["max_level_trace", "release_max_level_trace"] } +term = "0.4" +time = "0.1" grin_api = { path = "./api" } grin_config = { path = "./config" } @@ -37,11 +37,11 @@ grin_wallet = { path = "./wallet" } #This is temporary until cursive author does a new release [dependencies.cursive] git = "https://github.com/yeastplume/Cursive" -tag="grin_integration_1" +tag = "grin_integration_1" # TODO - once "patch" is available we should be able to clean up the workspace dependencies # [patch.crate-io] # secp256k1zkp = { git = "https://github.com/mimblewimble/rust-secp256k1-zkp" } [build-dependencies] -built = "^0.2.3" +built = "0.2" diff --git a/api/Cargo.toml b/api/Cargo.toml index 0c99a9b7f..4224f9fbc 100644 --- a/api/Cargo.toml +++ b/api/Cargo.toml @@ -6,21 +6,21 @@ workspace = ".." publish = false [dependencies] -hyper = "~0.10.6" -slog = { version = "^2.0.12", features = ["max_level_trace", "release_max_level_trace"] } -lazy_static = "~0.2.8" -iron = "~0.5.1" -router = "~0.5.1" -regex = "^0.2" -mount = "~0.3.0" -urlencoded = "~0.5.0" -serde = "~1.0.8" -serde_derive = "~1.0.8" -serde_json = "~1.0.9" +hyper = "0.10" +iron = "0.5" +lazy_static = "0.2" +mount = "0.3" +regex = "0.2" +router = "0.5" +serde = "1" +serde_derive = "1" +serde_json = "1" +slog = { version = "2", features = ["max_level_trace", "release_max_level_trace"] } +urlencoded = "0.5" # 0.6+ lacks trait `plugin::Plugin>` grin_core = { path = "../core" } grin_chain = { path = "../chain" } +grin_p2p = { path = "../p2p" } grin_pool = { path = "../pool" } grin_store = { path = "../store" } grin_util = { path = "../util" } -grin_p2p = { path = "../p2p" } diff --git a/chain/Cargo.toml b/chain/Cargo.toml index 4f76cb539..34b3edd41 100644 --- a/chain/Cargo.toml +++ b/chain/Cargo.toml @@ -6,19 +6,20 @@ workspace = ".." publish = false [dependencies] -bitflags = "^1.0" -byteorder = "^0.5" -slog = { version = "^2.0.12", features = ["max_level_trace", "release_max_level_trace"] } -serde = "~1.0.8" -serde_derive = "~1.0.8" -time = "^0.1" +bitflags = "1" +byteorder = "0.5" +slog = { version = "2", features = ["max_level_trace", "release_max_level_trace"] } +serde = "1" +serde_derive = "1" +time = "0.1" grin_core = { path = "../core" } grin_keychain = { path = "../keychain" } -grin_util = { path = "../util" } grin_store = { path = "../store" } +grin_util = { path = "../util" } [dev-dependencies] -env_logger = "^0.3.5" -rand = "^0.3" +env_logger = "0.3" +rand = "0.3" + grin_pow = { path = "../pow" } diff --git a/config/Cargo.toml b/config/Cargo.toml index 51e3302a1..cda0b1336 100644 --- a/config/Cargo.toml +++ b/config/Cargo.toml @@ -6,12 +6,12 @@ workspace = ".." publish = false [dependencies] -serde = "~1.0.8" -serde_derive = "~1.0.8" +serde = "1" +serde_derive = "1" toml = "0.4" grin_grin = { path = "../grin" } +grin_p2p = { path = "../p2p" } grin_pow = { path = "../pow"} grin_util = { path = "../util" } -grin_p2p = { path = "../p2p" } grin_wallet = { path = "../wallet"} diff --git a/core/Cargo.toml b/core/Cargo.toml index 6f74472f0..16b19c7b2 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -6,17 +6,17 @@ workspace = ".." publish = false [dependencies] -bitflags = "^1.0" -blake2-rfc = "~0.2.17" -byteorder = "^1.0" -slog = { version = "^2.0.12", features = ["max_level_trace", "release_max_level_trace"] } -num-bigint = "^0.1.35" -rand = "^0.3" -serde = "~1.0.8" -serde_derive = "~1.0.8" -siphasher = "~0.1" -time = "^0.1" -lazy_static = "~0.2.8" +bitflags = "1" +blake2-rfc = "0.2" +byteorder = "1" +lazy_static = "0.2" +num-bigint = "0.1" +rand = "0.3" +serde = "1" +serde_derive = "1" +siphasher = "0.1" +slog = { version = "2", features = ["max_level_trace", "release_max_level_trace"] } +time = "0.1" grin_keychain = { path = "../keychain" } grin_util = { path = "../util" } diff --git a/core/fuzz/Cargo.toml b/core/fuzz/Cargo.toml index 0b930fb1f..ef0503218 100644 --- a/core/fuzz/Cargo.toml +++ b/core/fuzz/Cargo.toml @@ -1,8 +1,7 @@ - [package] name = "grin_core-fuzz" version = "0.0.1" -authors = ["Automatically generated"] +authors = ["Grin Developers "] publish = false [package.metadata] diff --git a/grin/Cargo.toml b/grin/Cargo.toml index d91c22ffe..26b255eec 100644 --- a/grin/Cargo.toml +++ b/grin/Cargo.toml @@ -6,27 +6,27 @@ workspace = ".." publish = false [dependencies] -hyper = "~0.10.6" -slog = { version = "^2.0.12", features = ["max_level_trace", "release_max_level_trace"] } -time = "^0.1" -serde = "~1.0.8" -serde_derive = "~1.0.8" -serde_json = "~1.0.8" -rand = "^0.3" -router = "~0.5.1" -itertools = "~0.6.0" +hyper = "0.10" +itertools = "0.6" +rand = "0.3" +router = "0.5" +slog = { version = "2", features = ["max_level_trace", "release_max_level_trace"] } +serde = "1" +serde_derive = "1" +serde_json = "1" +time = "0.1" grin_api = { path = "../api" } grin_chain = { path = "../chain" } grin_core = { path = "../core" } -grin_store = { path = "../store" } +grin_keychain = { path = "../keychain" } grin_p2p = { path = "../p2p" } grin_pool = { path = "../pool" } -grin_util = { path = "../util" } -grin_keychain = { path = "../keychain" } -grin_wallet = { path = "../wallet" } grin_pow = { path = "../pow" } +grin_store = { path = "../store" } +grin_util = { path = "../util" } +grin_wallet = { path = "../wallet" } [dev-dependencies] -blake2-rfc = "~0.2.17" +blake2-rfc = "0.2" grin_config = { path = "../config" } diff --git a/keychain/Cargo.toml b/keychain/Cargo.toml index 1a923bc16..12b6b81bb 100644 --- a/keychain/Cargo.toml +++ b/keychain/Cargo.toml @@ -6,13 +6,13 @@ workspace = '..' publish = false [dependencies] -byteorder = "^1.0" -blake2-rfc = "~0.2.17" -uuid = { version = "~0.5.1", features = ["serde", "v4"] } -rand = "^0.3" -slog = { version = "^2.0.12", features = ["max_level_trace", "release_max_level_trace"] } -serde = "~1.0.8" -serde_derive = "~1.0.8" -serde_json = "~1.0.8" +byteorder = "1" +blake2-rfc = "0.2" +rand = "0.3" +slog = { version = "2", features = ["max_level_trace", "release_max_level_trace"] } +serde = "1" +serde_derive = "1" +serde_json = "1" +uuid = { version = "0.5", features = ["serde", "v4"] } grin_util = { path = "../util" } diff --git a/p2p/Cargo.toml b/p2p/Cargo.toml index 1305f52e6..211c65dce 100644 --- a/p2p/Cargo.toml +++ b/p2p/Cargo.toml @@ -6,16 +6,16 @@ workspace = ".." publish = false [dependencies] -bitflags = "^1.0" -slog = { version = "^2.0.12", features = ["max_level_trace", "release_max_level_trace"] } -net2 = "0.2.0" -rand = "^0.3" -serde = "~1.0.8" -serde_derive = "~1.0.8" -bytes = "0.4.3" -time = "^0.1" -enum_primitive = "^0.1.0" -num = "^0.1.36" +bitflags = "1" +bytes = "0.4" +enum_primitive = "0.1" +net2 = "0.2" +num = "0.1" +rand = "0.3" +serde = "1" +serde_derive = "1" +slog = { version = "2", features = ["max_level_trace", "release_max_level_trace"] } +time = "0.1" grin_core = { path = "../core" } grin_store = { path = "../store" } diff --git a/pool/Cargo.toml b/pool/Cargo.toml index a3f68e848..591142f45 100644 --- a/pool/Cargo.toml +++ b/pool/Cargo.toml @@ -6,12 +6,12 @@ workspace = '..' publish = false [dependencies] -blake2-rfc = "~0.2.17" -serde = "~1.0.8" -serde_derive = "~1.0.8" -slog = { version = "^2.0.12", features = ["max_level_trace", "release_max_level_trace"] } -time = "^0.1" -rand = "^0.3" +blake2-rfc = "0.2" +rand = "0.3" +serde = "1" +serde_derive = "1" +slog = { version = "2", features = ["max_level_trace", "release_max_level_trace"] } +time = "0.1" grin_core = { path = "../core" } grin_keychain = { path = "../keychain" } diff --git a/pow/Cargo.toml b/pow/Cargo.toml index 9f6bb30f0..fd73ee7c9 100644 --- a/pow/Cargo.toml +++ b/pow/Cargo.toml @@ -6,13 +6,13 @@ workspace = ".." publish = false [dependencies] -blake2-rfc = "~0.2.17" -rand = "^0.3" -time = "^0.1" -slog = { version = "^2.0.12", features = ["max_level_trace", "release_max_level_trace"] } -lazy_static = "~0.2.8" -serde = "~1.0.8" -serde_derive = "~1.0.8" +blake2-rfc = "0.2" +lazy_static = "0.2" +rand = "0.3" +serde = "1" +serde_derive = "1" +slog = { version = "2", features = ["max_level_trace", "release_max_level_trace"] } +time = "0.1" grin_core = { path = "../core" } grin_util = { path = "../util" } diff --git a/store/Cargo.toml b/store/Cargo.toml index 8c1c3d127..1660829fd 100644 --- a/store/Cargo.toml +++ b/store/Cargo.toml @@ -6,17 +6,17 @@ workspace = ".." publish = false [dependencies] -byteorder = "^1.0" -env_logger = "^0.3.5" -serde = "~1.0.8" -serde_derive = "~1.0.8" -slog = { version = "^2.0.12", features = ["max_level_trace", "release_max_level_trace"] } -libc = "^0.2" -memmap = { git = "https://github.com/danburkert/memmap-rs", tag="0.6.0" } -rocksdb = "^0.8.0" +byteorder = "1" +env_logger = "0.3" +libc = "0.2" +memmap = { git = "https://github.com/danburkert/memmap-rs", tag = "0.6.0" } +rocksdb = "0.8" +serde = "1" +serde_derive = "1" +slog = { version = "2", features = ["max_level_trace", "release_max_level_trace"] } grin_core = { path = "../core" } grin_util = { path = "../util" } [dev-dependencies] -time = "^0.1" +time = "0.1" diff --git a/util/Cargo.toml b/util/Cargo.toml index b5e5c5557..d55222abc 100644 --- a/util/Cargo.toml +++ b/util/Cargo.toml @@ -6,17 +6,17 @@ workspace = ".." publish = false [dependencies] -slog = { version = "^2.0.12", features = ["max_level_trace", "release_max_level_trace"] } -slog-term = "^2.2.0" -slog-async = "^2.1.0" -lazy_static = "~0.2.8" -backtrace = "^0.3.5" -byteorder = "^1.0" -rand = "^0.3" -serde = "~1.0.8" -serde_derive = "~1.0.8" -walkdir = "^2.0.1" -zip = "^0.2.6" +backtrace = "0.3" +byteorder = "1" +lazy_static = "0.2" +rand = "0.3" +serde = "1" +serde_derive = "1" +slog = { version = "2", features = ["max_level_trace", "release_max_level_trace"] } +slog-term = "2" +slog-async = "2" +walkdir = "2" +zip = "0.2" [dependencies.secp256k1zkp] git = "https://github.com/mimblewimble/rust-secp256k1-zkp" diff --git a/wallet/Cargo.toml b/wallet/Cargo.toml index a92b6d472..18ce705da 100644 --- a/wallet/Cargo.toml +++ b/wallet/Cargo.toml @@ -6,26 +6,26 @@ workspace = '..' publish = false [dependencies] -byteorder = "^1.0" -slog = { version = "^2.0.12", features = ["max_level_trace", "release_max_level_trace"] } -rand = "^0.3" -blake2-rfc = "~0.2.17" -serde = "~1.0.8" -serde_derive = "~1.0.8" -serde_json = "~1.0.8" -bodyparser = "~0.7.0" -failure = "0.1.1" -failure_derive = "0.1.1" -futures = "^0.1.15" -iron = "~0.5.1" -hyper = "~0.11.4" -tokio-core = "~0.1.1" -tokio-retry = "~0.1.0" -router = "~0.5.1" -prettytable-rs = "^0.6" -term = "~0.4.6" -uuid = { version = "~0.5.1", features = ["serde", "v4"] } -urlencoded = "~0.5.0" +blake2-rfc = "0.2" +bodyparser = "0.7" +byteorder = "1" +failure = "0.1" +failure_derive = "0.1" +futures = "0.1" +hyper = "0.11" +iron = "0.5" +prettytable-rs = "0.6" +rand = "0.3" +router = "0.5" +serde = "1" +serde_derive = "1" +serde_json = "1" +slog = { version = "2", features = ["max_level_trace", "release_max_level_trace"] } +term = "0.4" +tokio-core = "0.1" +tokio-retry = "0.1" +uuid = { version = "0.5", features = ["serde", "v4"] } +urlencoded = "0.5" grin_api = { path = "../api" } grin_core = { path = "../core" }