Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Prune some duplicated dependencies in the dependency graph #11433

Merged
paritytech-processbot merged 2 commits into from
May 18, 2022
Merged

Prune some duplicated dependencies in the dependency graph #11433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a361ca
Prune some duplicated dependencies in the dep graph
koushiro May 17, 2022
a8df3fd
Merge remote-tracking branch 'upstream/master' into prune-duplicated-…
koushiro May 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
153 changes: 19 additions & 134 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion bin/node/bench/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ sp-runtime = { version = "6.0.0", path = "../../../primitives/runtime" }
sp-state-machine = { version = "0.12.0", path = "../../../primitives/state-machine" }
serde = "1.0.136"
serde_json = "1.0.79"
derive_more = "0.99.16"
derive_more = { version = "0.99.17", default-features = false, features = ["display"] }

@bkchr bkchr May 17, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have imported derive_more in multiple places and there we still have all features enabled, so, this here doesn't really change anything.

@koushiro koushiro May 18, 2022 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, only node-bench and scale-info use derive_more in the dependency graph of substrate, and scale-info only use from feature of derive_more

kvdb = "0.11.0"
kvdb-rocksdb = "0.15.1"
sp-trie = { version = "6.0.0", path = "../../../primitives/trie" }
Expand Down
2 changes: 1 addition & 1 deletion bin/node/bench/src/tempdb.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ use kvdb::{DBTransaction, KeyValueDB};
use kvdb_rocksdb::{Database, DatabaseConfig};
use std::{io, path::PathBuf, sync::Arc};

#[derive(Debug, Clone, Copy, derive_more::Display)]
#[derive(Clone, Copy, Debug)]
Comment thread
koushiro marked this conversation as resolved.
pub enum DatabaseType {
RocksDb,
ParityDb,
Expand Down
4 changes: 2 additions & 2 deletions bin/node/bench/src/trie.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ impl core::BenchmarkDescription for TrieReadBenchmarkDescription {

fn name(&self) -> Cow<'static, str> {
format!(
"Trie read benchmark({} database ({} keys), db_type: {})",
"Trie read benchmark({:?} database ({} keys), db_type: {:?})",
self.database_size,
pretty_print(self.database_size.keys()),
self.database_type,
Expand Down Expand Up @@ -260,7 +260,7 @@ impl core::BenchmarkDescription for TrieWriteBenchmarkDescription {

fn name(&self) -> Cow<'static, str> {
format!(
"Trie write benchmark({} database ({} keys), db_type = {})",
"Trie write benchmark({:?} database ({} keys), db_type = {:?})",
self.database_size,
pretty_print(self.database_size.keys()),
self.database_type,
Expand Down
2 changes: 1 addition & 1 deletion client/authority-discovery/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,6 @@ sp-keystore = { version = "0.12.0", path = "../../primitives/keystore" }
sp-runtime = { version = "6.0.0", path = "../../primitives/runtime" }

[dev-dependencies]
quickcheck = "1.0.3"
quickcheck = { version = "1.0.3", default-features = false }
sp-tracing = { version = "5.0.0", path = "../../primitives/tracing" }
substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client" }
2 changes: 1 addition & 1 deletion client/db/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ sp-trie = { version = "6.0.0", path = "../../primitives/trie" }

[dev-dependencies]
kvdb-rocksdb = "0.15.1"
quickcheck = "1.0.3"
quickcheck = { version = "1.0.3", default-features = false }
tempfile = "3"
sp-tracing = { version = "5.0.0", path = "../../primitives/tracing" }
substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client" }
Expand Down
2 changes: 1 addition & 1 deletion client/network-gossip/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@ sp-runtime = { version = "6.0.0", path = "../../primitives/runtime" }

[dev-dependencies]
async-std = "1.11.0"
quickcheck = "1.0.3"
quickcheck = { version = "1.0.3", default-features = false }
substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client" }
1 change: 0 additions & 1 deletion client/network/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ sp-runtime = { version = "6.0.0", path = "../../primitives/runtime" }
[dev-dependencies]
assert_matches = "1.3"
async-std = "1.11.0"
quickcheck = "1.0.3"
rand = "0.7.2"
tempfile = "3.1.0"
sp-test-primitives = { version = "2.0.0", path = "../../primitives/test-primitives" }
Expand Down
2 changes: 1 addition & 1 deletion client/network/sync/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ sp-finality-grandpa = { version = "4.0.0-dev", path = "../../../primitives/final
sp-runtime = { version = "6.0.0", path = "../../../primitives/runtime" }

[dev-dependencies]
quickcheck = "1.0.3"
quickcheck = { version = "1.0.3", default-features = false }
sc-block-builder = { version = "0.10.0-dev", path = "../../block-builder" }
sp-test-primitives = { version = "2.0.0", path = "../../../primitives/test-primitives" }
sp-tracing = { version = "5.0.0", path = "../../../primitives/tracing" }
Expand Down
2 changes: 1 addition & 1 deletion client/offchain/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ futures = "0.3.21"
futures-timer = "3.0.2"
hex = "0.4"
hyper = { version = "0.14.16", features = ["stream", "http2"] }
hyper-rustls = "0.22.1"
hyper-rustls = { version = "0.23.0", features = ["http2"] }
num_cpus = "1.13"
once_cell = "1.8"
parking_lot = "0.12.0"
Expand Down
Loading