Fix lint issues

Author: khdegraaf

.github/workflows/go.yml

@@ -9,7 +9,7 @@ jobs:
       - name: Set up Go 1.x
         uses: actions/setup-go@v2
         with:
-          go-version: ^1.15
+          go-version: ^1.18
         id: go
 
       - name: Check out code into the Go module directory

.golangci.yml

@@ -56,6 +56,13 @@ issues:
     - text: "SA1019:"
       linters:
         - staticcheck
+    - path: test/
+      linters:
+        - deadcode
+        - unused
+        - ineffassign
+        - prealloc
+        - staticcheck
 # Not a real issue here, so ignore
     - path: x/clp/keeper/pureCalculation_test.go
       text: "G113:"

x/clp/keeper/msg_server.go

@@ -785,9 +785,8 @@ func (k msgServer) RemoveLiquidityUnits(goCtx context.Context, msg *types.MsgRem
 					Asymmetry:     sdk.ZeroInt(),
 				}, extRowanValue.Add(withdrawNativeAssetAmount))
 				return nil, types.ErrQueued
-			} else {
-				return nil, types.ErrRemovalsBlockedByHealth
 			}
+			return nil, types.ErrRemovalsBlockedByHealth
 		}
 	}
 
@@ -891,9 +890,8 @@ func (k msgServer) RemoveLiquidity(goCtx context.Context, msg *types.MsgRemoveLi
 			if k.IsRemovalQueueEnabled(ctx) {
 				k.QueueRemoval(ctx, msg, extRowanValue.Add(withdrawExternalAssetAmount))
 				return nil, types.ErrQueued
-			} else {
-				return nil, types.ErrRemovalsBlockedByHealth
 			}
+			return nil, types.ErrRemovalsBlockedByHealth
 		}
 	}
 

x/margin/client/rest/tx.go

@@ -41,7 +41,7 @@ type (
 	CloseReq struct {
 		BaseReq rest.BaseReq `json:"base_req"`
 		Signer  string       `json:"signer"` // User who is trying to close margin position
-		// nolint:golint
+		// nolint:revive
 		Id uint64 `json:"id"` // Id of the mtp
 
 	}
@@ -50,7 +50,7 @@ type (
 		BaseReq    rest.BaseReq `json:"base_req"`
 		Signer     string       `json:"signer"`      // User who is trying to close margin position
 		MtpAddress string       `json:"mtp_address"` // MtpAddress for position to force close
-		// nolint:golint
+		// nolint:revive
 		Id uint64 `json:"id"` // Id of the mtp
 
 	}

x/margin/keeper/admin_msg_server_test.go

@@ -179,7 +179,7 @@ func TestMsgServer_AdminCloseAll(t *testing.T) {
 				return genesisState
 			})
 			i, _ := sdk.NewIntFromString("10000000000000000000000")
-			app.BankKeeper.MintCoins(ctx, clptypes.ModuleName, sdk.NewCoins(sdk.NewCoin("rowan", i)))
+			_ = app.BankKeeper.MintCoins(ctx, clptypes.ModuleName, sdk.NewCoins(sdk.NewCoin("rowan", i)))
 			marginKeeper := app.MarginKeeper
 			msgServer := keeper.NewMsgServerImpl(marginKeeper)
 

x/margin/keeper/keeper.go

@@ -358,7 +358,7 @@ func (k Keeper) TakeOutCustody(ctx sdk.Context, mtp types.MTP, pool *clptypes.Po
 }
 
 func (k Keeper) Repay(ctx sdk.Context, mtp *types.MTP, pool *clptypes.Pool, repayAmount sdk.Uint, takeInsurance bool) error {
-	// nolint:ineffassign
+	// nolint:staticcheck,ineffassign
 	returnAmount, debtP, debtI := sdk.ZeroUint(), sdk.ZeroUint(), sdk.ZeroUint()
 	Liabilities := mtp.Liabilities
 	InterestUnpaidCollateral := mtp.InterestUnpaidCollateral

x/margin/keeper/msg_server_test.go

@@ -400,7 +400,7 @@ func TestKeeper_Close(t *testing.T) {
 				require.NoError(t, err)
 
 				nativeCoin = sdk.NewCoin(nativeAsset, sdk.Int(sdk.NewUint(10000)))
-				// nolint:ineffassign
+				// nolint:staticcheck,ineffassign
 				externalCoin = sdk.NewCoin(externalAsset.Symbol, sdk.Int(sdk.NewUint(10000)))
 
 				_signer := clptest.GenerateAddress(clptest.AddressKey1)

x/margin/types/params.go

@@ -17,6 +17,6 @@ func ParamKeyTable() paramtypes.KeyTable {
 	return paramtypes.NewKeyTable().RegisterParamSet(&Params{})
 }
 
-func validate(i interface{}) error {
+/* func validate(i interface{}) error {
 	return nil
-}
+} */