Merge pull request #229 from notional-labs/ducnt/update-ictest

Update upgrade chain Test to v5

.golangci.yml

@@ -21,7 +21,6 @@ linters:
     - nakedret
     - nolintlint
     - staticcheck
-    - revive
     - stylecheck
     - thelper
     - typecheck

app/app.go

@@ -708,6 +708,7 @@ func (app *CentauriApp) setupUpgradeStoreLoaders() {
 	}
 
 	for _, upgrade := range Upgrades {
+		upgrade := upgrade
 		if upgradeInfo.Name == upgrade.UpgradeName {
 			app.SetStoreLoader(upgradetypes.UpgradeStoreLoader(upgradeInfo.Height, &upgrade.StoreUpgrades))
 		}

app/upgrades/v5/upgrade.go

@@ -21,7 +21,7 @@ const (
 func CreateUpgradeHandler(
 	mm *module.Manager,
 	configurator module.Configurator,
-	bpm upgrades.BaseAppParamManager,
+	_ upgrades.BaseAppParamManager,
 	keepers *keepers.AppKeepers,
 ) upgradetypes.UpgradeHandler {
 	return func(ctx sdk.Context, plan upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
@@ -31,9 +31,6 @@ func CreateUpgradeHandler(
 		uatomRateLimit, found := rlKeeper.GetRateLimit(ctx, uatom, "channel-2")
 		if !found {
 			channelValue := rlKeeper.GetChannelValue(ctx, uatom)
-			if channelValue.IsZero() {
-				panic("Zero ATOM channel value")
-			}
 			// Create and store the rate limit object
 			path := types.Path{
 				Denom:     uatom,
@@ -64,9 +61,6 @@ func CreateUpgradeHandler(
 		dotRateLimit, found := rlKeeper.GetRateLimit(ctx, dot, "channel-2")
 		if !found {
 			channelValue := rlKeeper.GetChannelValue(ctx, dot)
-			if channelValue.IsZero() {
-				panic("Zero DOT channel value")
-			}
 			// Create and store the rate limit object
 			path := types.Path{
 				Denom:     dot,
@@ -97,9 +91,6 @@ func CreateUpgradeHandler(
 		ksmRateLimit, found := rlKeeper.GetRateLimit(ctx, ksm, "channel-2")
 		if !found {
 			channelValue := rlKeeper.GetChannelValue(ctx, ksm)
-			if channelValue.IsZero() {
-				panic("Zero KSM channel value")
-			}
 			// Create and store the rate limit object
 			path := types.Path{
 				Denom:     ksm,
@@ -130,9 +121,6 @@ func CreateUpgradeHandler(
 		usdtRateLimit, found := rlKeeper.GetRateLimit(ctx, usdt, "channel-2")
 		if !found {
 			channelValue := rlKeeper.GetChannelValue(ctx, usdt)
-			if channelValue.IsZero() {
-				panic("Zero USDT channel value")
-			}
 			// Create and store the rate limit object
 			path := types.Path{
 				Denom:     usdt,

custom/bank/bank_test.go

@@ -6,7 +6,6 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types"
-	transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types"
 	clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types"
 	"github.com/stretchr/testify/suite"
 
@@ -59,7 +58,7 @@ func (suite *CustomBankTestSuite) TestTotalSupply() {
 	var (
 		expChainBBalanceDiff sdk.Coin
 		path                 = NewTransferPath(suite.chainA, suite.chainB)
-		escrowAddr           = transfertypes.GetEscrowAddress(transfertypes.PortID, "channel-0")
+		escrowAddr           = ibctransfertypes.GetEscrowAddress(ibctransfertypes.PortID, "channel-0")
 	)
 
 	testCases := []struct {

tests/interchaintest/upgrade_chain_test.go

@@ -20,7 +20,7 @@ const (
 
 func TestCentauriUpgrade(t *testing.T) {
 	repo, version := GetDockerImageInfo()
-	CosmosChainUpgradeTest(t, repo, version, "v4")
+	CosmosChainUpgradeTest(t, repo, version, "v5")
 }
 
 func CosmosChainUpgradeTest(t *testing.T, upgradeContainerRepo, upgradeVersion, upgradeName string) {
@@ -39,7 +39,7 @@ func CosmosChainUpgradeTest(t *testing.T, upgradeContainerRepo, upgradeVersion,
 				Images: []ibc.DockerImage{
 					{
 						Repository: "ghcr.io/notional-labs/centauri",
-						Version:    "3.2.3",
+						Version:    "4.5.1",
 						UidGid:     "1025:1025",
 					},
 				},

x/mint/simulation/genesis_test.go

@@ -79,6 +79,7 @@ func TestRandomizedGenState1(t *testing.T) {
 	}
 
 	for _, tt := range tests {
+		tt := tt
 		require.Panicsf(t, func() { simulation.RandomizedGenState(&tt.simState) }, tt.panicMsg)
 	}
 }

x/ratelimit/keeper/rate_limit.go

@@ -42,7 +42,7 @@ func EmitTransferDeniedEvent(ctx sdk.Context, reason, denom, channelID string, d
 }
 
 // Adds an amount to the flow in either the SEND or RECV direction
-func (k Keeper) UpdateFlow(ctx sdk.Context, rateLimit types.RateLimit, direction types.PacketDirection, amount math.Int) error {
+func (k Keeper) UpdateFlow(_ sdk.Context, rateLimit types.RateLimit, direction types.PacketDirection, amount math.Int) error {
 	switch direction {
 	case types.PACKET_SEND:
 		return rateLimit.Flow.AddOutflow(amount, *rateLimit.Quota, rateLimit.MinRateLimitAmount)

x/ratelimit/types/quota.go

@@ -5,7 +5,7 @@ import (
 )
 
 // CheckExceedsQuota checks if new in/out flow is going to reach the max in/out or not
-func (q *Quota) CheckExceedsQuota(direction PacketDirection, amount math.Int, totalValue math.Int, minRateLimitAmount math.Int) bool {
+func (q *Quota) CheckExceedsQuota(direction PacketDirection, amount, totalValue, minRateLimitAmount math.Int) bool {
 	// If there's no channel value (this should be almost impossible), it means there is no
 	// supply of the asset, so we shoudn't prevent inflows/outflows
 	if totalValue.IsZero() {

x/tx-boundary/ante/antetest/ante_test.go

@@ -117,5 +117,4 @@ func (s *AnteTestSuite) TestStakingAnte() {
 			s.Require().Error(err)
 		}
 	}
-
 }

x/tx-boundary/ante/antetest/ante_test_setup.go

@@ -41,7 +41,7 @@ type AnteTestSuite struct {
 func (suite *AnteTestSuite) SetupTest() {
 	suite.app, suite.delegator, suite.validators = helpers.SetupCentauriAppWithValSetWithGenAccout(suite.T())
 	suite.ctx = suite.app.BaseApp.NewContext(false, tmproto.Header{Height: 1, ChainID: "centauri-1", Time: time.Now().UTC()})
-	app.FundAccount(suite.app.BankKeeper, suite.ctx, sdk.AccAddress(suite.delegator), BaseBalance)
+	app.FundAccount(suite.app.BankKeeper, suite.ctx, suite.delegator, BaseBalance)
 
 	encodingConfig := app.MakeEncodingConfig()
 	encodingConfig.Amino.RegisterConcrete(&testdata.TestMsg{}, "testdata.TestMsg", nil)
@@ -78,7 +78,7 @@ func (suite *AnteTestSuite) SetupTest() {
 	suite.clientCtx = client.Context{}.WithTxConfig(encodingConfig.TxConfig)
 }
 
-func (s *AnteTestSuite) CreateTestTx(privs []cryptotypes.PrivKey, accNums []uint64, accSeqs []uint64, chainID string) (xauthsigning.Tx, error) {
+func (s *AnteTestSuite) CreateTestTx(privs []cryptotypes.PrivKey, accNums, accSeqs []uint64, chainID string) (xauthsigning.Tx, error) {
 	var sigsV2 []signing.SignatureV2
 	for i, priv := range privs {
 		sigV2 := signing.SignatureV2{

x/tx-boundary/client/cli/tx.go

@@ -29,28 +29,28 @@ func GetTxCmd() *cobra.Command {
 
 func GetCmdUpdateDelegateBoundary() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:  "update-delegate [tx_limit] [block_per_generation]",
+		Use:  "update-delegate [txLimit] [blockPerGeneration]",
 		Args: cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			clientCtx, err := client.GetClientTxContext(cmd)
 			if err != nil {
 				return err
 			}
 
-			tx_limit, err := strconv.ParseUint(args[0], 10, 64)
+			txLimit, err := strconv.ParseUint(args[0], 10, 64)
 			if err != nil {
 				return err
 			}
 
-			block_per_generation, err := strconv.ParseUint(args[1], 10, 64)
+			blockPerGeneration, err := strconv.ParseUint(args[1], 10, 64)
 			if err != nil {
 				return err
 			}
 
 			msg := types.NewMsgUpdateDelegateBoundary(
 				types.Boundary{
-					TxLimit:             tx_limit,
-					BlocksPerGeneration: block_per_generation,
+					TxLimit:             txLimit,
+					BlocksPerGeneration: blockPerGeneration,
 				},
 				clientCtx.GetFromAddress().String(),
 			)
@@ -64,28 +64,28 @@ func GetCmdUpdateDelegateBoundary() *cobra.Command {
 
 func GetCmdUpdateRedelegateBoundary() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:  "update-redelegate [tx_limit] [block_per_generation]",
+		Use:  "update-redelegate [txLimit] [blockPerGeneration]",
 		Args: cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			clientCtx, err := client.GetClientTxContext(cmd)
 			if err != nil {
 				return err
 			}
 
-			tx_limit, err := strconv.ParseUint(args[0], 10, 64)
+			txLimit, err := strconv.ParseUint(args[0], 10, 64)
 			if err != nil {
 				return err
 			}
 
-			block_per_generation, err := strconv.ParseUint(args[1], 10, 64)
+			blockPerGeneration, err := strconv.ParseUint(args[1], 10, 64)
 			if err != nil {
 				return err
 			}
 
 			msg := types.NewMsgUpdateRedelegateBoundary(
 				types.Boundary{
-					TxLimit:             tx_limit,
-					BlocksPerGeneration: block_per_generation,
+					TxLimit:             txLimit,
+					BlocksPerGeneration: blockPerGeneration,
 				},
 				clientCtx.GetFromAddress().String(),
 			)

x/tx-boundary/keeper/grpc_query.go

@@ -10,7 +10,7 @@ import (
 var _ types.QueryServer = Keeper{}
 
 // DelegateBoundary returns delegate boundary of the tx-boundary module.
-func (k Keeper) DelegateBoundary(c context.Context, req *types.QueryDelegateBoundaryRequest) (*types.QueryDelegateBoundaryResponse, error) {
+func (k Keeper) DelegateBoundary(c context.Context, _ *types.QueryDelegateBoundaryRequest) (*types.QueryDelegateBoundaryResponse, error) {
 	ctx := sdk.UnwrapSDKContext(c)
 	boundary := k.GetDelegateBoundary(ctx)
 

x/tx-boundary/keeper/keeper.go

@@ -88,15 +88,15 @@ func (k Keeper) GetRedelegateBoundary(ctx sdk.Context) (boundary types.Boundary)
 }
 
 // SetDelegateCount set the number of delegate tx for a given address
-func (k Keeper) SetLimitPerAddr(ctx sdk.Context, addr sdk.AccAddress, limit_per_addr types.LimitPerAddr) {
+func (k Keeper) SetLimitPerAddr(ctx sdk.Context, addr sdk.AccAddress, limitPerAddr types.LimitPerAddr) {
 	store := ctx.KVStore(k.storeKey)
-	bz := k.cdc.MustMarshal(&limit_per_addr)
+	bz := k.cdc.MustMarshal(&limitPerAddr)
 	store.Set(addr, bz)
 }
 
 func (k Keeper) IncrementDelegateCount(ctx sdk.Context, addr sdk.AccAddress) {
 	store := ctx.KVStore(k.storeKey)
-	if store.Has(addr) == false {
+	if !store.Has(addr) {
 		k.SetLimitPerAddr(ctx, addr, types.LimitPerAddr{
 			DelegateCount:     1,
 			ReledegateCount:   0,
@@ -105,16 +105,15 @@ func (k Keeper) IncrementDelegateCount(ctx sdk.Context, addr sdk.AccAddress) {
 		return
 	}
 	bz := store.Get(addr)
-	var limit_per_addr types.LimitPerAddr
-	k.cdc.MustUnmarshal(bz, &limit_per_addr)
-	limit_per_addr.DelegateCount += 1
-	k.SetLimitPerAddr(ctx, addr, limit_per_addr)
-	return
+	var limitPerAddr types.LimitPerAddr
+	k.cdc.MustUnmarshal(bz, &limitPerAddr)
+	limitPerAddr.DelegateCount++
+	k.SetLimitPerAddr(ctx, addr, limitPerAddr)
 }
 
 func (k Keeper) IncrementRedelegateCount(ctx sdk.Context, addr sdk.AccAddress) {
 	store := ctx.KVStore(k.storeKey)
-	if store.Has(addr) == false {
+	if !store.Has(addr) {
 		k.SetLimitPerAddr(ctx, addr, types.LimitPerAddr{
 			DelegateCount:     0,
 			ReledegateCount:   1,
@@ -123,59 +122,57 @@ func (k Keeper) IncrementRedelegateCount(ctx sdk.Context, addr sdk.AccAddress) {
 		return
 	}
 	bz := store.Get(addr)
-	var limit_per_addr types.LimitPerAddr
-	k.cdc.MustUnmarshal(bz, &limit_per_addr)
-	limit_per_addr.ReledegateCount += 1
-	k.SetLimitPerAddr(ctx, addr, limit_per_addr)
-	return
+	var limitPerAddr types.LimitPerAddr
+	k.cdc.MustUnmarshal(bz, &limitPerAddr)
+	limitPerAddr.ReledegateCount++
+	k.SetLimitPerAddr(ctx, addr, limitPerAddr)
 }
 
 // GetDelegateCount get the number of delegate tx for a given address
-func (k Keeper) GetLimitPerAddr(ctx sdk.Context, addr sdk.AccAddress) (limit_per_addr types.LimitPerAddr) {
+func (k Keeper) GetLimitPerAddr(ctx sdk.Context, addr sdk.AccAddress) (limitPerAddr types.LimitPerAddr) {
 	store := ctx.KVStore(k.storeKey)
-	if store.Has(addr) == false {
+	if !store.Has(addr) {
 		return types.LimitPerAddr{
 			DelegateCount:     0,
 			ReledegateCount:   0,
 			LatestUpdateBlock: 0,
 		}
 	}
 	bz := store.Get(addr)
-	k.cdc.MustUnmarshal(bz, &limit_per_addr)
+	k.cdc.MustUnmarshal(bz, &limitPerAddr)
 	return
 }
 
 func (k Keeper) UpdateLimitPerAddr(ctx sdk.Context, addr sdk.AccAddress) {
-	limit_per_addr := k.GetLimitPerAddr(ctx, addr)
-	if limit_per_addr.LatestUpdateBlock == 0 {
+	limitPerAddr := k.GetLimitPerAddr(ctx, addr)
+	if limitPerAddr.LatestUpdateBlock == 0 {
 		return
 	}
 	boundary := k.GetDelegateBoundary(ctx)
-	if limit_per_addr.LatestUpdateBlock+int64(boundary.BlocksPerGeneration) >= ctx.BlockHeight() {
-		// Calculate the generated tx number from the duration between latest update block and curent block height
+	if limitPerAddr.LatestUpdateBlock+int64(boundary.BlocksPerGeneration) >= ctx.BlockHeight() {
+		// Calculate the generated tx number from the duration between latest update block and current block height
 		var generatedTx uint64
-		duration := uint64(limit_per_addr.LatestUpdateBlock) + boundary.BlocksPerGeneration - uint64(ctx.BlockHeight())
+		duration := uint64(limitPerAddr.LatestUpdateBlock) + boundary.BlocksPerGeneration - uint64(ctx.BlockHeight())
 		if duration/boundary.BlocksPerGeneration > 5 {
 			generatedTx = 5
 		} else {
 			generatedTx = duration / boundary.BlocksPerGeneration
 		}
 
 		// Update the delegate tx limit
-		if uint64(generatedTx) > limit_per_addr.DelegateCount {
-			limit_per_addr.DelegateCount = 0
+		if generatedTx > limitPerAddr.DelegateCount {
+			limitPerAddr.DelegateCount = 0
 		} else {
-			limit_per_addr.DelegateCount -= uint64(generatedTx)
+			limitPerAddr.DelegateCount -= generatedTx
 		}
 		// Update the redelegate tx limit
-		if uint64(generatedTx) > limit_per_addr.ReledegateCount {
-			limit_per_addr.ReledegateCount = 0
+		if generatedTx > limitPerAddr.ReledegateCount {
+			limitPerAddr.ReledegateCount = 0
 		} else {
-			limit_per_addr.ReledegateCount -= uint64(generatedTx)
+			limitPerAddr.ReledegateCount -= generatedTx
 		}
 		// Update LatestUpdateBlock
-		limit_per_addr.LatestUpdateBlock = ctx.BlockHeight()
+		limitPerAddr.LatestUpdateBlock = ctx.BlockHeight()
 		return
 	}
-	return
 }

x/tx-boundary/keeper/msg_server.go

@@ -1 +1 @@
-package keeper
+package keeper

x/tx-boundary/module.go

@@ -110,7 +110,7 @@ func (am AppModule) RegisterInvariants(_ sdk.InvariantRegistry) {}
 
 // RegisterServices registers a gRPC query service to respond to the
 // module-specific gRPC queries.
-func (am AppModule) RegisterServices(cfg module.Configurator) {
+func (am AppModule) RegisterServices(_ module.Configurator) {
 	// types.RegisterQueryServer(cfg.QueryServer(), am.keeper)
 	// types.RegisterMsgServer(cfg.MsgServer(), keeper.NewMsgServerImpl(am.keeper))
 }
@@ -136,7 +136,7 @@ func (am AppModule) ExportGenesis(ctx sdk.Context, cdc codec.JSONCodec) json.Raw
 func (AppModule) ConsensusVersion() uint64 { return 1 }
 
 // BeginBlock returns the begin blocker for the tx-boundary module.
-func (am AppModule) BeginBlock(ctx sdk.Context, _ abci.RequestBeginBlock) {}
+func (am AppModule) BeginBlock(_ sdk.Context, _ abci.RequestBeginBlock) {}
 
 // ProposalContents doesn't return any content functions for governance proposals.
 func (AppModule) ProposalContents(_ module.SimulationState) []simtypes.WeightedProposalMsg {

x/tx-boundary/types/codec.go

@@ -23,9 +23,9 @@ func init() {
 }
 
 // RegisterLegacyAminoCodec registers concrete types on the LegacyAmino codec
-func RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) {
+func RegisterLegacyAminoCodec(_ *codec.LegacyAmino) {
 }
 
 // RegisterInterfaces registers the interfaces types with the interface registry.
-func RegisterInterfaces(registry types.InterfaceRegistry) {
+func RegisterInterfaces(_ types.InterfaceRegistry) {
 }