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

cmd/combine: fix multiple runs #2963

Merged
merged 2 commits into from
Mar 15, 2024
Merged

cmd/combine: fix multiple runs #2963

merged 2 commits into from
Mar 15, 2024

Conversation

gsora
Copy link
Collaborator

@gsora gsora commented Mar 14, 2024

Instead of checking if validator_keys directory exists at the end of the load manifest loop, do it earlier and exclude potential non-Charon node directories.

Also make so that --force deletes the existing keys, if any.

Solves the use case in which the user called combine command twice with an input directory that was also used as an output directory.

category: bug
ticket: #2538

Closes #2538

Instead of checking if `validator_keys` directory exists at the end of the load manifest loop, do it earlier and exclude potential non-Charon node directories.

Also make so that `--force` deletes the existing keys, if any.

Solves the use case in which the user called `combine` command twice with an input directory that was also used as an output directory.
Copy link

sonarcloud bot commented Mar 14, 2024

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
0.0% Duplication on New Code

See analysis details on SonarCloud

Copy link

codecov bot commented Mar 14, 2024

Codecov Report

Attention: Patch coverage is 42.10526% with 11 lines in your changes are missing coverage. Please review.

Project coverage is 54.11%. Comparing base (66b41d7) to head (ce7a854).

Files Patch % Lines
cmd/combine/combine.go 42.10% 7 Missing and 4 partials ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #2963      +/-   ##
==========================================
+ Coverage   54.09%   54.11%   +0.02%     
==========================================
  Files         194      194              
  Lines       27402    27417      +15     
==========================================
+ Hits        14822    14837      +15     
+ Misses      10826    10823       -3     
- Partials     1754     1757       +3     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Contributor

@pinebit pinebit left a comment

Choose a reason for hiding this comment

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

LGTM

@gsora gsora added the merge when ready Indicates bulldozer bot may merge when all checks pass label Mar 15, 2024
@obol-bulldozer obol-bulldozer bot merged commit 8b5c004 into main Mar 15, 2024
11 of 12 checks passed
@obol-bulldozer obol-bulldozer bot deleted the gsora/combine-multiple branch March 15, 2024 11:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merge when ready Indicates bulldozer bot may merge when all checks pass
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Confusing error when running combine multiple times
2 participants