Filter out files that has data_store in name when resolving keystore path #3634
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dadepo
requested review from
dapplion,
g11tech,
mpetrunic,
twoeths and
wemeetagain
as code owners
Codecov Report
@@ Coverage Diff @@
## master #3634 +/- ##
==========================================
- Coverage 37.50% 36.51% -0.99%
==========================================
Files 311 320 +9
Lines 8357 8960 +603
Branches 1295 1432 +137
==========================================
+ Hits 3134 3272 +138
- Misses 5074 5536 +462
- Partials 149 152 +3 |
|
Code Climate has analyzed commit 93fe3a5 and detected 0 issues on this pull request. View more on Code Climate. |
Performance Report✔️ no performance regression detected Full benchmark results
|
dapplion
reviewed
Jan 17, 2022
| @@ -88,8 +88,8 @@ function resolveKeystorePaths(fileOrDirPath: string): string[] { | |||
| if (fs.lstatSync(fileOrDirPath).isDirectory()) { | |||
| return fs | |||
| .readdirSync(fileOrDirPath) | |||
| .map((file) => path.join(fileOrDirPath, file)) | |||
| .filter((filepath) => filepath.endsWith(".json")); | |||
| .filter((file) => file.indexOf("deposit_data") === -1 && file.endsWith(".json")) | |||
There was a problem hiding this comment.
A Regex expression is typically much faster than indexOf and endsWith and much more idiomatic
There was a problem hiding this comment.
A Regex expression is typically much faster than indexOf and endsWith
I think that is debatable. The benchmarks I see (not ones I run myself) suggests this is not the case.
and much more idiomatic
Using regex is definitely more succinct, and since this is not a hot code path, I guess it is fine to go with the regex.
I have updated.
There was a problem hiding this comment.
Good point I haven't benchmarked it 😆
|
Can you add a couple unit tests for resolveKeystorePaths()? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation
Prevents lodestar from crashing if deposit data files are encountered when resolving keystore path.
Description
Filtering out file names that contains deposit_data, when solving keystore path so as to prevent crashing on start up.
Closes #3611
Steps to test or reproduce
--importKeystoresPathflag