[filedao] remove checkMasterChainDBFile() #3463
Merged
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
dustinxie
commented
Jun 22, 2022
| } | ||
|
|
||
| switch header.Version { | ||
| case FileLegacyAuxiliary: | ||
| // default chain db file is legacy format, but not master, the master file has been corrupted | ||
| return nil, ErrFileInvalid |
There was a problem hiding this comment.
this is the only case (from removed func) that needs to be taken care of here
dustinxie
commented
Jun 22, 2022
| default: | ||
| panic(fmt.Errorf("corrupted file version: %s", h.Version)) | ||
| } | ||
| } |
There was a problem hiding this comment.
most code are redundant with those above, so remove it
Codecov Report
@@ Coverage Diff @@
## master #3463 +/- ##
=======================================
Coverage 75.11% 75.11%
=======================================
Files 243 243
Lines 22522 22514 -8
=======================================
- Hits 16918 16912 -6
+ Misses 4681 4680 -1
+ Partials 923 922 -1
Continue to review full report at Codecov.
|
Liuhaai
reviewed
Jun 22, 2022
blockchain/filedao/filedao.go
Outdated
| header, err := checkMasterChainDBFile(cfg.DbPath) | ||
| if err == ErrFileInvalid || err == ErrFileCantAccess { | ||
| header, err := readFileHeader(cfg.DbPath, FileAll) | ||
| switch err { |
There was a problem hiding this comment.
The original pattern would be better
if err ！= nil && err != ErrFileNotExist {
return nil, err
}
if err == ErrFileNotExist {}
Liuhaai
approved these changes
Jun 23, 2022
raullenchai
approved these changes
Jun 24, 2022
pocockn
added a commit
to pocockn/iotex-core
that referenced
this pull request
Jul 4, 2022
* upstream/master: (24 commits) account type with zero init nonce (iotexproject#3387) [api] Separate Server and Server Handler (iotexproject#3485) [ioctl] Build hdwallet derive command line into new ioctl (iotexproject#3418) [ioctl] Build hdwallet create command line into new ioctl (iotexproject#3470) [makefile] add go mod tidy (iotexproject#3471) [api] update chain metrics (iotexproject#3484) remove config.EVMNetworkID() (iotexproject#3460) [filedao] remove checkMasterChainDBFile() (iotexproject#3463) [api] add crashlog (iotexproject#3456) [api] Move generateBlockMeta to grpcserver.go (iotexproject#3303) [ioctl] Build action hash command line into new ioctl (iotexproject#3425) [ioctl] Build hdwallet export command line into new ioctl (iotexproject#3423) [ioctl] Refactor nodereward command in new ioctl (iotexproject#3416) [ioctl] Cleanup TestNewNodeDelegateCmd (iotexproject#3421) [blockchain] Remove BoltDBDaoOption (iotexproject#3465) remove InMemDaoOption (iotexproject#3464) [action] add evm london test (iotexproject#3402) [ioctl] create main for ioctl/newcmd (iotexproject#3296) [ioctl] Build block bucket command line into new ioctl (iotexproject#3386) [ioctl] Build hdwallet import command line into new ioctl (iotexproject#3419) ...
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.
Description
checkMasterChainDBFile() is redundant, so remove it
Fixes #3450
Type of change
Please delete options that are not relevant.
How Has This Been Tested?
Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration
Checklist: