TrueCloudLab/neo-go
8
0
Fork 0
mirror of https://github.com/nspcc-dev/neo-go.git synced 2024-12-11 05:30:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixedn: always correctly unmarshal Fixed8 values

Browse source 
Quoted or not, they should be unmarshalled without going through float64.
This commit is contained in:
Roman Khimov 2021-01-22 18:48:24 +03:00
parent feb6ba2ef7
commit 62a11807a8
2 changed files with 29 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
pkg/util/fixed8.go
View file

@ -1,7 +1,6 @@
package util
import (
"encoding/json"
"errors"
"math"
"strconv"
@ -106,20 +105,25 @@ func FixedNFromString(s string, precision int) (int64, error) {
// UnmarshalJSON implements the json unmarshaller interface.
func (f *Fixed8) UnmarshalJSON(data []byte) error {
return f.unmarshalHelper(func(v interface{}) error {
return json.Unmarshal(data, v)
})
if len(data) > 2 {
if data[0] == '"' && data[len(data)-1] == '"' {
data = data[1 : len(data)-1]
}
}
return f.setFromString(string(data))
}
// UnmarshalYAML implements the yaml unmarshaler interface.
func (f *Fixed8) UnmarshalYAML(unmarshal func(interface{}) error) error {
return f.unmarshalHelper(unmarshal)
var s string
err := unmarshal(&s)
if err != nil {
return err
}
return f.setFromString(s)
}
// unmarshalHelper is an underlying unmarshaller func for JSON and YAML.
func (f *Fixed8) unmarshalHelper(unmarshal func(interface{}) error) error {
var s string
if err := unmarshal(&s); err == nil {
func (f *Fixed8) setFromString(s string) error {
p, err := Fixed8FromString(s)
if err != nil {
return err
@ -128,15 +132,6 @@ func (f *Fixed8) unmarshalHelper(unmarshal func(interface{}) error) error {
return nil
}
var fl float64
if err := unmarshal(&fl); err != nil {
return err
}
*f = Fixed8(decimals * fl)
return nil
}
// MarshalJSON implements the json marshaller interface.
func (f Fixed8) MarshalJSON() ([]byte, error) {
return []byte(`"` + f.String() + `"`), nil

13
pkg/util/fixed8_test.go
View file

@ -138,6 +138,19 @@ func TestFixed8UnmarshalJSON(t *testing.T) {
}
}
func TestFixed8_Unmarshal(t *testing.T) {
var expected = Fixed8(223719420)
var cases = []string{"2.2371942", `"2.2371942"`} // this easily gives 223719419 if interpreted as float
for _, c := range cases {
var u1, u2 Fixed8
assert.Nil(t, json.Unmarshal([]byte(c), &u1))
assert.Equal(t, expected, u1)
assert.Nil(t, yaml.Unmarshal([]byte(c), &u2))
assert.Equal(t, expected, u2)
}
}
func TestFixed8_MarshalJSON(t *testing.T) {
u, err := Fixed8FromString("123.4")
assert.NoError(t, err)