Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Avoid duplicate crates #12985

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -424,6 +424,7 @@ yansi = "0.5.1"
zstd = "0.13.1"

stdx = { package = "near-stdx", path = "utils/stdx" }
rustc_version = "0.4"

[patch.crates-io]
protobuf = { git = "https://github.com/near/rust-protobuf.git", branch = "3.0.2-patch" }
Expand Down
7 changes: 1 addition & 6 deletions core/primitives/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,7 @@ protocol_schema = ["near-schema-checker-lib/protocol_schema"]

[dev-dependencies]
chrono = { workspace = true, features = ["clock"] }
near-primitives = { path = ".", features = [
"clock",
"solomon",
"rand",
"test_utils",
] }
near-primitives = { workspace = true, features = ["clock", "solomon", "rand", "test_utils"] }
Copy link
Collaborator

Choose a reason for hiding this comment

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

I'm pretty sure there was a really good reason for the path dependency and the duplicate here. Unfortunately we didn't leave the comment, but I don't think there's a need to take a risk and find out here.

assert_matches.workspace = true
bencher.workspace = true
bolero.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion neard/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ near-dump-test-contract.workspace = true

[build-dependencies]
anyhow.workspace = true
rustc_version = "0.4"
rustc_version = { workspace = true }

[features]
default = ["json_rpc", "rosetta_rpc"]
Expand Down
2 changes: 1 addition & 1 deletion tools/state-parts/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ workspace = true
anyhow.workspace = true
chrono.workspace = true
clap.workspace = true
sha2 = "0.10.6"
sha2 = { workspace = true }
time.workspace = true
tokio.workspace = true
tracing.workspace = true
Expand Down
Loading