From d699a7b806cf98507ffbc221822504697b3f02da Mon Sep 17 00:00:00 2001
From: Ruslan Akhtariev <rakhtariev@icloud.com>
Date: Wed, 22 May 2024 11:55:07 -0700
Subject: [PATCH 1/2] add gocyclo linter

---
 .golangci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.golangci.yml b/.golangci.yml
index 9b0ff0e34..da62ffbc6 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -29,6 +29,7 @@ linters:
     - unparam # Prefer unparam over revive's unused param. It is more thorough in its checking.
     - unused
     - misspell
+    - gocyclo
 
 issues:
   exclude-rules:

From 41a815eb9c745344c05dbef93d3cf9cb6c4573fc Mon Sep 17 00:00:00 2001
From: Ruslan Akhtariev <rakhtariev@icloud.com>
Date: Sun, 26 May 2024 17:07:50 -0700
Subject: [PATCH 2/2] nolints

---
 cmd/quicksilverd/genaccounts.go                   | 2 ++
 x/interchainstaking/keeper/callbacks_test.go      | 1 +
 x/interchainstaking/keeper/ibc_packet_handlers.go | 1 +
 x/interchainstaking/keeper/keeper.go              | 1 +
 x/interchainstaking/keeper/proposal_handler.go    | 1 +
 5 files changed, 6 insertions(+)

diff --git a/cmd/quicksilverd/genaccounts.go b/cmd/quicksilverd/genaccounts.go
index 3f897e274..8b7b4e7c5 100644
--- a/cmd/quicksilverd/genaccounts.go
+++ b/cmd/quicksilverd/genaccounts.go
@@ -28,6 +28,8 @@ const (
 )
 
 // AddGenesisAccountCmd returns add-genesis-account cobra Command.
+//
+//nolint:gocyclo
 func AddGenesisAccountCmd(defaultNodeHome string) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "add-genesis-account [address_or_key_name] [coin][,[coin]]",
diff --git a/x/interchainstaking/keeper/callbacks_test.go b/x/interchainstaking/keeper/callbacks_test.go
index 26c013b5a..92ae6fbca 100644
--- a/x/interchainstaking/keeper/callbacks_test.go
+++ b/x/interchainstaking/keeper/callbacks_test.go
@@ -85,6 +85,7 @@ func (suite *KeeperTestSuite) setupIbc() (*app.Quicksilver, sdk.Context) {
 	return quicksilver, ctx
 }
 
+//nolint:gocyclo
 func (suite *KeeperTestSuite) TestHandleValsetCallback() {
 	newVal := addressutils.GenerateValAddressForTest()
 
diff --git a/x/interchainstaking/keeper/ibc_packet_handlers.go b/x/interchainstaking/keeper/ibc_packet_handlers.go
index b57ee0b32..0a0907874 100644
--- a/x/interchainstaking/keeper/ibc_packet_handlers.go
+++ b/x/interchainstaking/keeper/ibc_packet_handlers.go
@@ -62,6 +62,7 @@ func DeserializeCosmosTxTyped(cdc codec.BinaryCodec, data []byte) ([]TypedMsg, e
 	return msgs, nil
 }
 
+//nolint:gocyclo
 func (k *Keeper) HandleAcknowledgement(ctx sdk.Context, packet channeltypes.Packet, acknowledgement []byte, connectionID string) error {
 	var (
 		ack        channeltypes.Acknowledgement
diff --git a/x/interchainstaking/keeper/keeper.go b/x/interchainstaking/keeper/keeper.go
index 49d664323..5786d30fe 100644
--- a/x/interchainstaking/keeper/keeper.go
+++ b/x/interchainstaking/keeper/keeper.go
@@ -324,6 +324,7 @@ func (k *Keeper) SetValidatorsForZone(ctx sdk.Context, data []byte, icqQuery icq
 	return nil
 }
 
+// nolint:gocyclo
 func (k *Keeper) SetValidatorForZone(ctx sdk.Context, zone *types.Zone, data []byte) error {
 	if data == nil {
 		k.Logger(ctx).Error("expected validator state, got nil")
diff --git a/x/interchainstaking/keeper/proposal_handler.go b/x/interchainstaking/keeper/proposal_handler.go
index 3af560170..8f0fc99b0 100644
--- a/x/interchainstaking/keeper/proposal_handler.go
+++ b/x/interchainstaking/keeper/proposal_handler.go
@@ -154,6 +154,7 @@ func (k *Keeper) registerInterchainAccount(ctx sdk.Context, connectionID, portOw
 }
 
 // HandleUpdateZoneProposal is a handler for executing a passed community spend proposal.
+// nolint:gocyclo
 func (k *Keeper) HandleUpdateZoneProposal(ctx sdk.Context, p *types.UpdateZoneProposal) error {
 	zone, found := k.GetZone(ctx, p.ChainId)
 	if !found {