LaconicNetwork/cosmos-sdk
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

done: wire -> json

Browse Source
This commit is contained in:
mossid 2018-03-15 12:38:17 +01:00
parent 25f01a3e12
commit f279a5538d
4 changed files with 17 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
x/ibc/commands/helpers.go
View File

@ -1,6 +1,7 @@
package commands
import (
"encoding/json"
"fmt"
"github.com/spf13/viper"
@ -8,10 +9,10 @@ import (
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/client/keys"
sdk "github.com/cosmos/cosmos-sdk/types"
wire "github.com/tendermint/go-amino"
// wire "github.com/tendermint/go-amino"
)
func buildTx(cdc *wire.Codec, msg sdk.Msg, name string) ([]byte, error) {
func buildTx(msg sdk.Msg, name string) ([]byte, error) {
keybase, err := keys.GetKeyBase()
if err != nil {
return nil, err
@ -36,7 +37,7 @@ func buildTx(cdc *wire.Codec, msg sdk.Msg, name string) ([]byte, error) {
tx := sdk.NewStdTx(msg, sigs)
txBytes, err := cdc.MarshalBinary(tx)
txBytes, err := json.Marshal(tx)
if err != nil {
return nil, err
}

17
x/ibc/commands/relay.go
View File

@ -1,6 +1,7 @@
package commands
import (
"encoding/json"
"fmt"
"time"
@ -10,13 +11,13 @@ import (
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/client/builder"
wire "github.com/tendermint/go-amino"
//wire "github.com/tendermint/go-amino"
"github.com/cosmos/cosmos-sdk/x/ibc"
)
func IBCRelayCmd(cdc *wire.Codec) *cobra.Command {
cmdr := relayCommander{cdc, "ibc"}
func IBCRelayCmd() *cobra.Command {
cmdr := relayCommander{"ibc"}
cmd := &cobra.Command{
Use: "relay",
@ -27,7 +28,7 @@ func IBCRelayCmd(cdc *wire.Codec) *cobra.Command {
}
type relayCommander struct {
cdc *wire.Codec
// cdc *wire.Codec
ibcStore string
}
@ -59,7 +60,7 @@ func broadcastTx(id string, tx []byte) error {
func (c relayCommander) refine(bz []byte, sequence int64) []byte {
var packet ibc.IBCPacket
if err := c.cdc.UnmarshalBinary(bz, &packet); err != nil {
if err := json.Unmarshal(bz, &packet); err != nil {
panic(err)
}
@ -71,7 +72,7 @@ func (c relayCommander) refine(bz []byte, sequence int64) []byte {
Relayer: address,
Sequence: sequence,
}
res, err := buildTx(c.cdc, msg, name)
res, err := buildTx(msg, name)
if err != nil {
panic(err)
}
@ -87,7 +88,7 @@ func (c relayCommander) loop(fromID, toID string) {
}
var processed int64
if err = c.cdc.UnmarshalBinary(processedbz, &processed); err != nil {
if err = json.Unmarshal(processedbz, &processed); err != nil {
panic(err)
}
@ -102,7 +103,7 @@ OUTER:
continue OUTER
}
var egressLength int64
if err = c.cdc.UnmarshalBinary(egressLengthbz, &egressLength); err != nil {
if err = json.Unmarshal(egressLengthbz, &egressLength); err != nil {
panic(err)
}

16
x/ibc/commands/root.go
View File

@ -1,16 +0,0 @@
package commands
import (
"github.com/spf13/cobra"
wire "github.com/tendermint/go-amino"
)
func AddCommands(cmd *cobra.Command) {
cdc := wire.NewCodec()
cmd.AddCommand(
IBCTransferCmd(cdc),
IBCRelayCmd(cdc),
)
}

8
x/ibc/commands/send.go
View File

@ -16,8 +16,8 @@ import (
"github.com/cosmos/cosmos-sdk/x/ibc"
)
func IBCTransferCmd(cdc *wire.Codec) *cobra.Command {
cmdr := sendCommander{cdc}
func IBCTransferCmd() *cobra.Command {
cmdr := sendCommander{}
cmd := &cobra.Command{
Use: "transfer",
@ -37,7 +37,7 @@ func IBCTransferCmd(cdc *wire.Codec) *cobra.Command {
}
type sendCommander struct {
cdc *wire.Codec
// cdc *wire.Codec
}
func (c sendCommander) runIBCTransfer(cmd *cobra.Command, args []string) error {
@ -49,7 +49,7 @@ func (c sendCommander) runIBCTransfer(cmd *cobra.Command, args []string) error {
return err
}
txBytes, err := buildTx(c.cdc, msg, keyname)
txBytes, err := buildTx(msg, keyname)
if err != nil {
return err
}