Make chainconfig wrapper more robust against differences between types
This commit is contained in:
parent
149b5220ad
commit
625d2c0e98
@ -606,10 +606,14 @@ func (b *Backend) ChainConfig() *params.ChainConfig {
|
||||
field := ntype.Field(i)
|
||||
v := nval.Elem().FieldByName(field.Name)
|
||||
lv := lval.Elem().FieldByName(field.Name)
|
||||
if v.Type() == lv.Type() && lv.CanSet() {
|
||||
lv.Set(v)
|
||||
} else {
|
||||
convertAndSet(lv, v)
|
||||
log.Info("Checking value for", "field", field.Name)
|
||||
if lv.Kind() != reflect.Invalid {
|
||||
// If core.ChainConfig doesn't have this field, skip it.
|
||||
if v.Type() == lv.Type() && lv.CanSet() {
|
||||
lv.Set(v)
|
||||
} else {
|
||||
convertAndSet(lv, v)
|
||||
}
|
||||
}
|
||||
}
|
||||
return b.chainConfig
|
||||
|
Loading…
Reference in New Issue
Block a user