fix linter errors thrown by unconvert, goconst, and nakedret (#3960)

* Remove unnecessary type conversions

* Consolidate repeated strings into consts

* Clothe return statements

* Update blockchain/v1/reactor_fsm_test.go

Co-Authored-By: Anton Kaliaev <anton.kalyaev@gmail.com>

This PR repairs linter errors seen when running the following commands:
golangci-lint run --no-config --disable-all=true --enable=unconvert
golangci-lint run --no-config --disable-all=true --enable=goconst
golangci-lint run --no-config --disable-all=true --enable=nakedret

Contributes to #3262
This commit is contained in:
Phil Salant
2019-09-10 03:31:44 -04:00
committed by Anton Kaliaev
parent 7f0c55f249
commit 04d13d9945
31 changed files with 69 additions and 59 deletions

View File

@ -33,6 +33,8 @@ const (
unixAddr = "unix://" + unixSocket
websocketEndpoint = "/websocket/endpoint"
testVal = "acbd"
)
type ResultEcho struct {
@ -189,7 +191,7 @@ func echoDataBytesViaHTTP(cl client.HTTPClient, bytes cmn.HexBytes) (cmn.HexByte
}
func testWithHTTPClient(t *testing.T, cl client.HTTPClient) {
val := "acbd"
val := testVal
got, err := echoViaHTTP(cl, val)
require.Nil(t, err)
assert.Equal(t, got, val)
@ -255,7 +257,7 @@ func echoBytesViaWS(cl *client.WSClient, bytes []byte) ([]byte, error) {
}
func testWithWSClient(t *testing.T, cl *client.WSClient) {
val := "acbd"
val := testVal
got, err := echoViaWS(cl, val)
require.Nil(t, err)
assert.Equal(t, got, val)
@ -314,7 +316,7 @@ func TestWSNewWSRPCFunc(t *testing.T) {
require.Nil(t, err)
defer cl.Stop()
val := "acbd"
val := testVal
params := map[string]interface{}{
"arg": val,
}
@ -339,7 +341,7 @@ func TestWSHandlesArrayParams(t *testing.T) {
require.Nil(t, err)
defer cl.Stop()
val := "acbd"
val := testVal
params := []interface{}{val}
err = cl.CallWithArrayParams(context.Background(), "echo_ws", params)
require.Nil(t, err)