Preliminary fix for GH-1929
This commit is contained in:
parent
4b0d0f56dd
commit
1858ad3ae2
|
@ -6,6 +6,7 @@ import (
|
||||||
"io"
|
"io"
|
||||||
"math"
|
"math"
|
||||||
"reflect"
|
"reflect"
|
||||||
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/ethereum/go-ethereum/rlp"
|
"github.com/ethereum/go-ethereum/rlp"
|
||||||
|
@ -13,6 +14,8 @@ import (
|
||||||
|
|
||||||
var defaultMinPoW = math.Float64bits(0.001)
|
var defaultMinPoW = math.Float64bits(0.001)
|
||||||
|
|
||||||
|
type statusOptionKey int64
|
||||||
|
|
||||||
// statusOptions defines additional information shared between peers
|
// statusOptions defines additional information shared between peers
|
||||||
// during the handshake.
|
// during the handshake.
|
||||||
// There might be more options provided then fields in statusOptions
|
// There might be more options provided then fields in statusOptions
|
||||||
|
@ -26,6 +29,9 @@ type statusOptions struct {
|
||||||
ConfirmationsEnabled *bool `rlp:"key=3"`
|
ConfirmationsEnabled *bool `rlp:"key=3"`
|
||||||
RateLimits *RateLimits `rlp:"key=4"`
|
RateLimits *RateLimits `rlp:"key=4"`
|
||||||
TopicInterest []TopicType `rlp:"key=5"`
|
TopicInterest []TopicType `rlp:"key=5"`
|
||||||
|
|
||||||
|
idxFieldKey map[int]statusOptionKey
|
||||||
|
keyFieldIdx map[statusOptionKey]int
|
||||||
}
|
}
|
||||||
|
|
||||||
// WithDefaults adds the default values for a given peer.
|
// WithDefaults adds the default values for a given peer.
|
||||||
|
@ -57,11 +63,15 @@ func (o statusOptions) WithDefaults() statusOptions {
|
||||||
return o
|
return o
|
||||||
}
|
}
|
||||||
|
|
||||||
var idxFieldKey = make(map[int]string)
|
//var idxFieldKey = make(map[int]statusOptionKey)
|
||||||
var keyFieldIdx = func() map[string]int {
|
//var keyFieldIdx = map[statusOptionKey]int{}
|
||||||
result := make(map[string]int)
|
|
||||||
opts := statusOptions{}
|
func (o *statusOptions) parseStatusOptionKeys() error {
|
||||||
v := reflect.ValueOf(opts)
|
kfi := make(map[statusOptionKey]int)
|
||||||
|
ifk := make(map[int]statusOptionKey)
|
||||||
|
|
||||||
|
v := reflect.ValueOf(o)
|
||||||
|
|
||||||
for i := 0; i < v.NumField(); i++ {
|
for i := 0; i < v.NumField(); i++ {
|
||||||
// skip unexported fields
|
// skip unexported fields
|
||||||
if !v.Field(i).CanInterface() {
|
if !v.Field(i).CanInterface() {
|
||||||
|
@ -72,12 +82,31 @@ var keyFieldIdx = func() map[string]int {
|
||||||
if rlpTag == "" {
|
if rlpTag == "" {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
key := strings.Split(rlpTag, "=")[1]
|
|
||||||
result[key] = i
|
keys := strings.Split(rlpTag, "=")
|
||||||
idxFieldKey[i] = key
|
// skip rlp tags that cannot be split by "="
|
||||||
|
// TODO Do we want to throw an error here if the length is not exactly 2?
|
||||||
|
if len(keys) < 2 {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
// parse keys[1] as an int
|
||||||
|
rkey, err := strconv.ParseInt(keys[1], 10, 64)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
// typecast rkey to be of statusOptionKey type
|
||||||
|
key := statusOptionKey(rkey)
|
||||||
|
kfi[key] = i
|
||||||
|
ifk[i] = key
|
||||||
|
}
|
||||||
|
|
||||||
|
o.keyFieldIdx = kfi
|
||||||
|
o.idxFieldKey = ifk
|
||||||
|
|
||||||
|
return nil
|
||||||
}
|
}
|
||||||
return result
|
|
||||||
}()
|
|
||||||
|
|
||||||
func (o statusOptions) PoWRequirementF() *float64 {
|
func (o statusOptions) PoWRequirementF() *float64 {
|
||||||
if o.PoWRequirement == nil {
|
if o.PoWRequirement == nil {
|
||||||
|
@ -99,7 +128,7 @@ func (o statusOptions) EncodeRLP(w io.Writer) error {
|
||||||
field := v.Field(i)
|
field := v.Field(i)
|
||||||
if !field.IsNil() {
|
if !field.IsNil() {
|
||||||
value := field.Interface()
|
value := field.Interface()
|
||||||
key, ok := idxFieldKey[i]
|
key, ok := o.idxFieldKey[i]
|
||||||
if !ok {
|
if !ok {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
@ -117,6 +146,8 @@ func (o *statusOptions) DecodeRLP(s *rlp.Stream) error {
|
||||||
return fmt.Errorf("expected an outer list: %v", err)
|
return fmt.Errorf("expected an outer list: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
o.parseStatusOptionKeys()
|
||||||
|
|
||||||
v := reflect.ValueOf(o)
|
v := reflect.ValueOf(o)
|
||||||
|
|
||||||
loop:
|
loop:
|
||||||
|
@ -130,7 +161,7 @@ loop:
|
||||||
default:
|
default:
|
||||||
return fmt.Errorf("expected an inner list: %v", err)
|
return fmt.Errorf("expected an inner list: %v", err)
|
||||||
}
|
}
|
||||||
var key string
|
var key statusOptionKey
|
||||||
if err := s.Decode(&key); err != nil {
|
if err := s.Decode(&key); err != nil {
|
||||||
return fmt.Errorf("invalid key: %v", err)
|
return fmt.Errorf("invalid key: %v", err)
|
||||||
}
|
}
|
||||||
|
@ -138,17 +169,17 @@ loop:
|
||||||
// It might happen when there is a new peer
|
// It might happen when there is a new peer
|
||||||
// which supports a new option with
|
// which supports a new option with
|
||||||
// a higher index.
|
// a higher index.
|
||||||
idx, ok := keyFieldIdx[key]
|
idx, ok := o.keyFieldIdx[key]
|
||||||
if !ok {
|
if !ok {
|
||||||
// Read the rest of the list items and dump them.
|
// Read the rest of the list items and dump them.
|
||||||
_, err := s.Raw()
|
_, err := s.Raw()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("failed to read the value of key %s: %v", key, err)
|
return fmt.Errorf("failed to read the value of key %d: %v", key, err)
|
||||||
}
|
}
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
if err := s.Decode(v.Elem().Field(idx).Addr().Interface()); err != nil {
|
if err := s.Decode(v.Elem().Field(idx).Addr().Interface()); err != nil {
|
||||||
return fmt.Errorf("failed to decode an option %s: %v", key, err)
|
return fmt.Errorf("failed to decode an option %d: %v", key, err)
|
||||||
}
|
}
|
||||||
if err := s.ListEnd(); err != nil {
|
if err := s.ListEnd(); err != nil {
|
||||||
return err
|
return err
|
||||||
|
|
Loading…
Reference in New Issue