modify bytomcli reset-key-password response

adjust submit-transaction and estimate-transaction-gas postistion which available with no wallet enable

diff --git a/api/api.go b/api/api.go
index 2bd6ced..5a69318 100644 (file)
--- a/api/api.go
+++ b/api/api.go
@@ -188,8 +188,6 @@ func (a *API) buildHandler() {
 
                m.Handle("/build-transaction", jsonHandler(a.build))
                m.Handle("/sign-transaction", jsonHandler(a.pseudohsmSignTemplates))
-               m.Handle("/submit-transaction", jsonHandler(a.submit))
-               m.Handle("/estimate-transaction-gas", jsonHandler(a.estimateTxGas))
 
                m.Handle("/get-transaction", jsonHandler(a.getTransaction))
                m.Handle("/list-transactions", jsonHandler(a.listTransactions))
@@ -217,6 +215,9 @@ func (a *API) buildHandler() {
        m.Handle("/delete-transaction-feed", jsonHandler(a.deleteTxFeed))
        m.Handle("/list-transaction-feeds", jsonHandler(a.listTxFeeds))
 
+       m.Handle("/submit-transaction", jsonHandler(a.submit))
+       m.Handle("/estimate-transaction-gas", jsonHandler(a.estimateTxGas))
+
        m.Handle("/get-unconfirmed-transaction", jsonHandler(a.getUnconfirmedTx))
        m.Handle("/list-unconfirmed-transactions", jsonHandler(a.listUnconfirmedTxs))
        m.Handle("/decode-raw-transaction", jsonHandler(a.decodeRawTransaction))

diff --git a/cmd/bytomcli/commands/bytomcli.go b/cmd/bytomcli/commands/bytomcli.go
index 0a28042..dd1abf9 100644 (file)
--- a/cmd/bytomcli/commands/bytomcli.go
+++ b/cmd/bytomcli/commands/bytomcli.go
@@ -192,8 +192,6 @@ func AddTemplateFunc() {
 
                buildTransactionCmd.Name(),
                signTransactionCmd.Name(),
-               submitTransactionCmd.Name(),
-               estimateTransactionGasCmd.Name(),
 
                getTransactionCmd.Name(),
                listTransactionsCmd.Name(),

diff --git a/cmd/bytomcli/commands/key.go b/cmd/bytomcli/commands/key.go
index 7bcc1f1..262a02c 100644 (file)
--- a/cmd/bytomcli/commands/key.go
+++ b/cmd/bytomcli/commands/key.go
@@ -83,10 +83,12 @@ var resetKeyPwdCmd = &cobra.Command{
                        NewPassword string       `json:"new_password"`
                }{XPub: *xpub, OldPassword: args[1], NewPassword: args[2]}
 
-               if _, exitCode := util.ClientCall("/reset-key-password", &ins); exitCode != util.Success {
+               data, exitCode := util.ClientCall("/reset-key-password", &ins)
+               if exitCode != util.Success {
                        os.Exit(exitCode)
                }
-               jww.FEEDBACK.Println("Successfully reset key password")
+
+               printJSON(data)
        },
 }