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.

Sign up for GitHub

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

synth-bm: include it in the root workspace #12901

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

synth-bm: include it in the root workspace #12901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
765b243
Include `synth-bm` in root workspace
mooori Feb 10, 2025
c88600f
Use workspace deps (excl. `near-*`)
mooori Feb 10, 2025
9886dfe
Add comment on not inheriting some deps from workspace
mooori Feb 10, 2025
a67add6
Add dep `near-jsonrpc-client` to workspace
mooori Feb 11, 2025
89ab251
Update comment
mooori Feb 11, 2025
2b76ab7
Make clippy happy
mooori Feb 11, 2025
c0a46a5
Add dependencies to `skip` in deny.toml
mooori Feb 11, 2025
0d66ffe
Make cspell happy
mooori Feb 11, 2025
8fa037e
Merge remote-tracking branch 'upstream/master' into bm-workspace
mooori Feb 11, 2025
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
996 changes: 725 additions & 271 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ exclude = ["neard"]
[workspace]
resolver = "2"
members = [
"benchmarks/synth-bm",
"chain/chain",
"chain/chunks",
"chain/client",
Expand Down Expand Up @@ -100,7 +101,7 @@ members = [
"utils/near-stable-hasher",
"utils/stdx",
]
exclude = ["tracing", "benchmarks"]
exclude = ["tracing", "benchmarks/continuous"]

[workspace.lints.clippy]
all = { level = "allow", priority = -100 }
Expand Down Expand Up @@ -186,8 +187,11 @@ easy-ext = "0.2"
ed25519-dalek = { version = "2.1.0", default-features = false }
enum-map = "2.1.0"
enumset = "1.0"
env_logger = "0.11.5"
ethabi = "18"
expect-test = "1.3.0"
# Renaming since currently the name of an unpublished workspace member collides with `near-jsonrpc-client`. Once #12908 is resolved, the crate here should be used with its original name.
ext-near-jsonrpc-client = { version = "0.15.1", package = "near-jsonrpc-client" }
Comment on lines +193 to +194
Copy link
Contributor Author

Choose a reason for hiding this comment

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

By using a different name, it's possible to add near-jsonrpc-client from crates.io to the workspace dependencies. I think that's a slight improvement because it:

  • reduces the number of dependencies that cannot be inherited from the workspace
  • makes it more explicit that there are two different near-jsonrpc-client crates

Copy link
Member

Choose a reason for hiding this comment

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

Looks like the amount of version conflicts make it not worth it, then using local near-jsonrpc-client is a better first step.

finite-wasm = "0.5.0"
futures = "0.3.5"
futures-util = "0.3"
Expand Down
Loading
Loading