Merge PR #4608: More linters - Gosec, staticcheck

client/input/input.go

@@ -65,23 +65,21 @@ func GetCheckPassword(prompt, prompt2 string, buf *bufio.Reader) (string, error)
 // "y", "Y", "yes", "YES", and "Yes" all count as confirmations.
 // If the input is not recognized, it returns false and a nil error.
 func GetConfirmation(prompt string, buf *bufio.Reader) (bool, error) {
-	for {
-		if inputIsTty() {
-			fmt.Print(fmt.Sprintf("%s [y/N]: ", prompt))
-		}
-
-		response, err := readLineFromBuf(buf)
-		if err != nil {
-			return false, err
-		}
-
-		response = strings.ToLower(strings.TrimSpace(response))
-		if response[0] == 'y' {
-			return true, nil
-		}
-
-		return false, nil
+	if inputIsTty() {
+		fmt.Print(fmt.Sprintf("%s [y/N]: ", prompt))
 	}
+
+	response, err := readLineFromBuf(buf)
+	if err != nil {
+		return false, err
+	}
+
+	response = strings.ToLower(strings.TrimSpace(response))
+	if response[0] == 'y' {
+		return true, nil
+	}
+
+	return false, nil
 }
 
 // GetString simply returns the trimmed string output of a given reader.

client/rpc/block.go

@@ -117,13 +117,16 @@ func BlockRequestHandlerFn(cliCtx context.CLIContext) http.HandlerFunc {
 		height, err := strconv.ParseInt(vars["height"], 10, 64)
 		if err != nil {
 			rest.WriteErrorResponse(w, http.StatusBadRequest,
-				"ERROR: Couldn't parse block height. Assumed format is '/block/{height}'.")
+				"couldn't parse block height. Assumed format is '/block/{height}'.")
 			return
 		}
 		chainHeight, err := GetChainHeight(cliCtx)
+		if err != nil {
+			rest.WriteErrorResponse(w, http.StatusInternalServerError, "failed to parse chain height")
+			return
+		}
 		if height > chainHeight {
-			rest.WriteErrorResponse(w, http.StatusNotFound,
-				"ERROR: Requested block height is bigger then the chain length.")
+			rest.WriteErrorResponse(w, http.StatusNotFound, "requested block height is bigger then the chain length")
 			return
 		}
 		output, err := getBlock(cliCtx, &height)

client/rpc/validators.go

@@ -161,13 +161,17 @@ func ValidatorSetRequestHandlerFn(cliCtx context.CLIContext) http.HandlerFunc {
 
 		height, err := strconv.ParseInt(vars["height"], 10, 64)
 		if err != nil {
-			rest.WriteErrorResponse(w, http.StatusBadRequest, "ERROR: Couldn't parse block height. Assumed format is '/validatorsets/{height}'.")
+			rest.WriteErrorResponse(w, http.StatusBadRequest, "failed to parse block height; assumed format is '/validatorsets/{height}'")
 			return
 		}
 
 		chainHeight, err := GetChainHeight(cliCtx)
+		if err != nil {
+			rest.WriteErrorResponse(w, http.StatusInternalServerError, "failed to parse chain height")
+			return
+		}
 		if height > chainHeight {
-			rest.WriteErrorResponse(w, http.StatusNotFound, "ERROR: Requested block height is bigger then the chain length.")
+			rest.WriteErrorResponse(w, http.StatusNotFound, "requested block height is bigger then the chain length")
 			return
 		}