From e9317828d25f06bd4c6f50ff049e125e1a09236a Mon Sep 17 00:00:00 2001 From: Guillaume Ballet Date: Fri, 22 Nov 2019 12:11:54 +0100 Subject: [PATCH] signer: remove staticcheck warnings --- signer/core/api.go | 5 ++++- signer/core/api_test.go | 4 ++-- signer/core/cliui.go | 28 ---------------------------- signer/core/stdioui.go | 2 -- signer/core/types.go | 2 +- signer/core/uiapi.go | 2 +- signer/rules/rules.go | 2 +- signer/storage/storage.go | 5 ++--- 8 files changed, 11 insertions(+), 39 deletions(-) diff --git a/signer/core/api.go b/signer/core/api.go index 244767acaf..c10bf578d2 100644 --- a/signer/core/api.go +++ b/signer/core/api.go @@ -269,7 +269,7 @@ type ( } ) -var ErrRequestDenied = errors.New("Request denied") +var ErrRequestDenied = errors.New("request denied") // NewSignerAPI creates a new API that can be used for Account management. // ksLocation specifies the directory where to store the password protected private @@ -552,6 +552,9 @@ func (api *SignerAPI) SignTransaction(ctx context.Context, args SendTxArgs, meth } rlpdata, err := rlp.EncodeToBytes(signedTx) + if err != nil { + return nil, err + } response := ethapi.SignTransactionResult{Raw: rlpdata, Tx: signedTx} // Finally, send the signed tx to the UI diff --git a/signer/core/api_test.go b/signer/core/api_test.go index 30948f99bf..800020b0cf 100644 --- a/signer/core/api_test.go +++ b/signer/core/api_test.go @@ -71,7 +71,7 @@ func (ui *headlessUi) ApproveTx(request *core.SignTxRequest) (core.SignTxRespons } func (ui *headlessUi) ApproveSignData(request *core.SignDataRequest) (core.SignDataResponse, error) { - approved := "Y" == <-ui.approveCh + approved := (<-ui.approveCh == "Y") return core.SignDataResponse{approved}, nil } @@ -91,7 +91,7 @@ func (ui *headlessUi) ApproveListing(request *core.ListRequest) (core.ListRespon } func (ui *headlessUi) ApproveNewAccount(request *core.NewAccountRequest) (core.NewAccountResponse, error) { - if "Y" == <-ui.approveCh { + if <-ui.approveCh == "Y" { return core.NewAccountResponse{true}, nil } return core.NewAccountResponse{false}, nil diff --git a/signer/core/cliui.go b/signer/core/cliui.go index 1502238bf7..1e033299af 100644 --- a/signer/core/cliui.go +++ b/signer/core/cliui.go @@ -58,34 +58,6 @@ func (ui *CommandlineUI) readString() string { } } -// readPassword reads a single line from stdin, trimming it from the trailing new -// line and returns it. The input will not be echoed. -func (ui *CommandlineUI) readPassword() string { - fmt.Printf("Enter password to approve:\n") - fmt.Printf("> ") - - text, err := terminal.ReadPassword(int(os.Stdin.Fd())) - if err != nil { - log.Crit("Failed to read password", "err", err) - } - fmt.Println() - fmt.Println("-----------------------") - return string(text) -} - -// readPassword reads a single line from stdin, trimming it from the trailing new -// line and returns it. The input will not be echoed. -func (ui *CommandlineUI) readPasswordText(inputstring string) string { - fmt.Printf("Enter %s:\n", inputstring) - fmt.Printf("> ") - text, err := terminal.ReadPassword(int(os.Stdin.Fd())) - if err != nil { - log.Crit("Failed to read password", "err", err) - } - fmt.Println("-----------------------") - return string(text) -} - func (ui *CommandlineUI) OnInputRequired(info UserInputRequest) (UserInputResponse, error) { fmt.Printf("## %s\n\n%s\n", info.Title, info.Prompt) diff --git a/signer/core/stdioui.go b/signer/core/stdioui.go index 9ffe1398d4..6963a89122 100644 --- a/signer/core/stdioui.go +++ b/signer/core/stdioui.go @@ -18,7 +18,6 @@ package core import ( "context" - "sync" "github.com/ethereum/go-ethereum/internal/ethapi" "github.com/ethereum/go-ethereum/log" @@ -27,7 +26,6 @@ import ( type StdIOUI struct { client rpc.Client - mu sync.Mutex } func NewStdIOUI() *StdIOUI { diff --git a/signer/core/types.go b/signer/core/types.go index f147f06cd1..58b377c8d8 100644 --- a/signer/core/types.go +++ b/signer/core/types.go @@ -60,7 +60,7 @@ func (v *ValidationMessages) getWarnings() error { } } if len(messages) > 0 { - return fmt.Errorf("Validation failed: %s", strings.Join(messages, ",")) + return fmt.Errorf("validation failed: %s", strings.Join(messages, ",")) } return nil } diff --git a/signer/core/uiapi.go b/signer/core/uiapi.go index 7c2d233f89..36735d37ee 100644 --- a/signer/core/uiapi.go +++ b/signer/core/uiapi.go @@ -173,7 +173,7 @@ func (s *UIServerAPI) Export(ctx context.Context, addr common.Address) (json.Raw return nil, err } if wallet.URL().Scheme != keystore.KeyStoreScheme { - return nil, fmt.Errorf("Account is not a keystore-account") + return nil, fmt.Errorf("account is not a keystore-account") } return ioutil.ReadFile(wallet.URL().Path) } diff --git a/signer/rules/rules.go b/signer/rules/rules.go index 39538d18b9..cb375a62ad 100644 --- a/signer/rules/rules.go +++ b/signer/rules/rules.go @@ -152,7 +152,7 @@ func (r *rulesetUI) checkApproval(jsfunc string, jsarg []byte, err error) (bool, log.Info("Op rejected") return false, nil } - return false, fmt.Errorf("Unknown response") + return false, fmt.Errorf("unknown response") } func (r *rulesetUI) ApproveTx(request *core.SignTxRequest) (core.SignTxResponse, error) { diff --git a/signer/storage/storage.go b/signer/storage/storage.go index 06b0fd98f7..33c0d66f9b 100644 --- a/signer/storage/storage.go +++ b/signer/storage/storage.go @@ -41,8 +41,7 @@ type Storage interface { // EphemeralStorage is an in-memory storage that does // not persist values to disk. Mainly used for testing type EphemeralStorage struct { - data map[string]string - namespace string + data map[string]string } // Put stores a value by key. 0-length keys results in noop. @@ -83,5 +82,5 @@ type NoStorage struct{} func (s *NoStorage) Put(key, value string) {} func (s *NoStorage) Del(key string) {} func (s *NoStorage) Get(key string) (string, error) { - return "", errors.New("I forgot") + return "", errors.New("missing key, I probably forgot") }