vm/tests: preserve order when decoding Map item.

When using Go's `map` for decoding, order can change from time to time,
while we may want to check it too. Use custom decoder for saving items
in order.
This commit is contained in:
Evgenii Stratonikov 2020-05-21 09:52:24 +03:00
parent 9dca2288ba
commit 673e6c84d1

View file

@ -250,16 +250,7 @@ func (v *vmUTStackItem) toStackItem() StackItem {
case typeString: case typeString:
panic("not implemented") panic("not implemented")
case typeMap: case typeMap:
items := v.Value.(map[string]vmUTStackItem) return v.Value.(*MapItem)
result := NewMapItem()
for k, v := range items {
item := jsonStringToInteger(k)
if item == nil {
panic(fmt.Sprintf("can't unmarshal StackItem %s", k))
}
result.Add(item, v.toStackItem())
}
return result
case typeInterop: case typeInterop:
panic("not implemented") panic("not implemented")
case typeByteString: case typeByteString:
@ -426,11 +417,37 @@ func (v *vmUTStackItem) UnmarshalJSON(data []byte) error {
case typeInterop, typeNull: case typeInterop, typeNull:
v.Value = nil v.Value = nil
case typeMap: case typeMap:
var m map[string]vmUTStackItem // we want to have the same order as in test file, so a custom decoder is used
if err := json.Unmarshal(si.Value, &m); err != nil { d := json.NewDecoder(bytes.NewReader(si.Value))
return err if tok, err := d.Token(); err != nil || tok != json.Delim('{') {
return fmt.Errorf("invalid map start")
} }
v.Value = m
result := NewMapItem()
for {
tok, err := d.Token()
if err != nil {
return err
} else if tok == json.Delim('}') {
break
}
key, ok := tok.(string)
if !ok {
return fmt.Errorf("string expected in map key")
}
var it vmUTStackItem
if err := d.Decode(&it); err != nil {
return fmt.Errorf("can't decode map value: %v", err)
}
item := jsonStringToInteger(key)
if item == nil {
return fmt.Errorf("can't unmarshal StackItem %s", key)
}
result.Add(item, it.toStackItem())
}
v.Value = result
case typeString: case typeString:
panic("not implemented") panic("not implemented")
default: default: