arnaucube/hermez-node
1
0
Fork 0
mirror of https://github.com/arnaucube/hermez-node.git synced 2026-02-07 03:16:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge node (sync-only) and coord config

Browse Source
This commit is contained in:
Eduard S
2020-12-16 17:29:16 +01:00
parent 61255d730c
commit 11722c60ba
7 changed files with 109 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
config/config.go
View File

@@ -132,6 +132,7 @@ type Node struct {
Debug struct {
APIAddress string
}
Coordinator Coordinator `validate:"-"`
}
// Load loads a generic config.
@@ -144,18 +145,21 @@ func Load(path string, cfg interface{}) error {
if _, err := toml.Decode(cfgToml, cfg); err != nil {
return tracerr.Wrap(err)
}
validate := validator.New()
if err := validate.Struct(cfg); err != nil {
return tracerr.Wrap(fmt.Errorf("error validating configuration file: %w", err))
}
return nil
}
// LoadCoordinator loads the Coordinator configuration from path.
func LoadCoordinator(path string) (*Coordinator, error) {
var cfg Coordinator
func LoadCoordinator(path string) (*Node, error) {
var cfg Node
if err := Load(path, &cfg); err != nil {
return nil, tracerr.Wrap(fmt.Errorf("error loading coordinator configuration file: %w", err))
return nil, tracerr.Wrap(fmt.Errorf("error loading node configuration file: %w", err))
}
validate := validator.New()
if err := validate.Struct(cfg); err != nil {
return nil, tracerr.Wrap(fmt.Errorf("error validating configuration file: %w", err))
}
if err := validate.Struct(cfg.Coordinator); err != nil {
return nil, tracerr.Wrap(fmt.Errorf("error validating configuration file: %w", err))
}
return &cfg, nil
}
@@ -166,5 +170,9 @@ func LoadNode(path string) (*Node, error) {
if err := Load(path, &cfg); err != nil {
return nil, tracerr.Wrap(fmt.Errorf("error loading node configuration file: %w", err))
}
validate := validator.New()
if err := validate.Struct(cfg); err != nil {
return nil, tracerr.Wrap(fmt.Errorf("error validating configuration file: %w", err))
}
return &cfg, nil
}