certusone
/
cosmos-sdk
mirror of https://github.com/certusone/cosmos-sdk.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

rational cleanup

This commit is contained in:
rigelrozanski 2018-04-30 17:39:13 -04:00
parent cb4463e5f1
commit 4a834ae9c5
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
types/rational.go
View File

@ -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. //Wraps r.MarshalText() in quotes to make it a valid JSON string.
func (r Rat) MarshalJSON() ([]byte, error) { func (r Rat) MarshalJSON() ([]byte, error) {
bz, err := (&(r.Rat)).MarshalText() bz, err := (&(r.Rat)).MarshalText()

12
types/rational_test.go
View File

@ -209,15 +209,17 @@ func TestToLeftPadded(t *testing.T) {
} }
} }
var cdc = wire.NewCodec() //var jsonCdc JSONCodec // TODO wire.Codec
func TestZeroSerializationJSON(t *testing.T) { func TestZeroSerializationJSON(t *testing.T) {
r := NewRat(0, 1) r := NewRat(0, 1)
err := r.UnmarshalJSON([]byte(`"0/1"`)) err := cdc.UnmarshalJSON([]byte(`"0/1"`), &r)
assert.Nil(t, err) assert.Nil(t, err)
err = r.UnmarshalJSON([]byte(`"0/0"`)) err = cdc.UnmarshalJSON([]byte(`"0/0"`), &r)
assert.NotNil(t, err) assert.NotNil(t, err)
err = r.UnmarshalJSON([]byte(`"1/0"`)) err = cdc.UnmarshalJSON([]byte(`"1/0"`), &r)
assert.NotNil(t, err) assert.NotNil(t, err)
err = r.UnmarshalJSON([]byte(`"{}"`)) err = cdc.UnmarshalJSON([]byte(`"{}"`), &r)
assert.NotNil(t, err) 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) 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) { func TestSerializationGoWire(t *testing.T) {
r := NewRat(1, 3) r := NewRat(1, 3)
bz, err := cdc.MarshalJSON(r) bz, err := cdc.MarshalJSON(r)