Merge pull request Agoric#22 from Agoric/21-must-marshal-json

msgs.go: use MustMarshalJSON
dckc · Jun 15, 2019 · 2698360 · 2698360
2 parents e2fe21b + da82ca0
commit 2698360
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/x/swingset/codec.go b/x/swingset/codec.go
@@ -4,7 +4,10 @@ import (
 	"github.com/cosmos/cosmos-sdk/codec"
 )
 
+var ModuleCdc *codec.Codec
+
 // RegisterCodec registers concrete types on the Amino codec
 func RegisterCodec(cdc *codec.Codec) {
+	ModuleCdc = cdc
 	cdc.RegisterConcrete(MsgDeliverInbound{}, "swingset/DeliverInbound", nil)
 }
diff --git a/x/swingset/msgs.go b/x/swingset/msgs.go
@@ -1,8 +1,6 @@
 package swingset
 
 import (
-	"encoding/json"
-
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
@@ -65,11 +63,7 @@ func (msg MsgDeliverInbound) GetSignBytes() []byte {
 	if msg.Nums == nil {
 		msg.Nums = []int{}
 	}
-	b, err := json.Marshal(msg)
-	if err != nil {
-		panic(err)
-	}
-	return sdk.MustSortJSON(b)
+	return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(msg))
 }
 
 // GetSigners defines whose signature is required