[ioctl] fix err not handled #3509
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
Codecov Report
@@ Coverage Diff @@
## master #3509 +/- ##
==========================================
- Coverage 75.43% 74.59% -0.84%
==========================================
Files 247 252 +5
Lines 22845 23134 +289
==========================================
+ Hits 17233 17257 +24
- Misses 4685 4951 +266
+ Partials 927 926 -1
Continue to review full report at Codecov.
|
Liuhaai
reviewed
Jul 7, 2022
| @@ -66,8 +66,9 @@ func InitConfig() (config.Config, string, error) { | |||
| // Load or reset config file | |||
| err = info.loadConfig() | |||
| if os.IsNotExist(err) { | |||
| err = info.reset() // Config file doesn't exist | |||
| } else if err != nil { | |||
| err = info.reset() | |||
There was a problem hiding this comment.
could the reset info be directly returned?
There was a problem hiding this comment.
could the reset info be directly returned?
if directly returned, err != nil will handle twice.
There was a problem hiding this comment.
Sorry, I don't understand why it is handled twice?
There was a problem hiding this comment.
i think it's correct? if os.IsNotExist(err) then overwrite err = info.reset(), otherwise err is from L67 above
CoderZhi
approved these changes
Jul 11, 2022
Liuhaai
approved these changes
Jul 13, 2022
pocockn
added a commit
to pocockn/iotex-core
that referenced
this pull request
Jul 19, 2022
* upstream/master: (28 commits) [ioctl] Incorrect conversion between integer types (iotexproject#3522) [action] fix incorrect conversion between integer types (iotexproject#3545) [test] fix TestLoadBlockchainfromDB (iotexproject#3521) [ioctl] correct Chinese usage message (iotexproject#3510) fix err not hanled (iotexproject#3509) add ReadHeaderTimeout (iotexproject#3539) [iotcl] Reset config cmd (iotexproject#3496) Update gosec.yaml Update ci.yaml Update analysis.yaml Delete gosec.yaml.bak Create gosec.yaml [config] move config.ActPool to actpool package refactor (iotexproject#3514) Update ci.yaml Update analysis.yaml Update analysis.yaml [config] move config.Chain to blockchain package (iotexproject#3511) remove circleci (iotexproject#3498) [ioctl] Build block bucketlist command line into new ioctl (iotexproject#3469) [config] remove EVMNetworkID() and SetEVMNetworkID() (iotexproject#3503) ...
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
Please include a summary of the changes and the related issue. Please also include relevant motivation and context. List any dependencies that are required for this change.
Fixes #3497
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
Test Configuration:
Checklist: