status-im/status-go
2
0
Fork 0
mirror of https://github.com/status-im/status-go.git synced 2025-02-16 08:50:09 +00:00
Code Issues Projects Releases Wiki Activity

fix: merge node config allows overide (#2664)

Browse Source
This commit is contained in:
Anthony Laibe 2022-05-24 12:57:45 +02:00 committed by GitHub
parent 3e2ce20f0e
commit 7227ae1c8e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
account/accounts_geth.go
View File

@ -30,6 +30,7 @@ func (m *GethManager) InitKeystore(keydir string) error {
if err != nil {
return err
}
m.keystore, err = makeKeyStore(m.gethAccManager)
return err
}

3
api/geth_backend.go
View File

@ -358,8 +358,7 @@ func (b *GethStatusBackend) StartNodeWithKey(acc multiaccounts.Account, password
}
func (b *GethStatusBackend) OverwriteNodeConfigValues(conf *params.NodeConfig, n *params.NodeConfig) (*params.NodeConfig, error) {
// Overwrite db configuration (only adds new values)
if err := mergo.Merge(conf, n); err != nil {
if err := mergo.Merge(conf, n, mergo.WithOverride); err != nil {
return nil, err
}