modify field name (#1202)

diff --git a/api/nodeinfo.go b/api/nodeinfo.go
index b2b022e..ccf4c8f 100644 (file)
--- a/api/nodeinfo.go
+++ b/api/nodeinfo.go
@@ -101,9 +101,9 @@ func (a *API) listPeers() Response {
 
 // disconnect peer
 func (a *API) disconnectPeer(ctx context.Context, ins struct {
-       PeerId string `json:"peerId"`
+       PeerID string `json:"peer_id"`
 }) Response {
-       if err := a.disconnectPeerById(ins.PeerId); err != nil {
+       if err := a.disconnectPeerById(ins.PeerID); err != nil {
                return NewErrorResponse(err)
        }
        return NewSuccessResponse(nil)

diff --git a/cmd/bytomcli/commands/transaction.go b/cmd/bytomcli/commands/transaction.go
index d1b7aad..9c2e063 100644 (file)
--- a/cmd/bytomcli/commands/transaction.go
+++ b/cmd/bytomcli/commands/transaction.go
@@ -17,7 +17,7 @@ import (
 )
 
 func init() {
-       buildTransactionCmd.PersistentFlags().StringVarP(&buildType, "type", "t", "", "transaction type, valid types: 'issue', 'spend', 'address', 'retire', 'program', 'unlock'")
+       buildTransactionCmd.PersistentFlags().StringVarP(&buildType, "type", "t", "", "transaction type, valid types: 'issue', 'spend', 'address', 'retire', 'unlock'")
        buildTransactionCmd.PersistentFlags().StringVarP(&receiverProgram, "receiver", "r", "", "program of receiver when type is spend")
        buildTransactionCmd.PersistentFlags().StringVarP(&address, "address", "a", "", "address of receiver when type is address")
        buildTransactionCmd.PersistentFlags().StringVarP(&program, "program", "p", "", "program of receiver when type is program")
@@ -73,14 +73,14 @@ var buildSpendReqFmt = `
        {"actions": [
                {"type": "spend_account", "asset_id": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", "amount":%s, "account_id": "%s"},
                {"type": "spend_account", "asset_id": "%s","amount": %s,"account_id": "%s"},
-               {"type": "control_receiver", "asset_id": "%s", "amount": %s, "receiver":{"control_program": "%s"}}
+               {"type": "control_program", "asset_id": "%s", "amount": %s, "control_program": "%s"}
        ]}`
 
 var buildSpendReqFmtByAlias = `
        {"actions": [
                {"type": "spend_account", "asset_alias": "BTM", "amount":%s, "account_alias": "%s"},
                {"type": "spend_account", "asset_alias": "%s","amount": %s,"account_alias": "%s"},
-               {"type": "control_receiver", "asset_alias": "%s", "amount": %s, "receiver":{"control_program": "%s"}}
+               {"type": "control_program", "asset_alias": "%s", "amount": %s, "control_program": "%s"}
        ]}`
 
 var buildRetireReqFmt = `
@@ -111,20 +111,6 @@ var buildControlAddressReqFmtByAlias = `
                {"type": "control_address", "asset_alias": "%s", "amount": %s,"address": "%s"}
        ]}`
 
-var buildControlProgramReqFmt = `
-       {"actions": [
-               {"type": "spend_account", "asset_id": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", "amount":%s, "account_id": "%s"},
-               {"type": "spend_account", "asset_id": "%s","amount": %s,"account_id": "%s"},
-               {"type": "control_program", "asset_id": "%s", "amount": %s, "control_program": "%s"}
-       ]}`
-
-var buildControlProgramReqFmtByAlias = `
-       {"actions": [
-               {"type": "spend_account", "asset_alias": "btm", "amount":%s, "account_alias": "%s"},
-               {"type": "spend_account", "asset_alias": "%s","amount": %s,"account_alias": "%s"},
-               {"type": "control_program", "asset_alias": "%s", "amount": %s, "control_program": "%s"}
-       ]}`
-
 var buildTransactionCmd = &cobra.Command{
        Use:   "build-transaction <accountID|alias> <assetID|alias> <amount> [outputID]",
        Short: "Build one transaction template,default use account id and asset id",
@@ -165,12 +151,6 @@ var buildTransactionCmd = &cobra.Command{
                                break
                        }
                        buildReqStr = fmt.Sprintf(buildControlAddressReqFmt, btmGas, accountInfo, assetInfo, amount, accountInfo, assetInfo, amount, address)
-               case "program":
-                       if alias {
-                               buildReqStr = fmt.Sprintf(buildControlProgramReqFmtByAlias, btmGas, accountInfo, assetInfo, amount, accountInfo, assetInfo, amount, program)
-                               break
-                       }
-                       buildReqStr = fmt.Sprintf(buildControlProgramReqFmt, btmGas, accountInfo, assetInfo, amount, accountInfo, assetInfo, amount, program)
                case "unlock":
                        var err error
                        usage := "Usage:\n  bytomcli build-transaction <accountID|alias> <assetID|alias> <amount> <outputID> -c <contractName>"

diff --git a/netsync/peer.go b/netsync/peer.go
index 5d07e2e..efe8c1f 100644 (file)
--- a/netsync/peer.go
+++ b/netsync/peer.go
@@ -36,7 +36,7 @@ type BasePeerSet interface {
 
 // PeerInfo indicate peer status snap
 type PeerInfo struct {
-       ID         string `json:"id"`
+       ID         string `json:"peer_id"`
        RemoteAddr string `json:"remote_addr"`
        Height     uint64 `json:"height"`
        Delay      uint32 `json:"delay"`