Commit dea69d3d authored by linj's avatar linj Committed by 33cn

使用 types.MustPBToJSON,代替 json.Marshal。 和服务端 解码(types.JSONToPB)一致

parent caba59f4
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
package commands package commands
import ( import (
"encoding/json"
"fmt" "fmt"
"math" "math"
"os" "os"
...@@ -133,15 +132,10 @@ func CreateAssetSendToExec(cmd *cobra.Command, args []string, fromExec string) { ...@@ -133,15 +132,10 @@ func CreateAssetSendToExec(cmd *cobra.Command, args []string, fromExec string) {
ExecName: exec, ExecName: exec,
} }
data, err := json.Marshal(&payload)
if err != nil {
fmt.Fprintln(os.Stderr, err)
return
}
params := &rpcTypes.CreateTxIn{ params := &rpcTypes.CreateTxIn{
Execer: types.ExecName(fromExec), Execer: types.ExecName(fromExec),
ActionName: "TransferToExec", ActionName: "TransferToExec",
Payload: data, Payload: types.MustPBToJSON(payload),
} }
rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr") rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr")
...@@ -171,15 +165,10 @@ func CreateAssetWithdraw(cmd *cobra.Command, args []string, fromExec string) { ...@@ -171,15 +165,10 @@ func CreateAssetWithdraw(cmd *cobra.Command, args []string, fromExec string) {
Cointoken: symbol, Cointoken: symbol,
ExecName: exec, ExecName: exec,
} }
data, err := json.Marshal(&payload)
if err != nil {
fmt.Fprintln(os.Stderr, err)
return
}
params := &rpcTypes.CreateTxIn{ params := &rpcTypes.CreateTxIn{
Execer: types.ExecName(fromExec), Execer: types.ExecName(fromExec),
ActionName: "Withdraw", ActionName: "Withdraw",
Payload: data, Payload: types.MustPBToJSON(payload),
} }
rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr") rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr")
...@@ -200,15 +189,10 @@ func CreateAssetTransfer(cmd *cobra.Command, args []string, fromExec string) { ...@@ -200,15 +189,10 @@ func CreateAssetTransfer(cmd *cobra.Command, args []string, fromExec string) {
Note: []byte(note), Note: []byte(note),
Cointoken: symbol, Cointoken: symbol,
} }
data, err := json.Marshal(&payload)
if err != nil {
fmt.Fprintln(os.Stderr, err)
return
}
params := &rpcTypes.CreateTxIn{ params := &rpcTypes.CreateTxIn{
Execer: types.ExecName(fromExec), Execer: types.ExecName(fromExec),
ActionName: "Transfer", ActionName: "Transfer",
Payload: data, Payload: types.MustPBToJSON(payload),
} }
rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr") rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment