From 6494216b1cf330fae49284f28d2546a53ec6c921 Mon Sep 17 00:00:00 2001
From: Jacob Gadikian <jacobgadikian@gmail.com>
Date: Thu, 31 Aug 2023 01:27:51 +0800
Subject: [PATCH] check errors

---
 .golangci.yml                                 | 3 +++
 cmd/config.go                                 | 5 ++---
 cmd/query.go                                  | 4 ++--
 relayer/chains/cosmos/grpc_query.go           | 7 ++++---
 relayer/chains/cosmos/keys/sr25519/privkey.go | 2 +-
 relayer/provider/provider.go                  | 7 ++++---
 6 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/.golangci.yml b/.golangci.yml
index ce94252a2..a426b6964 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -39,6 +39,9 @@ issues:
     - text: 'Use of weak random number generator'
       linters:
         - gosec
+    - text: 'ST1003'
+      linters:
+        - stylecheck
 
   max-issues-per-linter: 10000
   max-same-issues: 10000
diff --git a/cmd/config.go b/cmd/config.go
index da47807d9..d2ce5196a 100644
--- a/cmd/config.go
+++ b/cmd/config.go
@@ -22,7 +22,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"os"
 	"path"
 	"path/filepath"
@@ -180,7 +179,7 @@ $ %s cfg i`, appName, defaultHome, appName)),
 // An error is only returned if the directory cannot be read at all.
 func addChainsFromDirectory(ctx context.Context, stderr io.Writer, a *appState, dir string) error {
 	dir = path.Clean(dir)
-	files, err := ioutil.ReadDir(dir)
+	files, err := os.ReadDir(dir)
 	if err != nil {
 		return err
 	}
@@ -232,7 +231,7 @@ func addChainsFromDirectory(ctx context.Context, stderr io.Writer, a *appState,
 // which means a's paths may include a subset of the path files in dir.
 func addPathsFromDirectory(ctx context.Context, stderr io.Writer, a *appState, dir string) error {
 	dir = path.Clean(dir)
-	files, err := ioutil.ReadDir(dir)
+	files, err := os.ReadDir(dir)
 	if err != nil {
 		return err
 	}
diff --git a/cmd/query.go b/cmd/query.go
index 234b17806..81867f852 100644
--- a/cmd/query.go
+++ b/cmd/query.go
@@ -480,7 +480,7 @@ $ %s q conns ibc-1`,
 			// pagereq, err := client.ReadPageRequest(cmd.Flags())
 			// if err != nil {
 			//	return err
-			//}
+			// }
 
 			res, err := chain.ChainProvider.QueryConnections(cmd.Context())
 			if err != nil {
@@ -624,7 +624,7 @@ $ %s query connection-channels ibc-2 ibcconnection2 --offset 2 --limit 30`,
 			// pagereq, err := client.ReadPageRequest(cmd.Flags())
 			// if err != nil {
 			//	return err
-			//}
+			// }
 
 			chans, err := chain.ChainProvider.QueryConnectionChannels(cmd.Context(), 0, args[1])
 			if err != nil {
diff --git a/relayer/chains/cosmos/grpc_query.go b/relayer/chains/cosmos/grpc_query.go
index 38b33e3ff..45cf7ffb5 100644
--- a/relayer/chains/cosmos/grpc_query.go
+++ b/relayer/chains/cosmos/grpc_query.go
@@ -16,6 +16,7 @@ import (
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/grpc/status"
 
+	errorsmod "cosmossdk.io/errors"
 	"github.com/cosmos/cosmos-sdk/codec/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
@@ -39,17 +40,17 @@ func (cc *CosmosProvider) Invoke(ctx context.Context, method string, req, reply
 
 	// In both cases, we don't allow empty request req (it will panic unexpectedly).
 	if reflect.ValueOf(req).IsNil() {
-		return sdkerrors.Wrap(sdkerrors.ErrInvalidRequest, "request cannot be nil")
+		return errorsmod.Wrap(sdkerrors.ErrInvalidRequest, "request cannot be nil")
 	}
 
 	// Case 1. Broadcasting a Tx.
 	if reqProto, ok := req.(*tx.BroadcastTxRequest); ok {
 		if !ok {
-			return sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, "expected %T, got %T", (*tx.BroadcastTxRequest)(nil), req)
+			return errorsmod.Wrapf(sdkerrors.ErrInvalidRequest, "expected %T, got %T", (*tx.BroadcastTxRequest)(nil), req)
 		}
 		resProto, ok := reply.(*tx.BroadcastTxResponse)
 		if !ok {
-			return sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, "expected %T, got %T", (*tx.BroadcastTxResponse)(nil), req)
+			return errorsmod.Wrapf(sdkerrors.ErrInvalidRequest, "expected %T, got %T", (*tx.BroadcastTxResponse)(nil), req)
 		}
 
 		broadcastRes, err := cc.TxServiceBroadcast(ctx, reqProto)
diff --git a/relayer/chains/cosmos/keys/sr25519/privkey.go b/relayer/chains/cosmos/keys/sr25519/privkey.go
index 24fc1f3b6..513d14ec3 100644
--- a/relayer/chains/cosmos/keys/sr25519/privkey.go
+++ b/relayer/chains/cosmos/keys/sr25519/privkey.go
@@ -33,7 +33,7 @@ func (m *PrivKey) Equals(other cryptotypes.LedgerPrivKey) bool {
 	return m.PrivKey.Equals(sk2.PrivKey)
 }
 
-func (m *PrivKey) ProtoMessage() {}
+func (*PrivKey) ProtoMessage() {}
 
 func (m *PrivKey) Reset() {
 	m.PrivKey = tmsr25519.PrivKey{}
diff --git a/relayer/provider/provider.go b/relayer/provider/provider.go
index 44c63c799..d9facc180 100644
--- a/relayer/provider/provider.go
+++ b/relayer/provider/provider.go
@@ -198,7 +198,8 @@ func (e RelayerEvent) MarshalLogObject(enc zapcore.ObjectEncoder) error {
 // MarshalLogArray satisfies the zapcore.ArrayMarshaler interface.
 func (es loggableEvents) MarshalLogArray(enc zapcore.ArrayEncoder) error {
 	for _, e := range es {
-		enc.AppendObject(e)
+		err := enc.AppendObject(e)
+		return err
 	}
 	return nil
 }
@@ -210,8 +211,8 @@ func (r RelayerTxResponse) MarshalLogObject(enc zapcore.ObjectEncoder) error {
 	enc.AddString("codespace", r.Codespace)
 	enc.AddUint32("code", r.Code)
 	enc.AddString("data", r.Data)
-	enc.AddArray("events", loggableEvents(r.Events))
-	return nil
+	err := enc.AddArray("events", loggableEvents(r.Events))
+	return err
 }
 
 type KeyProvider interface {