remove redundancy code

diff --git a/api/accesstokens.go b/api/accesstokens.go
index 8e36852..d3d8ef8 100644 (file)
--- a/api/accesstokens.go
+++ b/api/accesstokens.go
@@ -28,8 +28,7 @@ func (a *API) listAccessTokens(ctx context.Context) Response {
 }
 
 func (a *API) deleteAccessToken(ctx context.Context, x struct {
-       ID    string `json:"id"`
-       Token string `json:"token"`
+       ID string `json:"id"`
 }) Response {
        //TODO Add delete permission verify.
        if err := a.accessTokens.Delete(ctx, x.ID); err != nil {

diff --git a/cmd/bytomcli/commands/account.go b/cmd/bytomcli/commands/account.go
index 121ebdd..10c6241 100644 (file)
--- a/cmd/bytomcli/commands/account.go
+++ b/cmd/bytomcli/commands/account.go
@@ -2,6 +2,7 @@ package commands
 
 import (
        "os"
+
        "github.com/spf13/cobra"
        jww "github.com/spf13/jwalterweatherman"
 
@@ -12,7 +13,6 @@ import (
 func init() {
        createAccountCmd.PersistentFlags().IntVarP(&accountQuorum, "quorom", "q", 1, "quorum must be greater than 0 and less than or equal to the number of signers")
        createAccountCmd.PersistentFlags().StringVarP(&accountToken, "access", "a", "", "access token")
-       createAccountCmd.PersistentFlags().StringVarP(&accountTags, "tags", "t", "", "tags")
 
        listAccountsCmd.PersistentFlags().StringVar(&accountID, "id", "", "ID of account")
 
@@ -23,12 +23,11 @@ func init() {
 }
 
 var (
-       accountID         = ""
-       accountAlias      = ""
-       accountQuorum     = 1
-       accountToken      = ""
-       accountTags       = ""
-       outputID          = ""
+       accountID     = ""
+       accountAlias  = ""
+       accountQuorum = 1
+       accountToken  = ""
+       outputID      = ""
 )
 
 var createAccountCmd = &cobra.Command{

diff --git a/cmd/bytomcli/commands/asset.go b/cmd/bytomcli/commands/asset.go
index 5a4a056..11a6a8a 100644 (file)
--- a/cmd/bytomcli/commands/asset.go
+++ b/cmd/bytomcli/commands/asset.go
@@ -14,18 +14,16 @@ import (
 func init() {
        createAssetCmd.PersistentFlags().IntVarP(&assetQuorum, "quorom", "q", 1, "quorum must be greater than 0 and less than or equal to the number of signers")
        createAssetCmd.PersistentFlags().StringVarP(&assetToken, "access", "a", "", "access token")
-       createAssetCmd.PersistentFlags().StringVarP(&assetTags, "tags", "t", "", "tags")
        createAssetCmd.PersistentFlags().StringVarP(&assetDefiniton, "definition", "d", "", "definition for the asset")
 
        listAssetsCmd.PersistentFlags().StringVar(&assetID, "id", "", "ID of asset")
 }
 
 var (
-       assetID         = ""
-       assetQuorum     = 1
-       assetToken      = ""
-       assetTags       = ""
-       assetDefiniton  = ""
+       assetID        = ""
+       assetQuorum    = 1
+       assetToken     = ""
+       assetDefiniton = ""
 )
 
 var createAssetCmd = &cobra.Command{

diff --git a/cmd/bytomcli/commands/transaction.go b/cmd/bytomcli/commands/transaction.go
index 4a24299..c8e3448 100644 (file)
--- a/cmd/bytomcli/commands/transaction.go
+++ b/cmd/bytomcli/commands/transaction.go
@@ -65,14 +65,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","expires_at":"2017-12-28T12:52:06.78309768+08:00"}}
+               {"type": "control_receiver", "asset_id": "%s", "amount": %s, "receiver":{"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","expires_at":"2017-12-28T12:52:06.78309768+08:00"}}
+               {"type": "control_receiver", "asset_alias": "%s", "amount": %s, "receiver":{"control_program": "%s"}}
        ]}`
 
 var buildRetireReqFmt = `