chore: running make format for consistency

n2p5 · n2p5 · commit ab6e84ac4d01 · 2025-08-06T12:10:55.000-06:00
diff --git a/app/sovereign/export.go b/app/sovereign/export.go
@@ -81,7 +81,6 @@ func (app *App) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs []str
 	// withdraw all validator commission
 	app.StakingKeeper.IterateValidators(ctx, func(_ int64, val stakingtypes.ValidatorI) (stop bool) {
 		valBz, err := app.StakingKeeper.ValidatorAddressCodec().StringToBytes(val.GetOperator())
-
 		if err != nil {
 			panic(err)
 		}
diff --git a/tests/e2e/actions.go b/tests/e2e/actions.go
@@ -334,7 +334,6 @@ func (tr Chain) submitConsumerAdditionProposal(
 		fmt.Println("submitConsumerAdditionProposal json:", jsonStr)
 	}
 	bz, err = cmd.CombinedOutput()
-
 	if err != nil {
 		log.Fatal(err, "\n", string(bz))
 	}
@@ -1010,7 +1009,6 @@ func (tr Chain) addChainToHermes(
 	action AddChainToRelayerAction,
 	verbose bool,
 ) {
-
 	bz, err := tr.target.ExecCommand("bash", "-c", "hermes", "version").CombinedOutput()
 	if err != nil {
 		log.Fatal(err, "\n error getting hermes version", string(bz))
@@ -1916,7 +1914,7 @@ func (tr Chain) registerRepresentative(
 				panic(fmt.Sprintf("failed writing ccv consumer file : %v", err))
 			}
 			defer file.Close()
-			err = os.WriteFile(file.Name(), []byte(fileContent), 0600)
+			err = os.WriteFile(file.Name(), []byte(fileContent), 0o600)
 			if err != nil {
 				log.Fatalf("Failed writing consumer genesis to file: %v", err)
 			}
diff --git a/tests/e2e/state.go b/tests/e2e/state.go
@@ -370,7 +370,6 @@ func (tr Commands) GetReward(chain ChainID, validator ValidatorID, blockHeight u
 	)
 
 	bz, err := cmd.CombinedOutput()
-
 	if err != nil {
 		log.Fatal("failed getting rewards: ", err, "\n", string(bz))
 	}
@@ -385,7 +384,7 @@ func (tr Commands) GetReward(chain ChainID, validator ValidatorID, blockHeight u
 
 // interchain-securityd query gov proposals
 func (tr Commands) GetProposal(chain ChainID, proposal uint) Proposal {
-	var noProposalRegex = regexp.MustCompile(`doesn't exist: key not found`)
+	noProposalRegex := regexp.MustCompile(`doesn't exist: key not found`)
 
 	binaryName := tr.chainConfigs[chain].BinaryName
 	bz, err := tr.target.ExecCommand(binaryName,
diff --git a/tests/e2e/state_rapid_test.go b/tests/e2e/state_rapid_test.go
@@ -117,7 +117,6 @@ func GetIBCTransferParamsGen() *rapid.Generator[IBCTransferParams] {
 			ReceiveEnabled: rapid.Bool().Draw(t, "ReceiveEnabled"),
 		}
 	})
-
 }
 
 func GetIBCTransferParamsProposalGen() *rapid.Generator[IBCTransferParamsProposal] {
diff --git a/tests/e2e/steps_compatibility.go b/tests/e2e/steps_compatibility.go
@@ -127,7 +127,7 @@ func compstepsStartConsumerChain(consumerName string, proposalIndex, chainIndex
 							Chain:         ChainID(consumerName),
 							SpawnTime:     0,
 							InitialHeight: clienttypes.Height{RevisionNumber: 0, RevisionHeight: 1},
-							Status:        strconv.Itoa(int(gov.ProposalStatus_PROPOSAL_STATUS_PASSED)), //TODO: CHECK if this is bug on SDK SIDE!!!: should be as before gov.ProposalStatus(gov.ProposalStatus_PROPOSAL_STATUS_PASSED).String(),
+							Status:        strconv.Itoa(int(gov.ProposalStatus_PROPOSAL_STATUS_PASSED)), // TODO: CHECK if this is bug on SDK SIDE!!!: should be as before gov.ProposalStatus(gov.ProposalStatus_PROPOSAL_STATUS_PASSED).String(),
 						},
 					},
 					ValBalances: &map[ValidatorID]uint{
diff --git a/tests/e2e/testlib/utils.go b/tests/e2e/testlib/utils.go
@@ -7,7 +7,7 @@ import (
 	"os/exec"
 )
 
-var verbose *bool //TODO: remove hack
+var verbose *bool // TODO: remove hack
 
 func ExecuteCommandWithVerbosity(cmd *exec.Cmd, cmdName string, verbose bool) {
 	if verbose {
diff --git a/tests/e2e/v4/state.go b/tests/e2e/v4/state.go
@@ -236,7 +236,7 @@ func (tr Commands) GetBalance(chain ChainID, validator ValidatorID) uint {
 
 // interchain-securityd query gov proposals
 func (tr Commands) GetProposal(chain ChainID, proposal uint) Proposal {
-	var noProposalRegex = regexp.MustCompile(`doesn't exist: key not found`)
+	noProposalRegex := regexp.MustCompile(`doesn't exist: key not found`)
 
 	binaryName := tr.ChainConfigs[chain].BinaryName
 	bz, err := tr.Target.ExecCommand(binaryName,
@@ -411,6 +411,7 @@ func (tr Commands) GetConsumerChains(chain ChainID) map[ChainID]bool {
 
 	return chains
 }
+
 func (tr Commands) GetConsumerAddress(consumerChain ChainID, validator ValidatorID) string {
 	binaryName := tr.ChainConfigs[ChainID("provi")].BinaryName
 	cmd := tr.Target.ExecCommand(binaryName,
diff --git a/tests/integration/democracy.go b/tests/integration/democracy.go
@@ -316,7 +316,6 @@ func (s *ConsumerDemocracyTestSuite) TestDemocracyMsgUpdateParams() {
 
 	// deposit is refunded
 	s.Assert().Equal(votersOldBalances, getAccountsBalances(s.consumerCtx(), bankKeeper, bondDenom, votingAccounts))
-
 }
 
 func submitProposalWithDepositAndVote(govKeeper govkeeper.Keeper, ctx sdk.Context, msgs []sdk.Msg,
diff --git a/tests/integration/distribution.go b/tests/integration/distribution.go
@@ -138,8 +138,7 @@ func (s *CCVTestSuite) TestRewardsDistribution() {
 	consuValsRewards := consumerValsOutstandingRewardsFunc(s.providerCtx())
 
 	// increase the block height so validators are eligible for consumer rewards (see `IsEligibleForConsumerRewards`)
-	numberOfBlocksToStartReceivingRewards :=
-		providerKeeper.GetNumberOfEpochsToStartReceivingRewards(s.providerCtx()) * providerKeeper.GetBlocksPerEpoch(s.providerCtx())
+	numberOfBlocksToStartReceivingRewards := providerKeeper.GetNumberOfEpochsToStartReceivingRewards(s.providerCtx()) * providerKeeper.GetBlocksPerEpoch(s.providerCtx())
 
 	for s.providerCtx().BlockHeight() <= numberOfBlocksToStartReceivingRewards {
 		s.providerChain.NextBlock()
diff --git a/x/ccv/consumer/types/codec.go b/x/ccv/consumer/types/codec.go
@@ -9,7 +9,6 @@ import (
 
 // RegisterInterfaces registers the consumer Tx message types to the interface registry
 func RegisterInterfaces(registry codectypes.InterfaceRegistry) {
-
 	registry.RegisterImplementations(
 		(*sdk.Msg)(nil),
 		&MsgUpdateParams{},
diff --git a/x/ccv/democracy/governance/module.go b/x/ccv/democracy/governance/module.go
@@ -74,7 +74,6 @@ func (am AppModule) EndBlock(c context.Context) error {
 		deleteForbiddenProposal(ctx, am, proposal)
 		return false, nil
 	})
-
 	if err != nil {
 		return err
 	}
diff --git a/x/ccv/provider/keeper/distribution.go b/x/ccv/provider/keeper/distribution.go
@@ -1,11 +1,11 @@
 package keeper
 
 import (
+	"context"
+
 	storetypes "cosmossdk.io/store/types"
 	channeltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types"
 
-	"context"
-
 	errorsmod "cosmossdk.io/errors"
 	"cosmossdk.io/math"
 	sdk "github.com/cosmos/cosmos-sdk/types"
diff --git a/x/ccv/provider/keeper/msg_server.go b/x/ccv/provider/keeper/msg_server.go
@@ -104,7 +104,8 @@ func (k msgServer) ConsumerAddition(goCtx context.Context, msg *types.MsgConsume
 // ConsumerRemoval defines an RPC handler method for MsgConsumerRemoval
 func (k msgServer) ConsumerRemoval(
 	goCtx context.Context,
-	msg *types.MsgConsumerRemoval) (*types.MsgConsumerRemovalResponse, error) {
+	msg *types.MsgConsumerRemoval,
+) (*types.MsgConsumerRemovalResponse, error) {
 	if k.GetAuthority() != msg.Authority {
 		return nil, errorsmod.Wrapf(types.ErrUnauthorized, "expected %s, got %s", k.GetAuthority(), msg.Authority)
 	}
diff --git a/x/ccv/provider/types/msg.go b/x/ccv/provider/types/msg.go
@@ -297,7 +297,6 @@ func (msg *MsgConsumerAddition) ValidateBasic() error {
 }
 
 func (msg *MsgConsumerRemoval) ValidateBasic() error {
-
 	if strings.TrimSpace(msg.ChainId) == "" {
 		return errorsmod.Wrap(ErrInvalidConsumerRemovalProp, "consumer chain id must not be blank")
 	}
diff --git a/x/ccv/provider/types/msg_test.go b/x/ccv/provider/types/msg_test.go
@@ -70,7 +70,6 @@ func TestMsgAssignConsumerKeyValidateBasic(t *testing.T) {
 
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
-
 			msg := types.MsgAssignConsumerKey{
 				ChainId:      tc.chainId,
 				ConsumerKey:  tc.consumerKey,
diff --git a/x/ccv/types/utils.go b/x/ccv/types/utils.go
@@ -139,7 +139,6 @@ func GetLastBondedValidatorsUtil(ctx sdk.Context, stakingKeeper StakingKeeper, l
 		i++
 		return i >= int(maxVals) // stop iteration if true
 	})
-
 	if err != nil {
 		return nil, err
 	}

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,6 @@ func (app *App) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs []str`
`81`	`81`	`// withdraw all validator commission`
`82`	`82`	`app.StakingKeeper.IterateValidators(ctx, func(_ int64, val stakingtypes.ValidatorI) (stop bool) {`
`83`	`83`	`valBz, err := app.StakingKeeper.ValidatorAddressCodec().StringToBytes(val.GetOperator())`
`84`		`-`
`85`	`84`	`if err != nil {`
`86`	`85`	`panic(err)`
`87`	`86`	`}`
Original file line number	Diff line number	Diff line change
`@@ -334,7 +334,6 @@ func (tr Chain) submitConsumerAdditionProposal(`
`334`	`334`	`fmt.Println("submitConsumerAdditionProposal json:", jsonStr)`
`335`	`335`	`}`
`336`	`336`	`bz, err = cmd.CombinedOutput()`
`337`		`-`
`338`	`337`	`if err != nil {`
`339`	`338`	`log.Fatal(err, "\n", string(bz))`
`340`	`339`	`}`
`@@ -1010,7 +1009,6 @@ func (tr Chain) addChainToHermes(`
`1010`	`1009`	`action AddChainToRelayerAction,`
`1011`	`1010`	`verbose bool,`
`1012`	`1011`	`) {`
`1013`		`-`
`1014`	`1012`	`bz, err := tr.target.ExecCommand("bash", "-c", "hermes", "version").CombinedOutput()`
`1015`	`1013`	`if err != nil {`
`1016`	`1014`	`log.Fatal(err, "\n error getting hermes version", string(bz))`
`@@ -1916,7 +1914,7 @@ func (tr Chain) registerRepresentative(`
`1916`	`1914`	`panic(fmt.Sprintf("failed writing ccv consumer file : %v", err))`
`1917`	`1915`	`}`
`1918`	`1916`	`defer file.Close()`
`1919`		`- err = os.WriteFile(file.Name(), []byte(fileContent), 0600)`
	`1917`	`+ err = os.WriteFile(file.Name(), []byte(fileContent), 0o600)`
`1920`	`1918`	`if err != nil {`
`1921`	`1919`	`log.Fatalf("Failed writing consumer genesis to file: %v", err)`
`1922`	`1920`	`}`
Original file line number	Diff line number	Diff line change
`@@ -370,7 +370,6 @@ func (tr Commands) GetReward(chain ChainID, validator ValidatorID, blockHeight u`
`370`	`370`	`)`
`371`	`371`
`372`	`372`	`bz, err := cmd.CombinedOutput()`
`373`		`-`
`374`	`373`	`if err != nil {`
`375`	`374`	`log.Fatal("failed getting rewards: ", err, "\n", string(bz))`
`376`	`375`	`}`
`@@ -385,7 +384,7 @@ func (tr Commands) GetReward(chain ChainID, validator ValidatorID, blockHeight u`
`385`	`384`
`386`	`385`	`// interchain-securityd query gov proposals`
`387`	`386`	`func (tr Commands) GetProposal(chain ChainID, proposal uint) Proposal {`
`388`		- var noProposalRegex = regexp.MustCompile(`doesn't exist: key not found`)
	`387`	+ noProposalRegex := regexp.MustCompile(`doesn't exist: key not found`)
`389`	`388`
`390`	`389`	`binaryName := tr.chainConfigs[chain].BinaryName`
`391`	`390`	`bz, err := tr.target.ExecCommand(binaryName,`
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,6 @@ func GetIBCTransferParamsGen() *rapid.Generator[IBCTransferParams] {`
`117`	`117`	`ReceiveEnabled: rapid.Bool().Draw(t, "ReceiveEnabled"),`
`118`	`118`	`}`
`119`	`119`	`})`
`120`		`-`
`121`	`120`	`}`
`122`	`121`
`123`	`122`	`func GetIBCTransferParamsProposalGen() *rapid.Generator[IBCTransferParamsProposal] {`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import (`
`7`	`7`	`"os/exec"`
`8`	`8`	`)`
`9`	`9`
`10`		`-var verbose *bool //TODO: remove hack`
	`10`	`+var verbose *bool // TODO: remove hack`
`11`	`11`
`12`	`12`	`func ExecuteCommandWithVerbosity(cmd *exec.Cmd, cmdName string, verbose bool) {`
`13`	`13`	`if verbose {`
Original file line number	Diff line number	Diff line change
`@@ -316,7 +316,6 @@ func (s *ConsumerDemocracyTestSuite) TestDemocracyMsgUpdateParams() {`
`316`	`316`
`317`	`317`	`// deposit is refunded`
`318`	`318`	`s.Assert().Equal(votersOldBalances, getAccountsBalances(s.consumerCtx(), bankKeeper, bondDenom, votingAccounts))`
`319`		`-`
`320`	`319`	`}`
`321`	`320`
`322`	`321`	`func submitProposalWithDepositAndVote(govKeeper govkeeper.Keeper, ctx sdk.Context, msgs []sdk.Msg,`