fix: merge node config allows overide (#2664)
This commit is contained in:
parent
3e2ce20f0e
commit
7227ae1c8e
|
@ -30,6 +30,7 @@ func (m *GethManager) InitKeystore(keydir string) error {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
m.keystore, err = makeKeyStore(m.gethAccManager)
|
m.keystore, err = makeKeyStore(m.gethAccManager)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
|
@ -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) {
|
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, mergo.WithOverride); err != nil {
|
||||||
if err := mergo.Merge(conf, n); err != nil {
|
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue