Merge remote-tracking branch 'osmosis/v0.42.9-osmo-v3' into faddat/v0…

….42.x-modern-osmo
osmosis-labs · Jan 8, 2023 · aa5464a · aa5464a
2 parents 64a4338 + 21486da
commit aa5464a
Show file tree

Hide file tree

Showing 37 changed files with 63 additions and 55 deletions.
diff --git a/client/rest/rest.go b/client/rest/rest.go
@@ -25,6 +25,7 @@ func addHTTPDeprecationHeaders(h http.Handler) http.Handler {
 // WithHTTPDeprecationHeaders returns a new *mux.Router, identical to its input
 // but with the addition of HTTP Deprecation headers. This is used to mark legacy
 // amino REST endpoints as deprecated in the REST API.
+// nolint:gocritic
 func WithHTTPDeprecationHeaders(r *mux.Router) *mux.Router {
 	subRouter := r.NewRoute().Subrouter()
 	subRouter.Use(addHTTPDeprecationHeaders)

diff --git a/types/decimal.go b/types/decimal.go
@@ -80,7 +80,7 @@ func precisionMultiplier(prec int64) *big.Int {
 	return precisionMultipliers[prec]
 }
 
-// ______________________________________________________________________________________________
+// _____________________________________________________________________________________________
 
 // create a new Dec from integer assuming whole number
 func NewDec(i int64) Dec {
@@ -201,7 +201,9 @@ func MustNewDecFromStr(s string) Dec {
 	return dec
 }
 
-// ______________________________________________________________________________________________
+// _____________________________________________________________________________________________
+//nolint
+
 func (d Dec) IsNil() bool       { return d.i == nil }                 // is decimal nil
 func (d Dec) IsZero() bool      { return (d.i).Sign() == 0 }          // is equal to zero
 func (d Dec) IsNegative() bool  { return (d.i).Sign() == -1 }         // is negative
@@ -643,7 +645,7 @@ func (d Dec) RoundInt() Int {
 	return NewIntFromBigInt(chopPrecisionAndRoundNonMutative(d.i))
 }
 
-// ___________________________________________________________________________________
+// __________________________________________________________________________________
 
 // similar to chopPrecisionAndRound, but always rounds down
 func chopPrecisionAndTruncate(d *big.Int) *big.Int {
@@ -694,7 +696,7 @@ func (d Dec) Ceil() Dec {
 	return NewDecFromBigInt(quo.Add(quo, oneInt))
 }
 
-// ___________________________________________________________________________________
+// __________________________________________________________________________________
 
 // MaxSortableDec is the largest Dec that can be passed into SortableDecBytes()
 // Its negative form is the least Dec that can be passed in.
@@ -734,7 +736,7 @@ func SortableDecBytes(dec Dec) []byte {
 	return []byte(fmt.Sprintf(fmt.Sprintf("%%0%ds", Precision*2+1), dec.String()))
 }
 
-// ___________________________________________________________________________________
+// __________________________________________________________________________________
 
 // reuse nil values
 var nilJSON []byte
@@ -844,7 +846,7 @@ func (dp DecProto) String() string {
 	return dp.Dec.String()
 }
 
-// ___________________________________________________________________________________
+// __________________________________________________________________________________
 // helpers
 
 // test if two decimal arrays are equal

diff --git a/types/decimal_test.go b/types/decimal_test.go
@@ -29,7 +29,7 @@ func (s *decimalTestSuite) mustNewDecFromStr(str string) (d sdk.Dec) {
 	return d
 }
 
-// _______________________________________
+// ______________________________________
 
 func (s *decimalTestSuite) TestNewDecFromStr() {
 	largeBigInt, success := new(big.Int).SetString("3144605511029693144278234343371835", 10)

diff --git a/types/module/module.go b/types/module/module.go
@@ -42,7 +42,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
-// __________________________________________________________________________________________
+// _________________________________________________________________________________________
 
 // AppModuleBasic is the standard form for basic non-dependant elements of an application module.
 type AppModuleBasic interface {
@@ -145,7 +145,7 @@ func (bm BasicManager) AddQueryCommands(rootQueryCmd *cobra.Command) {
 	}
 }
 
-// _________________________________________________________
+// ________________________________________________________
 
 // AppModuleGenesis is the standard form for an application module genesis functions
 type AppModuleGenesis interface {
@@ -179,7 +179,7 @@ type AppModule interface {
 	EndBlock(sdk.Context, abci.RequestEndBlock) []abci.ValidatorUpdate
 }
 
-// ___________________________
+// __________________________
 
 // GenesisOnlyAppModule is an AppModule that only has import/export functionality
 type GenesisOnlyAppModule struct {
@@ -216,7 +216,7 @@ func (GenesisOnlyAppModule) EndBlock(_ sdk.Context, _ abci.RequestEndBlock) []ab
 	return []abci.ValidatorUpdate{}
 }
 
-// ____________________________________________________________________________
+// ___________________________________________________________________________
 
 // Manager defines a module manager that provides the high level utility for managing and executing
 // operations for a group of modules

diff --git a/types/simulation/types.go b/types/simulation/types.go
@@ -114,7 +114,7 @@ func (om OperationMsg) LogEvent(eventLogger func(route, op, evResult string)) {
 	eventLogger(om.Route, om.Name, pass)
 }
 
-// ________________________________________________________________________
+// _______________________________________________________________________
 
 // FutureOperation is an operation which will be ran at the beginning of the
 // provided BlockHeight. If both a BlockHeight and BlockTime are specified, it

diff --git a/types/uint.go b/types/uint.go
@@ -207,7 +207,7 @@ func (u *Uint) Size() int {
 func (u Uint) MarshalAmino() ([]byte, error)   { return u.Marshal() }
 func (u *Uint) UnmarshalAmino(bz []byte) error { return u.Unmarshal(bz) }
 
-// __________________________________________________________________________
+// _________________________________________________________________________
 
 // UintOverflow returns true if a given unsigned integer overflows and false
 // otherwise.

diff --git a/x/auth/module.go b/x/auth/module.go
@@ -85,7 +85,7 @@ func (AppModuleBasic) RegisterInterfaces(registry codectypes.InterfaceRegistry)
 	types.RegisterInterfaces(registry)
 }
 
-// ____________________________________________________________________________
+// ___________________________________________________________________________
 
 // AppModule implements an application module for the auth module.
 type AppModule struct {
@@ -156,7 +156,7 @@ func (AppModule) EndBlock(_ sdk.Context, _ abci.RequestEndBlock) []abci.Validato
 	return []abci.ValidatorUpdate{}
 }
 
-// ____________________________________________________________________________
+// ___________________________________________________________________________
 
 // AppModuleSimulation functions
 

diff --git a/x/auth/vesting/types/vesting_account.go b/x/auth/vesting/types/vesting_account.go
@@ -307,9 +307,9 @@ func (cva ContinuousVestingAccount) Validate() error {
 }
 
 // AddToOriginalVestedCoins adds more coins to an account that are subject to its initial vesting schedule
-func (pva *ContinuousVestingAccount) AddToOriginalVestedCoins(coins sdk.Coins) {
+func (cva *ContinuousVestingAccount) AddToOriginalVestedCoins(coins sdk.Coins) {
 	panic("AddToOriginalVestedCoins not implemented for ContinuousVestingAccount")
-	// pva.OriginalVesting = pva.OriginalVesting.Add(coins...)
+	// cva.OriginalVesting = cva.OriginalVesting.Add(coins...)
 }
 
 func (cva ContinuousVestingAccount) String() string {

diff --git a/x/bank/module.go b/x/bank/module.go
@@ -86,7 +86,7 @@ func (AppModuleBasic) RegisterInterfaces(registry codectypes.InterfaceRegistry)
 	types.RegisterInterfaces(registry)
 }
 
-// ____________________________________________________________________________
+// ___________________________________________________________________________
 
 // AppModule implements an application module for the bank module.
 type AppModule struct {
@@ -160,7 +160,7 @@ func (AppModule) EndBlock(_ sdk.Context, _ abci.RequestEndBlock) []abci.Validato
 	return []abci.ValidatorUpdate{}
 }
 
-// ____________________________________________________________________________
+// ___________________________________________________________________________
 
 // AppModuleSimulation functions
 

diff --git a/x/crisis/handler_test.go b/x/crisis/handler_test.go
@@ -47,7 +47,7 @@ func createTestApp() (*simapp.SimApp, sdk.Context, []sdk.AccAddress) {
 	return app, ctx, addrs
 }
 
-// ____________________________________________________________________________
+// ___________________________________________________________________________
 
 func TestHandleMsgVerifyInvariant(t *testing.T) {
 	app, ctx, addrs := createTestApp()

diff --git a/x/crisis/keeper/msg_server.go b/x/crisis/keeper/msg_server.go
@@ -56,7 +56,7 @@ func (k Keeper) VerifyInvariant(goCtx context.Context, msg *types.MsgVerifyInvar
 		// logger := ctx.Logger().With("module", "x/crisis")
 		// logger.Error(fmt.Sprintf(
 		// "WARNING: insufficient funds to allocate to sender from fee pool, err: %s", err))
-		//}
+		// }
 
 		// TODO replace with circuit breaker
 		panic(res)

diff --git a/x/crisis/module.go b/x/crisis/module.go
@@ -80,7 +80,7 @@ func (AppModuleBasic) RegisterInterfaces(registry codectypes.InterfaceRegistry)
 	types.RegisterInterfaces(registry)
 }
 
-// ____________________________________________________________________________
+// ___________________________________________________________________________
 
 // AppModule implements an application module for the crisis module.
 type AppModule struct {

diff --git a/x/distribution/module.go b/x/distribution/module.go
@@ -88,7 +88,7 @@ func (b AppModuleBasic) RegisterInterfaces(registry cdctypes.InterfaceRegistry)
 	types.RegisterInterfaces(registry)
 }
 
-// ____________________________________________________________________________
+// ___________________________________________________________________________
 
 // AppModule implements an application module for the distribution module.
 type AppModule struct {
@@ -172,7 +172,7 @@ func (AppModule) EndBlock(_ sdk.Context, _ abci.RequestEndBlock) []abci.Validato
 	return []abci.ValidatorUpdate{}
 }
 
-// ____________________________________________________________________________
+// ___________________________________________________________________________
 
 // AppModuleSimulation functions
 

diff --git a/x/evidence/module.go b/x/evidence/module.go
@@ -186,7 +186,7 @@ func (am AppModule) EndBlock(ctx sdk.Context, _ abci.RequestEndBlock) []abci.Val
 	return []abci.ValidatorUpdate{}
 }
 
-// ____________________________________________________________________________
+// ___________________________________________________________________________
 
 // AppModuleSimulation functions
 

diff --git a/x/genutil/module.go b/x/genutil/module.go
@@ -66,7 +66,7 @@ func (AppModuleBasic) GetTxCmd() *cobra.Command { return nil }
 // GetQueryCmd returns no root query command for the genutil module.
 func (AppModuleBasic) GetQueryCmd() *cobra.Command { return nil }
 
-// ____________________________________________________________________________
+// ___________________________________________________________________________
 
 // AppModule implements an application module for the genutil module.
 type AppModule struct {

diff --git a/x/gov/module.go b/x/gov/module.go
@@ -109,7 +109,7 @@ func (a AppModuleBasic) RegisterInterfaces(registry codectypes.InterfaceRegistry
 	types.RegisterInterfaces(registry)
 }
 
-// ____________________________________________________________________________
+// ___________________________________________________________________________
 
 // AppModule implements an application module for the gov module.
 type AppModule struct {
@@ -187,7 +187,7 @@ func (am AppModule) EndBlock(ctx sdk.Context, _ abci.RequestEndBlock) []abci.Val
 	return []abci.ValidatorUpdate{}
 }
 
-// ____________________________________________________________________________
+// ___________________________________________________________________________
 
 // AppModuleSimulation functions
 

diff --git a/x/ibc/applications/transfer/module.go b/x/ibc/applications/transfer/module.go
@@ -154,7 +154,7 @@ func (am AppModule) EndBlock(ctx sdk.Context, req abci.RequestEndBlock) []abci.V
 	return []abci.ValidatorUpdate{}
 }
 
-// ____________________________________________________________________________
+// ___________________________________________________________________________
 
 // AppModuleSimulation functions
 
@@ -183,7 +183,7 @@ func (am AppModule) WeightedOperations(_ module.SimulationState) []simtypes.Weig
 	return nil
 }
 
-// ____________________________________________________________________________
+// ___________________________________________________________________________
 
 // ValidateTransferChannelParams does validation of a newly created transfer channel. A transfer
 // channel must be UNORDERED, use the correct port (by default 'transfer'), and use the current

diff --git a/x/ibc/core/module.go b/x/ibc/core/module.go
@@ -167,7 +167,7 @@ func (am AppModule) EndBlock(ctx sdk.Context, req abci.RequestEndBlock) []abci.V
 	return []abci.ValidatorUpdate{}
 }
 
-// ____________________________________________________________________________
+// ___________________________________________________________________________
 
 // AppModuleSimulation functions
 

diff --git a/x/ibc/testing/mock/mock.go b/x/ibc/testing/mock/mock.go
@@ -124,7 +124,7 @@ func (am AppModule) EndBlock(ctx sdk.Context, req abci.RequestEndBlock) []abci.V
 	return []abci.ValidatorUpdate{}
 }
 
-// ____________________________________________________________________________
+// ___________________________________________________________________________
 
 // OnChanOpenInit implements the IBCModule interface.
 func (am AppModule) OnChanOpenInit(

diff --git a/x/mint/keeper/keeper.go b/x/mint/keeper/keeper.go
@@ -45,7 +45,7 @@ func NewKeeper(
 	}
 }
 
-// ______________________________________________________________________
+// _____________________________________________________________________
 
 // Logger returns a module-specific logger.
 func (k Keeper) Logger(ctx sdk.Context) log.Logger {
@@ -71,7 +71,7 @@ func (k Keeper) SetMinter(ctx sdk.Context, minter types.Minter) {
 	store.Set(types.MinterKey, b)
 }
 
-// ______________________________________________________________________
+// _____________________________________________________________________
 
 // GetParams returns the total set of minting parameters.
 func (k Keeper) GetParams(ctx sdk.Context) (params types.Params) {
@@ -84,7 +84,7 @@ func (k Keeper) SetParams(ctx sdk.Context, params types.Params) {
 	k.paramSpace.SetParamSet(ctx, &params)
 }
 
-// ______________________________________________________________________
+// _____________________________________________________________________
 
 // StakingTokenSupply implements an alias call to the underlying staking keeper's
 // StakingTokenSupply to be used in BeginBlocker.

diff --git a/x/mint/module.go b/x/mint/module.go
@@ -82,7 +82,7 @@ func (AppModuleBasic) GetQueryCmd() *cobra.Command {
 	return cli.GetQueryCmd()
 }
 
-// ____________________________________________________________________________
+// ___________________________________________________________________________
 
 // AppModule implements an application module for the mint module.
 type AppModule struct {
@@ -156,7 +156,7 @@ func (AppModule) EndBlock(_ sdk.Context, _ abci.RequestEndBlock) []abci.Validato
 	return []abci.ValidatorUpdate{}
 }
 
-// ____________________________________________________________________________
+// ___________________________________________________________________________
 
 // AppModuleSimulation functions
 

diff --git a/x/params/module.go b/x/params/module.go
@@ -72,7 +72,7 @@ func (am AppModuleBasic) RegisterInterfaces(registry codectypes.InterfaceRegistr
 	proposal.RegisterInterfaces(registry)
 }
 
-// ____________________________________________________________________________
+// ___________________________________________________________________________
 
 // AppModule implements an application module for the distribution module.
 type AppModule struct {

diff --git a/x/params/simulation/operations.go b/x/params/simulation/operations.go
@@ -43,7 +43,7 @@ func SimulateParamChangeProposalContent(paramChangePool []simulation.ParamChange
 		title := fmt.Sprintf("title from SimulateParamChangeProposalContent-%d", numProposals)
 		desc := fmt.Sprintf("desc from SimulateParamChangeProposalContent-%d. Random short desc: %s",
 			numProposals, simulation.RandStringOfLength(r, 20))
-		numProposals += 1
+		numProposals++
 		return proposal.NewParameterChangeProposal(
 			title,        // title
 			desc,         // description

diff --git a/x/simulation/log.go b/x/simulation/log.go
@@ -67,7 +67,7 @@ func createLogFile() *os.File {
 	return f
 }
 
-// _____________________
+// ____________________
 // dummy log writter
 type DummyLogWriter struct{}
 

diff --git a/x/simulation/mock_tendermint.go b/x/simulation/mock_tendermint.go
@@ -59,7 +59,7 @@ func (vals mockValidators) getKeys() []string {
 	return keys
 }
 
-// _________________________________________________________________________________
+// ________________________________________________________________________________
 
 // randomProposer picks a random proposer from the current validator set
 func (vals mockValidators) randomProposer(r *rand.Rand) tmbytes.HexBytes {

diff --git a/x/simulation/operation.go b/x/simulation/operation.go
@@ -64,7 +64,7 @@ func (oe OperationEntry) MustMarshal() json.RawMessage {
 	return out
 }
 
-// _____________________________________________________________________
+// ____________________________________________________________________
 
 // OperationQueue defines an object for a queue of operations
 type OperationQueue map[int][]simulation.Operation
@@ -107,7 +107,7 @@ func queueOperations(queuedOps OperationQueue, queuedTimeOps []simulation.Future
 	}
 }
 
-// ________________________________________________________________________
+// _______________________________________________________________________
 
 // WeightedOperation is an operation with associated weight.
 // This is used to bias the selection operation within the simulator.

diff --git a/x/simulation/simulate.go b/x/simulation/simulate.go
@@ -240,7 +240,7 @@ func SimulateFromSeed(
 	return false, exportedParams, nil
 }
 
-// ______________________________________________________________________________
+// _____________________________________________________________________________
 
 type blockSimFn func(r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context,
 	accounts []simulation.Account, header tmproto.Header) (opCount int)