add the ability to parse zebrad.toml config file #485
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
|
I also needed to remove a test, since it sends in a string as the config file contents (rather than a filename), and the toml parser doesn't support that. But this test did very little, and we won't miss it. If reviewers prefer, I could restore the test and have it create a file, actually it could create both a |
LarryRuane
force-pushed
the
2024-05-zebrad-toml
branch
from
c1e2852
to
3c1229b
Compare
daira
reviewed
Jun 18, 2024
frontend/rpc_client.go
Outdated
| } | ||
| } | ||
|
|
||
| func connFromIni(confPath string) (*rpcclient.ConnConfig, error) { | ||
| cfg, err := ini.Load(confPath) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("failed to read config file: %w", err) |
There was a problem hiding this comment.
Suggested change
| return nil, fmt.Errorf("failed to read config file: %w", err) | |
| return nil, fmt.Errorf("failed to read config file in .conf format: %w", err) |
daira
reviewed
Jun 18, 2024
frontend/rpc_client.go
Outdated
| } | ||
| _, err := toml.DecodeFile(confPath, &tomlConf) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("failed to read config file: %w", err) |
There was a problem hiding this comment.
Suggested change
| return nil, fmt.Errorf("failed to read config file: %w", err) | |
| return nil, fmt.Errorf("failed to read config file in .toml format: %w", err) |
daira
approved these changes
Jun 18, 2024
LarryRuane
force-pushed
the
2024-05-zebrad-toml
branch
2 times, most recently
from
2fb4e33
to
6800d6e
Compare
Fixes zcash#462. If the file extension is .conf (as in zcash.conf), then parse the file as an INI file. If the extension is .toml (as in zebrad.toml), then interpret as TOML.
LarryRuane
force-pushed
the
2024-05-zebrad-toml
branch
from
6800d6e
to
b2efbdc
Compare
|
Force pushed to implement review comments (thanks, Daira), and force pushed to rebase. |
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.
Fixes #462. If the file extension is
.conf(as inzcash.conf), then parse the file as an INI file (as is done today). If the extension is.toml(as inzebrad.toml), then interpret as TOML. The only possible problem is if the user has specified a toml config file (using--zcash-conf-path) that doesn't have the.tomlextension. It will then be interpreted as a.conf(INI) file. But it's not unreasonable to require the toml extension.