diff --git a/types/rational.go b/types/rational.go index 2276ab4f29..550c96825a 100644 --- a/types/rational.go +++ b/types/rational.go @@ -153,13 +153,6 @@ func (r Rat) ToLeftPadded(totalDigits int8) string { //___________________________________________________________________________________ -// Hack to just use json.Marshal for everything until -// we update for amino -//type JSONCodec struct{} -//nolint -//func (jc JSONCodec) MarshalJSON(o interface{}) ([]byte, error) { return json.Marshal(o) } -//func (jc JSONCodec) UnmarshalJSON(bz []byte, o interface{}) error { return json.Unmarshal(bz, o) } - //Wraps r.MarshalText() in quotes to make it a valid JSON string. func (r Rat) MarshalJSON() ([]byte, error) { bz, err := (&(r.Rat)).MarshalText() diff --git a/types/rational_test.go b/types/rational_test.go index 2625db0640..39207034cb 100644 --- a/types/rational_test.go +++ b/types/rational_test.go @@ -209,15 +209,17 @@ func TestToLeftPadded(t *testing.T) { } } +var cdc = wire.NewCodec() //var jsonCdc JSONCodec // TODO wire.Codec + func TestZeroSerializationJSON(t *testing.T) { r := NewRat(0, 1) - err := r.UnmarshalJSON([]byte(`"0/1"`)) + err := cdc.UnmarshalJSON([]byte(`"0/1"`), &r) assert.Nil(t, err) - err = r.UnmarshalJSON([]byte(`"0/0"`)) + err = cdc.UnmarshalJSON([]byte(`"0/0"`), &r) assert.NotNil(t, err) - err = r.UnmarshalJSON([]byte(`"1/0"`)) + err = cdc.UnmarshalJSON([]byte(`"1/0"`), &r) assert.NotNil(t, err) - err = r.UnmarshalJSON([]byte(`"{}"`)) + err = cdc.UnmarshalJSON([]byte(`"{}"`), &r) assert.NotNil(t, err) } @@ -233,8 +235,6 @@ func TestSerializationText(t *testing.T) { assert.True(t, r.Equal(r2), "original: %v, unmarshalled: %v", r, r2) } -var cdc = wire.NewCodec() //var jsonCdc JSONCodec // TODO wire.Codec - func TestSerializationGoWire(t *testing.T) { r := NewRat(1, 3) bz, err := cdc.MarshalJSON(r)