style: make lint-strict

classic-terra · Oct 21, 2023 · 57dca07 · 57dca07
1 parent 51d5557
commit 57dca07
Show file tree

Hide file tree

Showing 16 changed files with 102 additions and 93 deletions.
diff --git a/client/docs/statik/statik.go b/client/docs/statik/statik.go
diff --git a/custom/auth/post/post.go b/custom/auth/post/post.go
@@ -15,9 +15,7 @@ type HandlerOptions struct {
 // numbers, checks signatures & account numbers, and deducts fees from the first
 // signer.
 func NewPostHandler(options HandlerOptions) (sdk.AnteHandler, error) {
-
 	return sdk.ChainAnteDecorators(
 		dyncommpost.NewDyncommPostDecorator(options.DyncommKeeper),
 	), nil
-
 }
diff --git a/x/dyncomm/ante/ante.go b/x/dyncomm/ante/ante.go
@@ -35,17 +35,14 @@ func (dd DyncommDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate bool,
 
 	msgs := tx.GetMsgs()
 	err := dd.FilterMsgsAndProcessMsgs(ctx, msgs...)
-
 	if err != nil {
 		return ctx, err
 	}
 
 	return next(ctx, tx, simulate)
-
 }
 
 func (dd DyncommDecorator) FilterMsgsAndProcessMsgs(ctx sdk.Context, msgs ...sdk.Msg) (err error) {
-
 	for _, msg := range msgs {
 
 		switch msg.(type) {
@@ -61,11 +58,9 @@ func (dd DyncommDecorator) FilterMsgsAndProcessMsgs(ctx sdk.Context, msgs ...sdk
 
 	}
 	return nil
-
 }
 
 func (dd DyncommDecorator) ProcessEditValidator(ctx sdk.Context, msg sdk.Msg) (err error) {
-
 	msgEditValidator := msg.(*stakingtypes.MsgEditValidator)
 
 	// no update of CommissionRate provided
@@ -82,5 +77,4 @@ func (dd DyncommDecorator) ProcessEditValidator(ctx sdk.Context, msg sdk.Msg) (e
 	}
 
 	return nil
-
 }
diff --git a/x/dyncomm/ante/ante_test.go b/x/dyncomm/ante/ante_test.go
@@ -143,7 +143,6 @@ func (suite *AnteTestSuite) CreateTestTx(privs []cryptotypes.PrivKey, accNums []
 }
 
 func (suite *AnteTestSuite) CreateValidator(tokens int64) (cryptotypes.PrivKey, cryptotypes.PubKey, stakingtypes.Validator) {
-
 	priv, pub, addr := testdata.KeyTestPubAddr()
 	valAddr := sdk.ValAddress(addr)
 
@@ -184,15 +183,13 @@ func (suite *AnteTestSuite) CreateValidator(tokens int64) (cryptotypes.PrivKey,
 	retval, found := suite.app.StakingKeeper.GetValidator(suite.ctx, valAddr)
 	suite.Require().Equal(true, found)
 	return priv, pub, retval
-
 }
 
 func TestAnteTestSuite(t *testing.T) {
 	suite.Run(t, new(AnteTestSuite))
 }
 
 func (suite *AnteTestSuite) TestAnte_EnsureDynCommissionIsMinComm() {
-
 	suite.SetupTest(true) // setup
 	suite.txBuilder = suite.clientCtx.TxConfig.NewTxBuilder()
 	suite.ctx = suite.ctx.WithIsCheckTx(false)
@@ -234,5 +231,4 @@ func (suite *AnteTestSuite) TestAnte_EnsureDynCommissionIsMinComm() {
 	suite.Require().NoError(err)
 	_, err = antehandler(suite.ctx, tx, false)
 	suite.Require().NoError(err)
-
 }
diff --git a/x/dyncomm/genesis.go b/x/dyncomm/genesis.go
@@ -13,7 +13,7 @@ import (
 func InitGenesis(ctx sdk.Context, keeper keeper.Keeper, data *types.GenesisState) {
 	keeper.SetParams(ctx, data.Params)
 
-	//iterate validators and set target rates
+	// iterate validators and set target rates
 	keeper.StakingKeeper.IterateValidators(ctx, func(index int64, validator stakingtypes.ValidatorI) (stop bool) {
 		val := validator.(stakingtypes.Validator)
 		keeper.SetTargetCommissionRate(ctx, val.OperatorAddress, val.Commission.Rate)
@@ -24,7 +24,6 @@ func InitGenesis(ctx sdk.Context, keeper keeper.Keeper, data *types.GenesisState
 	if err != nil {
 		panic("could not initialize genesis")
 	}
-
 }
 
 // ExportGenesis writes the current store values
@@ -34,7 +33,7 @@ func ExportGenesis(ctx sdk.Context, keeper keeper.Keeper) (data *types.GenesisSt
 	params := keeper.GetParams(ctx)
 	var rates []types.ValidatorCommissionRate
 
-	//rates = append(rates)
+	// rates = append(rates)
 	keeper.IterateDynCommissionRates(ctx, func(rate types.ValidatorCommissionRate) (stop bool) {
 		rates = append(rates, rate)
 		return false

diff --git a/x/dyncomm/keeper/dyncomm.go b/x/dyncomm/keeper/dyncomm.go
@@ -8,20 +8,17 @@ import (
 
 // GetVotingPower calculates the voting power of a validator in percent
 func (k Keeper) CalculateVotingPower(ctx sdk.Context, validator stakingtypes.Validator) (ret sdk.Dec) {
-
 	totalPower := k.StakingKeeper.GetLastTotalPower(ctx).Int64()
 	validatorPower := sdk.TokensToConsensusPower(
 		validator.Tokens,
 		k.StakingKeeper.PowerReduction(ctx),
 	)
 	return sdk.NewDec(validatorPower).QuoInt64(totalPower).MulInt64(100)
-
 }
 
 // CalculateDynCommission calculates the min commission according
 // to StrathColes formula
 func (k Keeper) CalculateDynCommission(ctx sdk.Context, validator stakingtypes.Validator) (ret sdk.Dec) {
-
 	// The original parameters as defined
 	// by Strath
 	A := k.GetMaxZero(ctx)
@@ -42,11 +39,9 @@ func (k Keeper) CalculateDynCommission(ctx sdk.Context, validator stakingtypes.V
 		y = minComm
 	}
 	return y.QuoInt64(100)
-
 }
 
 func (k Keeper) SetDynCommissionRate(ctx sdk.Context, validator string, rate sdk.Dec) {
-
 	var preSetRate types.ValidatorCommissionRate
 	store := ctx.KVStore(k.storeKey)
 	bz := store.Get(types.GetMinCommissionRatesKey(validator))
@@ -67,7 +62,6 @@ func (k Keeper) SetDynCommissionRate(ctx sdk.Context, validator string, rate sdk
 }
 
 func (k Keeper) SetTargetCommissionRate(ctx sdk.Context, validator string, rate sdk.Dec) {
-
 	var preSetRate types.ValidatorCommissionRate
 	store := ctx.KVStore(k.storeKey)
 	bz := store.Get(types.GetMinCommissionRatesKey(validator))
@@ -130,7 +124,6 @@ func (k Keeper) IterateDynCommissionRates(ctx sdk.Context, cb func(types.Validat
 }
 
 func (k Keeper) UpdateValidatorMinRates(ctx sdk.Context, validator stakingtypes.Validator) {
-
 	var newRate sdk.Dec
 	minRate := k.CalculateDynCommission(ctx, validator)
 	newMaxRate := validator.Commission.MaxRate
@@ -163,14 +156,11 @@ func (k Keeper) UpdateValidatorMinRates(ctx sdk.Context, validator stakingtypes.
 	// Debug
 	targetRate = k.GetTargetCommissionRate(ctx, validator.OperatorAddress)
 	ctx.Logger().Info("dyncomm:", "val", validator.OperatorAddress, "min_rate", minRate, "target_rate", targetRate)
-
 }
 
 func (k Keeper) UpdateAllBondedValidatorRates(ctx sdk.Context) (err error) {
-
 	var lastErr error = nil
 	k.StakingKeeper.IterateValidators(ctx, func(index int64, validator stakingtypes.ValidatorI) (stop bool) {
-
 		val := validator.(stakingtypes.Validator)
 
 		if !val.IsBonded() {
@@ -180,9 +170,7 @@ func (k Keeper) UpdateAllBondedValidatorRates(ctx sdk.Context) (err error) {
 		k.UpdateValidatorMinRates(ctx, val)
 
 		return false
-
 	})
 
 	return lastErr
-
 }
diff --git a/x/dyncomm/keeper/dyncomm_test.go b/x/dyncomm/keeper/dyncomm_test.go
@@ -11,7 +11,6 @@ import (
 )
 
 func TestCalculateVotingPower(t *testing.T) {
-
 	input := CreateTestInput(t)
 	helper := teststaking.NewHelper(
 		t, input.Ctx, input.StakingKeeper,
@@ -27,11 +26,9 @@ func TestCalculateVotingPower(t *testing.T) {
 		sdk.NewDecWithPrec(90, 0),
 		input.DyncommKeeper.CalculateVotingPower(input.Ctx, vals[0]),
 	)
-
 }
 
 func TestCalculateDynCommission(t *testing.T) {
-
 	input := CreateTestInput(t)
 	helper := teststaking.NewHelper(
 		t, input.Ctx, input.StakingKeeper,
@@ -63,5 +60,4 @@ func TestCalculateDynCommission(t *testing.T) {
 		sdk.ZeroDec(),
 		input.DyncommKeeper.CalculateDynCommission(input.Ctx, vals[2]),
 	)
-
 }
diff --git a/x/dyncomm/keeper/keeper.go b/x/dyncomm/keeper/keeper.go
@@ -28,7 +28,6 @@ func NewKeeper(
 	paramstore paramstypes.Subspace,
 	stakingKeeper types.StakingKeeper,
 ) Keeper {
-
 	// set KeyTable if it has not already been set
 	if !paramstore.HasKeyTable() {
 		paramstore = paramstore.WithKeyTable(types.ParamKeyTable())

diff --git a/x/dyncomm/keeper/test_utils.go b/x/dyncomm/keeper/test_utils.go
@@ -194,7 +194,7 @@ func CreateTestInput(t *testing.T) TestInput {
 	accountKeeper.SetModuleAccount(ctx, notBondedPool)
 	accountKeeper.SetModuleAccount(ctx, distrAcc)
 
-	for idx, _ := range PubKeys {
+	for idx := range PubKeys {
 		accountKeeper.SetAccount(ctx, authtypes.NewBaseAccountWithAddress(AddrFrom(idx)))
 		err := bankKeeper.SendCoinsFromModuleToAccount(ctx, faucetAccountName, AddrFrom(idx), InitCoins)
 		require.NoError(t, err)

diff --git a/x/dyncomm/post/post.go b/x/dyncomm/post/post.go
@@ -19,7 +19,6 @@ func NewDyncommPostDecorator(dk dyncommkeeper.Keeper) DyncommDecorator {
 }
 
 func (dd DyncommDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate bool, next sdk.AnteHandler) (sdk.Context, error) {
-
 	if simulate {
 		return next(ctx, tx, simulate)
 	}
@@ -32,13 +31,10 @@ func (dd DyncommDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate bool,
 	dd.FilterMsgsAndProcessMsgs(ctx, msgs...)
 
 	return next(ctx, tx, simulate)
-
 }
 
 func (dd DyncommDecorator) FilterMsgsAndProcessMsgs(ctx sdk.Context, msgs ...sdk.Msg) {
-
 	for _, msg := range msgs {
-
 		switch msg.(type) {
 		case *stakingtypes.MsgEditValidator:
 			dd.ProcessEditValidator(ctx, msg)
@@ -47,13 +43,10 @@ func (dd DyncommDecorator) FilterMsgsAndProcessMsgs(ctx sdk.Context, msgs ...sdk
 		default:
 			continue
 		}
-
 	}
-
 }
 
 func (dd DyncommDecorator) ProcessEditValidator(ctx sdk.Context, msg sdk.Msg) {
-
 	msgEditValidator := msg.(*stakingtypes.MsgEditValidator)
 
 	// no update of CommissionRate provided
@@ -65,15 +58,12 @@ func (dd DyncommDecorator) ProcessEditValidator(ctx sdk.Context, msg sdk.Msg) {
 	// calling runMsgs -> we can set state changes here!
 	newIntendedRate := msgEditValidator.CommissionRate
 	dd.dyncommKeeper.SetTargetCommissionRate(ctx, msgEditValidator.ValidatorAddress, *newIntendedRate)
-
 }
 
 func (dd DyncommDecorator) ProcessCreateValidator(ctx sdk.Context, msg sdk.Msg) {
-
 	// post handler runs after successfully
 	// calling runMsgs -> we can set state changes here!
 	msgEditValidator := msg.(*stakingtypes.MsgCreateValidator)
 	newIntendedRate := msgEditValidator.Commission.Rate
 	dd.dyncommKeeper.SetTargetCommissionRate(ctx, msgEditValidator.ValidatorAddress, newIntendedRate)
-
 }
diff --git a/x/dyncomm/types/dyncomm.pb.go b/x/dyncomm/types/dyncomm.pb.go