Skip to content

fix(l1,l2): stop removedb from faking success on the wrong datadir #7080

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

Open
NikhilSharmaWe wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(l1,l2): stop removedb from faking success on the wrong datadir #7080

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
d61b7c1
fix(l1,l2): stop removedb from faking success on the wrong datadir
NikhilSharmaWe Aug 1, 2026
5a3ac66
fix(l1): fail-closed removedb sibling scan and fix unsuffixed-layout …
NikhilSharmaWe Aug 4, 2026
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.lock
View file
Open in desktop

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

3 changes: 3 additions & 0 deletions cmd/ethrex/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,3 +140,6 @@ thiserror = { workspace = true, optional = true }

[lints]
workspace = true

[dev-dependencies]
tempfile.workspace = true

@ElFantasma ElFantasma Aug 3, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

tempfile lands in the root Cargo.lock, but tooling/ is a second workspace with its own lockfile and this PR doesn't touch it. Its ethrex entry still carries the pre-PR dep set, so Check Cargo.lock should fail on:

cargo metadata --locked --manifest-path tooling/Cargo.toml

(Makefile:269.) Cargo records dev-dependencies in the lockfile's dependencies array alongside normal ones, so a dev-only dep still rotates both lockfiles - I checked, and tempfile is present in the root ethrex block and absent from the tooling/ one.

Running cargo metadata --manifest-path tooling/Cargo.toml without --locked regenerates it. #7067 hit exactly this and it cost a round-trip, so flagging it before CI finishes rather than after.

The .workspace = true form itself is right, and the root lockfile entry is correct.

@NikhilSharmaWe NikhilSharmaWe Aug 4, 2026

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Looked into it and I don't think we need to update tooling/Cargo.lock for this change.

tempfile is only added under [dev-dependencies] on ethrex. In the tooling workspace, ethrex is used as a path dependency, not as a workspace member, so Cargo does not include its [dev-dependencies] in that lockfile.

I verified locally that cargo metadata --locked --manifest-path tooling/Cargo.toml passes, and running it without --locked does not change the lockfile. #7067 needed the tooling lock update because it added a normal dependency on ethrex-dev, which is different from this case.

Happy to take another look if I missed something.

Loading