eosswedenorg/thalos
1
0
Fork 0
mirror of https://github.com/eosswedenorg/thalos synced 2026-07-02 11:43:40 +02:00
Code Releases Activity

config/config.go: Refactor Load() into Parse() and Load() functions.

Browse source
This commit is contained in:
Henrik Hautakoski 2023-03-08 10:04:12 +01:00
parent edaf662d50
commit bc5a351853
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
config/config.go
View file

@ -35,7 +35,7 @@ type Config struct {
EndBlockNum uint32 `json:"end_block_num"` EndBlockNum uint32 `json:"end_block_num"`
} }
func Load(filename string) (Config, error) { func Parse(data []byte) (*Config, error) {
cfg := Config{ cfg := Config{
StartBlockNum: NULL_BLOCK_NUMBER, StartBlockNum: NULL_BLOCK_NUMBER,
EndBlockNum: NULL_BLOCK_NUMBER, EndBlockNum: NULL_BLOCK_NUMBER,
@ -49,15 +49,15 @@ func Load(filename string) (Config, error) {
}, },
} }
err := json.Unmarshal(data, &cfg)
return &cfg, err
}
func Load(filename string) (*Config, error) {
bytes, err := ioutil.ReadFile(filename) bytes, err := ioutil.ReadFile(filename)
if err != nil { if err != nil {
return cfg, err return nil, err
} }
err = json.Unmarshal(bytes, &cfg) return Parse(bytes)
if err != nil {
return cfg, err
}
return cfg, nil
} }

2
main.go
View file

@ -29,7 +29,7 @@ import (
// Global variables // Global variables
// --------------------------- // ---------------------------
var conf config.Config var conf *config.Config
var shClient *shipclient.Client var shClient *shipclient.Client