Repository: osmosis-labs/osmosis
Pull request #5103 (2023-05-07 02:07:22)

chore: run make format
## What is the purpose of the change

This PR runs make format in order to reduce future changesets from similar tasks. 


## Brief Changelog

* `make format`


## Testing and Verifying

This change ONLY changes formatting

## Documentation and Release Note

  - Does this pull request introduce a new feature or user-facing behavior changes? no
  - Is a relevant changelog entry added to the `Unreleased` section in `CHANGELOG.md`? yes
  - How is the feature or change documented? not applicable


faddat: just fixing up the generated code ci error.  Whomever has been doing CI is **on fire**. 

Patch:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 284b55b01..6b8513234 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -52,6 +52,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Misc Improvements
 
+  * [#5103](https://github.com/osmosis-labs/osmosis/pull/5103) Run `make format`
   * [#5105](https://github.com/osmosis-labs/osmosis/pull/5105) Lint stableswap in the same manner as all of Osmosis
   * [#5065](https://github.com/osmosis-labs/osmosis/pull/5065) Use cosmossdk.io/errors
   * [#4549](https://github.com/osmosis-labs/osmosis/pull/4549) Add single pool price estimate queries
diff --git a/app/upgrades/v15/constants.go b/app/upgrades/v15/constants.go
index 47eb55cdb..351396832 100644
--- a/app/upgrades/v15/constants.go
+++ b/app/upgrades/v15/constants.go
@@ -15,9 +15,11 @@ import (
 const UpgradeName = "v15"
 
 // pool ids to migrate
-const stOSMO_OSMOPoolId = 833
-const stJUNO_JUNOPoolId = 817
-const stSTARS_STARSPoolId = 810
+const (
+	stOSMO_OSMOPoolId   = 833
+	stJUNO_JUNOPoolId   = 817
+	stSTARS_STARSPoolId = 810
+)
 
 var Upgrade = upgrades.Upgrade{
 	UpgradeName:          UpgradeName,
diff --git a/go.mod b/go.mod
index a9479ee91..74afecead 100644
--- a/go.mod
+++ b/go.mod
@@ -241,7 +241,7 @@ require (
 	github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/polyfloyd/go-errorlint v1.4.0 // indirect
-	github.com/prometheus/client_golang v1.15.0
+	github.com/prometheus/client_golang v1.15.1
 	github.com/prometheus/client_model v0.3.0 // indirect
 	github.com/prometheus/common v0.42.0 // indirect
 	github.com/prometheus/procfs v0.9.0 // indirect
diff --git a/go.sum b/go.sum
index 7c3e0395f..15e1539e6 100644
--- a/go.sum
+++ b/go.sum
@@ -990,8 +990,8 @@ github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3O
 github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
 github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
 github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY=
-github.com/prometheus/client_golang v1.15.0 h1:5fCgGYogn0hFdhyhLbw7hEsWxufKtY9klyvdNfFlFhM=
-github.com/prometheus/client_golang v1.15.0/go.mod h1:e9yaBhRPU2pPNsZwE+JdQl0KEt1N9XgF6zxWmaC0xOk=
+github.com/prometheus/client_golang v1.15.1 h1:8tXpTmJbyH5lydzFPoxSIJ0J46jdh3tylbvM1xCv0LI=
+github.com/prometheus/client_golang v1.15.1/go.mod h1:e9yaBhRPU2pPNsZwE+JdQl0KEt1N9XgF6zxWmaC0xOk=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
diff --git a/x/concentrated-liquidity/client/cli/query.go b/x/concentrated-liquidity/client/cli/query.go
index d55c5a96d..429151db5 100644
--- a/x/concentrated-liquidity/client/cli/query.go
+++ b/x/concentrated-liquidity/client/cli/query.go
@@ -30,7 +30,8 @@ func GetUserPositions() (*osmocli.QueryDescriptor, *queryproto.UserPositionsRequ
 			Long: `{{.Short}}{{.ExampleHeader}}
 {{.CommandPrefix}} user-positions osmo12smx2wdlyttvyzvzg54y2vnqwq2qjateuf7thj`,
 			Flags:               osmocli.FlagDesc{OptionalFlags: []*flag.FlagSet{FlagSetJustPoolId()}},
-			CustomFlagOverrides: poolIdFlagOverride},
+			CustomFlagOverrides: poolIdFlagOverride,
+		},
 		&queryproto.UserPositionsRequest{}
 }
 
@@ -39,7 +40,8 @@ func GetCmdPools() (*osmocli.QueryDescriptor, *queryproto.PoolsRequest) {
 		Use:   "pools",
 		Short: "Query pools",
 		Long: `{{.Short}}{{.ExampleHeader}}
-{{.CommandPrefix}} pools`}, &queryproto.PoolsRequest{}
+{{.CommandPrefix}} pools`,
+	}, &queryproto.PoolsRequest{}
 }
 
 func GetClaimableFees() (*osmocli.QueryDescriptor, *queryproto.ClaimableFeesRequest) {
@@ -47,7 +49,8 @@ func GetClaimableFees() (*osmocli.QueryDescriptor, *queryproto.ClaimableFeesRequ
 		Use:   "claimable-fees [positionID]",
 		Short: "Query claimable fees",
 		Long: `{{.Short}}{{.ExampleHeader}}
-{{.CommandPrefix}} claimable-fees 53`}, &queryproto.ClaimableFeesRequest{}
+{{.CommandPrefix}} claimable-fees 53`,
+	}, &queryproto.ClaimableFeesRequest{}
 }
 
 func GetClaimableIncentives() (*osmocli.QueryDescriptor, *queryproto.ClaimableIncentivesRequest) {
@@ -55,5 +58,6 @@ func GetClaimableIncentives() (*osmocli.QueryDescriptor, *queryproto.ClaimableIn
 		Use:   "claimable-incentives [positionID]",
 		Short: "Query claimable incentives",
 		Long: `{{.Short}}{{.ExampleHeader}}
-{{.CommandPrefix}} claimable-fees 53`}, &queryproto.ClaimableIncentivesRequest{}
+{{.CommandPrefix}} claimable-fees 53`,
+	}, &queryproto.ClaimableIncentivesRequest{}
 }
diff --git a/x/concentrated-liquidity/client/cli/tx.go b/x/concentrated-liquidity/client/cli/tx.go
index 4bfcef221..d1e502524 100644
--- a/x/concentrated-liquidity/client/cli/tx.go
+++ b/x/concentrated-liquidity/client/cli/tx.go
@@ -237,6 +237,7 @@ func parseCreateConcentratedLiquidityPoolArgsToContent(cmd *cobra.Command, denom
 
 	return content, nil
 }
+
 func parsePoolIdToTickSpacingRecordsArgsToContent(cmd *cobra.Command) (govtypes.Content, error) {
 	title, err := cmd.Flags().GetString(govcli.FlagTitle)
 	if err != nil {
diff --git a/x/concentrated-liquidity/math/math.go b/x/concentrated-liquidity/math/math.go
index 985df2fba..17d85eee9 100644
--- a/x/concentrated-liquidity/math/math.go
+++ b/x/concentrated-liquidity/math/math.go
@@ -6,9 +6,7 @@ import (
 	"github.com/osmosis-labs/osmosis/osmomath"
 )
 
-var (
-	smallestDec = sdk.SmallestDec()
-)
+var smallestDec = sdk.SmallestDec()
 
 // liquidity0 takes an amount of asset0 in the pool as well as the sqrtpCur and the nextPrice
 // sqrtPriceA is the smaller of sqrtpCur and the nextPrice
diff --git a/x/concentrated-liquidity/simulation/sim_msgs.go b/x/concentrated-liquidity/simulation/sim_msgs.go
index 4bb977a75..6ee2808ce 100644
--- a/x/concentrated-liquidity/simulation/sim_msgs.go
+++ b/x/concentrated-liquidity/simulation/sim_msgs.go
@@ -3,7 +3,6 @@ package simulation
 import (
 	"errors"
 	"fmt"
-
 	"time"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
diff --git a/x/concentrated-liquidity/types/constants.go b/x/concentrated-liquidity/types/constants.go
index 132025a38..a7d6faabd 100644
--- a/x/concentrated-liquidity/types/constants.go
+++ b/x/concentrated-liquidity/types/constants.go
@@ -28,7 +28,8 @@ var (
 		sdk.MustNewDecFromStr("0.001"),  // 0.1%
 		sdk.MustNewDecFromStr("0.002"),  // 0.2%
 		sdk.MustNewDecFromStr("0.003"),  // 0.3%
-		sdk.MustNewDecFromStr("0.005")}  // 0.5%
+		sdk.MustNewDecFromStr("0.005"),
+	} // 0.5%
 	BaseGasFeeForNewIncentive     = 10_000
 	DefaultBalancerSharesDiscount = sdk.MustNewDecFromStr("0.05")
 	// By default, we only authorize one nanosecond (one block) uptime as an option
diff --git a/x/cosmwasmpool/types/keys.go b/x/cosmwasmpool/types/keys.go
index 88b4651c8..9ca7d73be 100644
--- a/x/cosmwasmpool/types/keys.go
+++ b/x/cosmwasmpool/types/keys.go
@@ -12,10 +12,8 @@ const (
 	RouterKey = ModuleName
 )
 
-var (
-	// PoolKey defines the store key for pools.
-	PoolsKey = []byte{0x01}
-)
+// PoolsKey defines the store key for pools.
+var PoolsKey = []byte{0x01}
 
 func FormatPoolsPrefix(poolId uint64) []byte {
 	return append(PoolsKey, sdk.Uint64ToBigEndian(poolId)...)
diff --git a/x/downtime-detector/types/constants.go b/x/downtime-detector/types/constants.go
index 86020ed6b..0c6a5392f 100644
--- a/x/downtime-detector/types/constants.go
+++ b/x/downtime-detector/types/constants.go
@@ -17,8 +17,10 @@ const (
 	QuerierRoute = ModuleName
 )
 
-var DowntimeToDuration = btree.NewMap[Downtime, time.Duration](16)
-var DefaultLastDowntime = time.Unix(0, 0)
+var (
+	DowntimeToDuration  = btree.NewMap[Downtime, time.Duration](16)
+	DefaultLastDowntime = time.Unix(0, 0)
+)
 
 // init initializes the DowntimeToDuration map with mappings
 // from the Duration enum values to their corresponding
diff --git a/x/epochs/client/cli/query.go b/x/epochs/client/cli/query.go
index 0fa799b0a..ea3412304 100644
--- a/x/epochs/client/cli/query.go
+++ b/x/epochs/client/cli/query.go
@@ -22,7 +22,8 @@ func GetCmdEpochInfos() (*osmocli.QueryDescriptor, *types.QueryEpochsInfoRequest
 		Short: "Query running epoch infos.",
 		Long: `{{.Short}}{{.ExampleHeader}}
 {{.CommandPrefix}}`,
-		QueryFnName: "EpochInfos"}, &types.QueryEpochsInfoRequest{}
+		QueryFnName: "EpochInfos",
+	}, &types.QueryEpochsInfoRequest{}
 }
 
 func GetCmdCurrentEpoch() (*osmocli.QueryDescriptor, *types.QueryCurrentEpochRequest) {
@@ -30,5 +31,6 @@ func GetCmdCurrentEpoch() (*osmocli.QueryDescriptor, *types.QueryCurrentEpochReq
 		Use:   "current-epoch",
 		Short: "Query current epoch by specified identifier.",
 		Long: `{{.Short}}{{.ExampleHeader}}
-{{.CommandPrefix}} day`}, &types.QueryCurrentEpochRequest{}
+{{.CommandPrefix}} day`,
+	}, &types.QueryCurrentEpochRequest{}
 }
diff --git a/x/gamm/client/cli/query.go b/x/gamm/client/cli/query.go
index c7595a8a5..43d1fbaa6 100644
--- a/x/gamm/client/cli/query.go
+++ b/x/gamm/client/cli/query.go
@@ -55,7 +55,8 @@ func GetCmdPool() (*osmocli.QueryDescriptor, *types.QueryPoolRequest) {
 		// Deprecated: use x/poolmanager's Pool query.
 		// nolint: staticcheck
 		Long: `{{.Short}}{{.ExampleHeader}}
-{{.CommandPrefix}} pool 1`}, &types.QueryPoolRequest{}
+{{.CommandPrefix}} pool 1`,
+	}, &types.QueryPoolRequest{}
 }
 
 // TODO: Push this to the SDK.
@@ -85,7 +86,8 @@ func GetCmdPools() (*osmocli.QueryDescriptor, *types.QueryPoolsRequest) {
 		Use:   "pools",
 		Short: "Query pools",
 		Long: `{{.Short}}{{.ExampleHeader}}
-{{.CommandPrefix}} pools`}, &types.QueryPoolsRequest{}
+{{.CommandPrefix}} pools`,
+	}, &types.QueryPoolsRequest{}
 }
 
 // nolint: staticcheck
@@ -189,7 +191,8 @@ func GetCmdSpotPrice() (*osmocli.QueryDescriptor, *types.QuerySpotPriceRequest)
 		Short: "Query spot-price (LEGACY, arguments are reversed!!)",
 		Long: `Query spot price (Legacy).{{.ExampleHeader}}
 {{.CommandPrefix}} spot-price 1 uosmo ibc/27394FB092D2ECCD56123C74F36E4C1F926001CEADA9CA97EA622B25F41E5EB2
-`}, &types.QuerySpotPriceRequest{}
+`,
+	}, &types.QuerySpotPriceRequest{}
 }
 
 // Deprecated: use alternate in x/poolmanager.
diff --git a/x/gamm/keeper/migrate.go b/x/gamm/keeper/migrate.go
index 14755c27a..471df1df6 100644
--- a/x/gamm/keeper/migrate.go
+++ b/x/gamm/keeper/migrate.go
@@ -17,7 +17,8 @@ import (
 // Fails if the lp tokens are locked (must instead utilize UnlockAndMigrate function in the superfluid module)
 func (k Keeper) MigrateUnlockedPositionFromBalancerToConcentrated(ctx sdk.Context,
 	sender sdk.AccAddress, sharesToMigrate sdk.Coin,
-	tokenOutMins sdk.Coins) (positionId uint64, amount0, amount1 sdk.Int, liquidity sdk.Dec, joinTime time.Time, poolIdLeaving, poolIdEntering uint64, err error) {
+	tokenOutMins sdk.Coins,
+) (positionId uint64, amount0, amount1 sdk.Int, liquidity sdk.Dec, joinTime time.Time, poolIdLeaving, poolIdEntering uint64, err error) {
 	// Get the balancer poolId by parsing the gamm share denom.
 	poolIdLeaving, err = types.GetPoolIdFromShareDenom(sharesToMigrate.Denom)
 	if err != nil {
diff --git a/x/ibc-hooks/client/cli/query.go b/x/ibc-hooks/client/cli/query.go
index c17c60294..2a4eb3f58 100644
--- a/x/ibc-hooks/client/cli/query.go
+++ b/x/ibc-hooks/client/cli/query.go
@@ -2,12 +2,13 @@ package cli
 
 import (
 	"fmt"
+	"strings"
+
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/version"
 	"github.com/osmosis-labs/osmosis/x/ibc-hooks/keeper"
 	"github.com/spf13/cobra"
-	"strings"
 
 	"github.com/osmosis-labs/osmosis/x/ibc-hooks/types"
 )
diff --git a/x/ibc-hooks/keeper/keeper.go b/x/ibc-hooks/keeper/keeper.go
index 7562a0fd3..9d14337bc 100644
--- a/x/ibc-hooks/keeper/keeper.go
+++ b/x/ibc-hooks/keeper/keeper.go
@@ -2,6 +2,7 @@ package keeper
 
 import (
 	"fmt"
+
 	"github.com/cosmos/cosmos-sdk/types/address"
 
 	"github.com/tendermint/tendermint/libs/log"
diff --git a/x/ibc-rate-limit/types/keys.go b/x/ibc-rate-limit/types/keys.go
index 85a5a0726..8a278c9f5 100644
--- a/x/ibc-rate-limit/types/keys.go
+++ b/x/ibc-rate-limit/types/keys.go
@@ -7,8 +7,6 @@ const (
 
 )
 
-var (
-	// RouterKey is the message route. Can only contain
-	// alphanumeric characters.
-	RouterKey = strings.ReplaceAll(ModuleName, "-", "")
-)
+// RouterKey is the message route. Can only contain
+// alphanumeric characters.
+var RouterKey = strings.ReplaceAll(ModuleName, "-", "")
diff --git a/x/incentives/client/cli/query.go b/x/incentives/client/cli/query.go
index 6fbf775ac..ee17fbe2e 100644
--- a/x/incentives/client/cli/query.go
+++ b/x/incentives/client/cli/query.go
@@ -48,7 +48,8 @@ func GetCmdToDistributeCoins() (*osmocli.QueryDescriptor, *types.ModuleToDistrib
 	return &osmocli.QueryDescriptor{
 		Use:   "to-distribute-coins",
 		Short: "Query coins that is going to be distributed",
-		Long:  `{{.Short}}`}, &types.ModuleToDistributeCoinsRequest{}
+		Long:  `{{.Short}}`,
+	}, &types.ModuleToDistributeCoinsRequest{}
 }
 
 // GetCmdGaugeByID returns a gauge by ID.
@@ -58,7 +59,8 @@ func GetCmdGaugeByID() (*osmocli.QueryDescriptor, *types.GaugeByIDRequest) {
 		Short: "Query gauge by id.",
 		Long: `{{.Short}}{{.ExampleHeader}}
 {{.CommandPrefix}} gauge-by-id 1
-`}, &types.GaugeByIDRequest{}
+`,
+	}, &types.GaugeByIDRequest{}
 }
 
 // GetCmdActiveGauges returns active gauges.
@@ -66,7 +68,8 @@ func GetCmdActiveGauges() (*osmocli.QueryDescriptor, *types.ActiveGaugesRequest)
 	return &osmocli.QueryDescriptor{
 		Use:   "active-gauges",
 		Short: "Query active gauges",
-		Long:  `{{.Short}}`}, &types.ActiveGaugesRequest{}
+		Long:  `{{.Short}}`,
+	}, &types.ActiveGaugesRequest{}
 }
 
 // GetCmdActiveGaugesPerDenom returns active gauges for a specified denom.
@@ -75,7 +78,8 @@ func GetCmdActiveGaugesPerDenom() (*osmocli.QueryDescriptor, *types.ActiveGauges
 		Use:   "active-gauges-per-den [den]denom [denom]",
 		Short: "Query active gauges per denom",
 		Long: `{{.Short}}{{.ExampleHeader}}
-{{.CommandPrefix}} active-gauges-per-denom gamm/pool/1`}, &types.ActiveGaugesPerDenomRequest{}
+{{.CommandPrefix}} active-gauges-per-denom gamm/pool/1`,
+	}, &types.ActiveGaugesPerDenomRequest{}
 }
 
 // GetCmdUpcomingGauges returns scheduled gauges.
@@ -83,7 +87,8 @@ func GetCmdUpcomingGauges() (*osmocli.QueryDescriptor, *types.UpcomingGaugesRequ
 	return &osmocli.QueryDescriptor{
 		Use:   "upcoming-gauges",
 		Short: "Query upcoming gauges",
-		Long:  `{{.Short}}`}, &types.UpcomingGaugesRequest{}
+		Long:  `{{.Short}}`,
+	}, &types.UpcomingGaugesRequest{}
 }
 
 // GetCmdUpcomingGaugesPerDenom returns scheduled gauges for specified denom..
@@ -91,7 +96,8 @@ func GetCmdUpcomingGaugesPerDenom() (*osmocli.QueryDescriptor, *types.UpcomingGa
 	return &osmocli.QueryDescriptor{
 		Use:   "upcoming-gauges-per-denom [denom]",
 		Short: "Query scheduled gauges per denom",
-		Long:  `{{.Short}}`}, &types.UpcomingGaugesPerDenomRequest{}
+		Long:  `{{.Short}}`,
+	}, &types.UpcomingGaugesPerDenomRequest{}
 }
 
 // GetCmdRewardsEst returns rewards estimation.
diff --git a/x/incentives/keeper/distribute.go b/x/incentives/keeper/distribute.go
index fa23a3e6c..fc273fee0 100644
--- a/x/incentives/keeper/distribute.go
+++ b/x/incentives/keeper/distribute.go
@@ -275,7 +275,6 @@ func (k Keeper) distributeConcentratedLiquidity(ctx sdk.Context, poolId uint64,
 		startTime,
 		minUptime,
 	)
-
 	if err != nil {
 		return err
 	}
diff --git a/x/lockup/client/cli/query.go b/x/lockup/client/cli/query.go
index 0c8b98e14..8041c88ef 100644
--- a/x/lockup/client/cli/query.go
+++ b/x/lockup/client/cli/query.go
@@ -59,7 +59,8 @@ func GetCmdModuleBalance() (*osmocli.QueryDescriptor, *types.ModuleBalanceReques
 	return &osmocli.QueryDescriptor{
 		Use:   "module-balance",
 		Short: "Query module balance",
-		Long:  `{{.Short}}`}, &types.ModuleBalanceRequest{}
+		Long:  `{{.Short}}`,
+	}, &types.ModuleBalanceRequest{}
 }
 
 // GetCmdModuleLockedAmount returns locked balance of the module,
@@ -68,7 +69,8 @@ func GetCmdModuleLockedAmount() (*osmocli.QueryDescriptor, *types.ModuleLockedAm
 	return &osmocli.QueryDescriptor{
 		Use:   "module-locked-amount",
 		Short: "Query locked amount",
-		Long:  `{{.Short}}`}, &types.ModuleLockedAmountRequest{}
+		Long:  `{{.Short}}`,
+	}, &types.ModuleLockedAmountRequest{}
 }
 
 // GetCmdAccountUnlockableCoins returns unlockable coins which has finsihed unlocking.
@@ -115,7 +117,8 @@ func GetCmdAccountUnlockingCoins() (*osmocli.QueryDescriptor, *types.AccountUnlo
 		Use:   "account-unlocking-coins <address>",
 		Short: "Query account's unlocking coins",
 		Long: `{{.Short}}{{.ExampleHeader}}
-{{.CommandPrefix}} account-unlocking-coins <address>`}, &types.AccountUnlockingCoinsRequest{}
+{{.CommandPrefix}} account-unlocking-coins <address>`,
+	}, &types.AccountUnlockingCoinsRequest{}
 }
 
 // GetCmdAccountLockedCoins returns locked coins that that are still in a locked state from the specified account.
@@ -135,7 +138,8 @@ func GetCmdAccountLockedPastTime() (*osmocli.QueryDescriptor, *types.AccountLock
 		Short: "Query locked records of an account with unlock time beyond timestamp",
 		Long: `{{.Short}}{{.ExampleHeader}}
 {{.CommandPrefix}} account-locked-pastime <address> <timestamp>
-`}, &types.AccountLockedPastTimeRequest{}
+`,
+	}, &types.AccountLockedPastTimeRequest{}
 }
 
 // GetCmdAccountLockedPastTimeNotUnlockingOnly returns locks of an account with unlock time beyond provided timestamp
@@ -147,7 +151,8 @@ func GetCmdAccountLockedPastTimeNotUnlockingOnly() (*osmocli.QueryDescriptor, *t
 		Long: `{{.Short}}
 Timestamp is UNIX time in seconds.{{.ExampleHeader}}
 {{.CommandPrefix}} account-locked-pastime-not-unlocking <address> <timestamp>
-`}, &types.AccountLockedPastTimeNotUnlockingOnlyRequest{}
+`,
+	}, &types.AccountLockedPastTimeNotUnlockingOnlyRequest{}
 }
 
 // GetCmdAccountUnlockedBeforeTime returns locks with unlock time before the provided timestamp.
diff --git a/x/pool-incentives/keeper/hooks.go b/x/pool-incentives/keeper/hooks.go
index 7576eb724..f57e40bee 100644
--- a/x/pool-incentives/keeper/hooks.go
+++ b/x/pool-incentives/keeper/hooks.go
@@ -71,15 +71,12 @@ func (h Hooks) AfterConcentratedPoolCreated(ctx sdk.Context, sender sdk.AccAddre
 
 // AfterInitialPoolPositionCreated is a noop.
 func (h Hooks) AfterInitialPoolPositionCreated(ctx sdk.Context, sender sdk.AccAddress, poolId uint64) {
-
 }
 
 // AfterLastPoolPositionRemoved is a noop.
 func (h Hooks) AfterLastPoolPositionRemoved(ctx sdk.Context, sender sdk.AccAddress, poolId uint64) {
-
 }
 
 // AfterConcentratedPoolSwap is a noop.
 func (h Hooks) AfterConcentratedPoolSwap(ctx sdk.Context, sender sdk.AccAddress, poolId uint64) {
-
 }
diff --git a/x/poolmanager/client/cli/query.go b/x/poolmanager/client/cli/query.go
index 31d9171bd..cc1087f4f 100644
--- a/x/poolmanager/client/cli/query.go
+++ b/x/poolmanager/client/cli/query.go
@@ -74,7 +74,8 @@ func GetCmdPool() (*osmocli.QueryDescriptor, *queryproto.PoolRequest) {
 		Use:   "pool [poolID]",
 		Short: "Query pool",
 		Long: `{{.Short}}{{.ExampleHeader}}
-{{.CommandPrefix}} pool 1`}, &queryproto.PoolRequest{}
+{{.CommandPrefix}} pool 1`,
+	}, &queryproto.PoolRequest{}
 }
 
 func GetCmdSpotPrice() (*osmocli.QueryDescriptor, *queryproto.SpotPriceRequest) {
@@ -83,7 +84,8 @@ func GetCmdSpotPrice() (*osmocli.QueryDescriptor, *queryproto.SpotPriceRequest)
 		Short: "Query spot-price",
 		Long: `Query spot-price
 {{.CommandPrefix}} spot-price 1 uosmo ibc/27394FB092D2ECCD56123C74F36E4C1F926001CEADA9CA97EA622B25F41E5EB2
-`}, &queryproto.SpotPriceRequest{}
+`,
+	}, &queryproto.SpotPriceRequest{}
 }
 
 func EstimateSwapExactAmountInParseArgs(args []string, fs *flag.FlagSet) (proto.Message, error) {
diff --git a/x/poolmanager/client/cli/tx.go b/x/poolmanager/client/cli/tx.go
index 9a5daad9f..a8c2bc198 100644
--- a/x/poolmanager/client/cli/tx.go
+++ b/x/poolmanager/client/cli/tx.go
@@ -56,6 +56,7 @@ func NewSwapExactAmountOutCmd() (*osmocli.TxCliDesc, *types.MsgSwapExactAmountOu
 		Flags:            osmocli.FlagDesc{RequiredFlags: []*flag.FlagSet{FlagSetMultihopSwapRoutes()}},
 	}, &types.MsgSwapExactAmountOut{}
 }
+
 func NewBuildSwapExactAmountInMsg(clientCtx client.Context, tokenInStr, tokenOutMinAmtStr string, txf tx.Factory, fs *flag.FlagSet) (tx.Factory, sdk.Msg, error) {
 	routes, err := swapAmountInRoutes(fs)
 	if err != nil {
diff --git a/x/poolmanager/router.go b/x/poolmanager/router.go
index aa103f154..dd2e1f8a2 100644
--- a/x/poolmanager/router.go
+++ b/x/poolmanager/router.go
@@ -12,10 +12,8 @@ import (
 	"github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
 )
 
-var (
-	// 1 << 256 - 1 where 256 is the max bit length defined for sdk.Int
-	intMaxValue = sdk.NewIntFromBigInt(new(big.Int).Sub(new(big.Int).Lsh(big.NewInt(1), 256), big.NewInt(1)))
-)
+// 1 << 256 - 1 where 256 is the max bit length defined for sdk.Int
+var intMaxValue = sdk.NewIntFromBigInt(new(big.Int).Sub(new(big.Int).Lsh(big.NewInt(1), 256), big.NewInt(1)))
 
 // RouteExactAmountIn defines the input denom and input amount for the first pool,
 // the output of the first pool is chained as the input for the next routed pool
diff --git a/x/protorev/keeper/epoch_hook.go b/x/protorev/keeper/epoch_hook.go
index c1326ebcb..1e640d2e4 100644
--- a/x/protorev/keeper/epoch_hook.go
+++ b/x/protorev/keeper/epoch_hook.go
@@ -16,9 +16,7 @@ type LiquidityPoolStruct struct {
 	PoolId    uint64
 }
 
-var (
-	_ epochstypes.EpochHooks = EpochHooks{}
-)
+var _ epochstypes.EpochHooks = EpochHooks{}
 
 func (k Keeper) EpochHooks() epochstypes.EpochHooks {
 	return EpochHooks{k}
diff --git a/x/protorev/keeper/posthandler.go b/x/protorev/keeper/posthandler.go
index 295a36969..a17c8ae50 100644
--- a/x/protorev/keeper/posthandler.go
+++ b/x/protorev/keeper/posthandler.go
@@ -169,7 +169,8 @@ func extractSwapInPools(routes []poolmanagertypes.SwapAmountInRoute, tokenInDeno
 		swappedPools = append(swappedPools, SwapToBackrun{
 			PoolId:        route.PoolId,
 			TokenOutDenom: route.TokenOutDenom,
-			TokenInDenom:  prevTokenIn})
+			TokenInDenom:  prevTokenIn,
+		})
 
 		prevTokenIn = route.TokenOutDenom
 	}
@@ -187,7 +188,8 @@ func extractSwapOutPools(routes []poolmanagertypes.SwapAmountOutRoute, tokenOutD
 		swappedPools = append(swappedPools, SwapToBackrun{
 			PoolId:        route.PoolId,
 			TokenOutDenom: prevTokenOut,
-			TokenInDenom:  route.TokenInDenom})
+			TokenInDenom:  route.TokenInDenom,
+		})
 
 		prevTokenOut = route.TokenInDenom
 	}
diff --git a/x/protorev/keeper/rebalance.go b/x/protorev/keeper/rebalance.go
index 7e97a4a0e..7f260eb96 100644
--- a/x/protorev/keeper/rebalance.go
+++ b/x/protorev/keeper/rebalance.go
@@ -79,7 +79,6 @@ func (k Keeper) ConvertProfits(ctx sdk.Context, inputCoin sdk.Coin, profit sdk.I
 		types.OsmosisDenomination,
 		conversionPool.GetSwapFee(ctx),
 	)
-
 	if err != nil {
 		return profit, err
 	}
diff --git a/x/protorev/types/constants.go b/x/protorev/types/constants.go
index f2974579e..254eefb80 100644
--- a/x/protorev/types/constants.go
+++ b/x/protorev/types/constants.go
@@ -30,12 +30,16 @@ const MaxPoolPointsPerBlock uint64 = 200
 // ---------------- Module Profit Splitting Constants ---------------- //
 
 // Year 1 (20% of total profit)
-const Phase1Length uint64 = 365
-const ProfitSplitPhase1 int64 = 20
+const (
+	Phase1Length      uint64 = 365
+	ProfitSplitPhase1 int64  = 20
+)
 
 // Year 2 (10% of total profit)
-const Phase2Length uint64 = 730
-const ProfitSplitPhase2 int64 = 10
+const (
+	Phase2Length      uint64 = 730
+	ProfitSplitPhase2 int64  = 10
+)
 
 // All other years (5% of total profit)
 const ProfitSplitPhase3 int64 = 5
diff --git a/x/superfluid/keeper/migrate.go b/x/superfluid/keeper/migrate.go
index 7dbec203f..b9a5ea10f 100644
--- a/x/superfluid/keeper/migrate.go
+++ b/x/superfluid/keeper/migrate.go
@@ -53,7 +53,8 @@ func (k Keeper) migrateSuperfluidBondedBalancerToConcentrated(ctx sdk.Context,
 	synthDenomBeforeMigration string,
 	concentratedPool cltypes.ConcentratedPoolExtension,
 	remainingLockTime time.Duration,
-	tokenOutMins sdk.Coins) (positionId uint64, amount0, amount1 sdk.Int, liquidity sdk.Dec, joinTime time.Time, gammLockId, concentratedLockId uint64, err error) {
+	tokenOutMins sdk.Coins,
+) (positionId uint64, amount0, amount1 sdk.Int, liquidity sdk.Dec, joinTime time.Time, gammLockId, concentratedLockId uint64, err error) {
 	// Get the validator address from the synth denom and ensure it is a valid address.
 	valAddr := strings.Split(synthDenomBeforeMigration, "/")[4]
 	_, err = sdk.ValAddressFromBech32(valAddr)
@@ -120,7 +121,8 @@ func (k Keeper) migrateSuperfluidUnbondingBalancerToConcentrated(ctx sdk.Context
 	synthDenomBeforeMigration string,
 	concentratedPool cltypes.ConcentratedPoolExtension,
 	remainingLockTime time.Duration,
-	tokenOutMins sdk.Coins) (positionId uint64, amount0, amount1 sdk.Int, liquidity sdk.Dec, joinTime time.Time, gammLockId, concentratedLockId uint64, err error) {
+	tokenOutMins sdk.Coins,
+) (positionId uint64, amount0, amount1 sdk.Int, liquidity sdk.Dec, joinTime time.Time, gammLockId, concentratedLockId uint64, err error) {
 	// Get the validator address from the synth denom and ensure it is a valid address.
 	valAddr := strings.Split(synthDenomBeforeMigration, "/")[4]
 	_, err = sdk.ValAddressFromBech32(valAddr)
@@ -204,7 +206,8 @@ func (k Keeper) migrateNonSuperfluidLockBalancerToConcentrated(ctx sdk.Context,
 	sharesToMigrate sdk.Coin,
 	concentratedPool cltypes.ConcentratedPoolExtension,
 	remainingLockTime time.Duration,
-	tokenOutMins sdk.Coins) (positionId uint64, amount0, amount1 sdk.Int, liquidity sdk.Dec, joinTime time.Time, gammLockId, concentratedLockId uint64, err error) {
+	tokenOutMins sdk.Coins,
+) (positionId uint64, amount0, amount1 sdk.Int, liquidity sdk.Dec, joinTime time.Time, gammLockId, concentratedLockId uint64, err error) {
 	// Save unlocking state of lock before force unlocking
 	wasUnlocking := preMigrationLock.IsUnlocking()
 
diff --git a/x/superfluid/types/msgs.go b/x/superfluid/types/msgs.go
index e35017498..38f77e667 100644
--- a/x/superfluid/types/msgs.go
+++ b/x/superfluid/types/msgs.go
@@ -362,6 +362,7 @@ func (msg MsgAddToConcentratedLiquiditySuperfluidPosition) Route() string { retu
 func (msg MsgAddToConcentratedLiquiditySuperfluidPosition) Type() string {
 	return TypeMsgAddToConcentratedLiquiditySuperfluidPosition
 }
+
 func (msg MsgAddToConcentratedLiquiditySuperfluidPosition) ValidateBasic() error {
 	_, err := sdk.AccAddressFromBech32(msg.Sender)
 	if err != nil {
diff --git a/x/twap/client/cli/query.go b/x/twap/client/cli/query.go
index 78479c9d0..a8b33696c 100644
--- a/x/twap/client/cli/query.go
+++ b/x/twap/client/cli/query.go
@@ -61,7 +61,6 @@ Example:
 				StartTime:  startTime,
 				EndTime:    &endTime,
 			})
-
 			if err != nil {
 				return err
 			}
@@ -113,7 +112,6 @@ Example:
 				StartTime:  startTime,
 				EndTime:    &endTime,
 			})
-
 			if err != nil {
 				return err
 			}


Test patch:
diff --git a/app/upgrades/v13/upgrade_test.go b/app/upgrades/v13/upgrade_test.go
index 9043a9685..d0a0b3167 100644
--- a/app/upgrades/v13/upgrade_test.go
+++ b/app/upgrades/v13/upgrade_test.go
@@ -2,9 +2,10 @@ package v13_test
 
 import (
 	"fmt"
-	ibchookstypes "github.com/osmosis-labs/osmosis/x/ibc-hooks/types"
 	"testing"
 
+	ibchookstypes "github.com/osmosis-labs/osmosis/x/ibc-hooks/types"
+
 	ibcratelimittypes "github.com/osmosis-labs/osmosis/v15/x/ibc-rate-limit/types"
 
 	"github.com/cosmos/cosmos-sdk/store/prefix"
@@ -55,8 +56,8 @@ func (suite *UpgradeTestSuite) TestUpgrade() {
 			"Test that the upgrade succeeds",
 			func() {
 				// The module doesn't need an account anymore, but when the upgrade happened we did:
-				//acc := suite.App.AccountKeeper.GetAccount(suite.Ctx, ibc_hooks.WasmHookModuleAccountAddr)
-				//suite.App.AccountKeeper.RemoveAccount(suite.Ctx, acc)
+				// acc := suite.App.AccountKeeper.GetAccount(suite.Ctx, ibc_hooks.WasmHookModuleAccountAddr)
+				// suite.App.AccountKeeper.RemoveAccount(suite.Ctx, acc)
 
 				// Because of SDK version map bug, we can't do the following, and instaed do a massive hack
 				// vm := suite.App.UpgradeKeeper.GetModuleVersionMap(suite.Ctx)
@@ -70,15 +71,15 @@ func (suite *UpgradeTestSuite) TestUpgrade() {
 				versionStore.Delete([]byte(ibchookstypes.ModuleName))
 
 				// Same comment as above: this was the case when the upgrade happened, but we don't have accounts anymore
-				//hasAcc := suite.App.AccountKeeper.HasAccount(suite.Ctx, ibc_hooks.WasmHookModuleAccountAddr)
-				//suite.Require().False(hasAcc)
+				// hasAcc := suite.App.AccountKeeper.HasAccount(suite.Ctx, ibc_hooks.WasmHookModuleAccountAddr)
+				// suite.Require().False(hasAcc)
 
 			},
 			func() { dummyUpgrade(suite) },
 			func() {
 				// Same comment as pre-upgrade. We had an account, but now we don't anymore
-				//hasAcc := suite.App.AccountKeeper.HasAccount(suite.Ctx, ibc_hooks.WasmHookModuleAccountAddr)
-				//suite.Require().True(hasAcc)
+				// hasAcc := suite.App.AccountKeeper.HasAccount(suite.Ctx, ibc_hooks.WasmHookModuleAccountAddr)
+				// suite.Require().True(hasAcc)
 			},
 		},
 		{
diff --git a/app/upgrades/v15/upgrade_test.go b/app/upgrades/v15/upgrade_test.go
index bd0370796..ea7c326e7 100644
--- a/app/upgrades/v15/upgrade_test.go
+++ b/app/upgrades/v15/upgrade_test.go
@@ -50,9 +50,7 @@ func (suite *UpgradeTestSuite) TestMigrateNextPoolIdAndCreatePool() {
 		expectedNextPoolId uint64 = 1
 	)
 
-	var (
-		gammKeeperType = reflect.TypeOf(&gamm.Keeper{})
-	)
+	gammKeeperType := reflect.TypeOf(&gamm.Keeper{})
 
 	ctx := suite.Ctx
 	gammKeeper := suite.App.GAMMKeeper
@@ -181,7 +179,7 @@ func (suite *UpgradeTestSuite) TestRegisterOsmoIonMetadata() {
 	uosmoMetadata, found := suite.App.BankKeeper.GetDenomMetaData(ctx, "uosmo")
 	suite.Require().False(found)
 
-	uionMetadata, found := suite.App.BankKeeper.GetDenomMetaData(ctx, "uion")
+	_, found = suite.App.BankKeeper.GetDenomMetaData(ctx, "uion")
 	suite.Require().False(found)
 
 	// system under test.
@@ -190,7 +188,7 @@ func (suite *UpgradeTestSuite) TestRegisterOsmoIonMetadata() {
 	uosmoMetadata, found = suite.App.BankKeeper.GetDenomMetaData(ctx, "uosmo")
 	suite.Require().True(found)
 
-	uionMetadata, found = suite.App.BankKeeper.GetDenomMetaData(ctx, "uion")
+	uionMetadata, found := suite.App.BankKeeper.GetDenomMetaData(ctx, "uion")
 	suite.Require().True(found)
 
 	suite.Require().Equal(expectedUosmodenom, uosmoMetadata.Base)
@@ -249,7 +247,6 @@ func (suite *UpgradeTestSuite) TestSetRateLimits() {
 	// This is the last one. If the others failed the upgrade would've panicked before adding this one
 	state, err = suite.App.WasmKeeper.QuerySmart(suite.Ctx, addr, []byte(`{"get_quotas": {"channel_id": "any", "denom": "ibc/E6931F78057F7CC5DA0FD6CEF82FF39373A6E0452BF1FD76910B93292CF356C1"}}`))
 	suite.Require().Greaterf(len(state), 0, "state should not be empty")
-
 }
 
 func (suite *UpgradeTestSuite) validateCons(coinsA, coinsB sdk.Coins) {
diff --git a/app/upgrades/v16/upgrades_test.go b/app/upgrades/v16/upgrades_test.go
index ac1d41bc8..d77cfadb1 100644
--- a/app/upgrades/v16/upgrades_test.go
+++ b/app/upgrades/v16/upgrades_test.go
@@ -35,7 +35,7 @@ func dummyUpgrade(suite *UpgradeTestSuite) {
 	plan := upgradetypes.Plan{Name: "v16", Height: dummyUpgradeHeight}
 	err := suite.App.UpgradeKeeper.ScheduleUpgrade(suite.Ctx, plan)
 	suite.Require().NoError(err)
-	plan, exists := suite.App.UpgradeKeeper.GetUpgradePlan(suite.Ctx)
+	_, exists := suite.App.UpgradeKeeper.GetUpgradePlan(suite.Ctx)
 	suite.Require().True(exists)
 
 	suite.Ctx = suite.Ctx.WithBlockHeight(dummyUpgradeHeight)
diff --git a/app/upgrades/v4/upgrade_test.go b/app/upgrades/v4/upgrade_test.go
index e35424f68..a8ad0fe0c 100644
--- a/app/upgrades/v4/upgrade_test.go
+++ b/app/upgrades/v4/upgrade_test.go
@@ -66,7 +66,7 @@ func (suite *UpgradeTestSuite) TestUpgradePayments() {
 				plan := upgradetypes.Plan{Name: "v4", Height: dummyUpgradeHeight}
 				err := suite.app.UpgradeKeeper.ScheduleUpgrade(suite.ctx, plan)
 				suite.Require().NoError(err)
-				plan, exists := suite.app.UpgradeKeeper.GetUpgradePlan(suite.ctx)
+				_, exists := suite.app.UpgradeKeeper.GetUpgradePlan(suite.ctx)
 				suite.Require().True(exists)
 
 				suite.ctx = suite.ctx.WithBlockHeight(dummyUpgradeHeight)
diff --git a/app/upgrades/v9/upgrade_test.go b/app/upgrades/v9/upgrade_test.go
index 667d890b6..badf960b2 100644
--- a/app/upgrades/v9/upgrade_test.go
+++ b/app/upgrades/v9/upgrade_test.go
@@ -30,7 +30,7 @@ func (suite *UpgradeTestSuite) TestUpgradePayments() {
 				plan := upgradetypes.Plan{Name: "v9", Height: dummyUpgradeHeight}
 				err := suite.App.UpgradeKeeper.ScheduleUpgrade(suite.Ctx, plan)
 				suite.Require().NoError(err)
-				plan, exists := suite.App.UpgradeKeeper.GetUpgradePlan(suite.Ctx)
+				_, exists := suite.App.UpgradeKeeper.GetUpgradePlan(suite.Ctx)
 				suite.Require().True(exists)
 
 				suite.Ctx = suite.Ctx.WithBlockHeight(dummyUpgradeHeight)
diff --git a/tests/cl-genesis-positions/convert.go b/tests/cl-genesis-positions/convert.go
index bf63e6578..7708f9d56 100644
--- a/tests/cl-genesis-positions/convert.go
+++ b/tests/cl-genesis-positions/convert.go
@@ -45,9 +45,7 @@ type OsmosisApp struct {
 	TestAccs    []sdk.AccAddress
 }
 
-var (
-	osmosisPrecision = 6
-)
+var osmosisPrecision = 6
 
 func ReadSubgraphDataFromDisk(subgraphFilePath string) []SubgraphPosition {
 	// read in the data from file
@@ -193,7 +191,6 @@ func ConvertSubgraphToOsmosisGenesis(positionCreatorAddresses []sdk.AccAddress,
 			TokenMinAmount0: sdk.ZeroInt(),
 			TokenMinAmount1: sdk.ZeroInt(),
 		})
-
 		if err != nil {
 			fmt.Printf("\n\n\nWARNING: Failed to create position: %v\n\n\n", err)
 			fmt.Printf("attempted creation between ticks (%s) and (%s), desired amount 0: (%s), desired amount 1 (%s)\n", lowerTickOsmosis, upperTickOsmosis, depositedAmount0, depositedAmount1)
@@ -273,7 +270,7 @@ func writeStateToDisk(state map[string]json.RawMessage) {
 		panic(err)
 	}
 
-	err = os.WriteFile(pathToFilesFromRoot+osmosisGenesisFileName, stateBz, 0644)
+	err = os.WriteFile(pathToFilesFromRoot+osmosisGenesisFileName, stateBz, 0o644)
 	if err != nil {
 		panic(err)
 	}
@@ -287,7 +284,7 @@ func writeBigBangPositionsToState(positions []BigBangPosition) {
 	if err != nil {
 		panic(err)
 	}
-	err = os.WriteFile(pathToFilesFromRoot+bigbangPosiionsFileName, positionsBytes, 0644)
+	err = os.WriteFile(pathToFilesFromRoot+bigbangPosiionsFileName, positionsBytes, 0o644)
 	if err != nil {
 		panic(err)
 	}
diff --git a/tests/cl-genesis-positions/get_data.go b/tests/cl-genesis-positions/get_data.go
index ae47d5d83..ae3eb157a 100644
--- a/tests/cl-genesis-positions/get_data.go
+++ b/tests/cl-genesis-positions/get_data.go
@@ -96,7 +96,7 @@ func GetUniV3SubgraphData(pathToSaveAt string) {
 		return
 	}
 
-	if err := os.WriteFile(pathToSaveAt, jsonData, 0644); err != nil {
+	if err := os.WriteFile(pathToSaveAt, jsonData, 0o644); err != nil {
 		fmt.Println("Error writing JSON file:", err)
 		return
 	}
diff --git a/tests/cl-genesis-positions/local_accounts.go b/tests/cl-genesis-positions/local_accounts.go
index b2169a7e7..a6d1260ea 100644
--- a/tests/cl-genesis-positions/local_accounts.go
+++ b/tests/cl-genesis-positions/local_accounts.go
@@ -1,15 +1,14 @@
 package main
 
 import (
+	"context"
+	"fmt"
+	"log"
 	"os/user"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/ignite/cli/ignite/pkg/cosmosaccount"
 	"github.com/ignite/cli/ignite/pkg/cosmosclient"
-
-	"context"
-	"fmt"
-	"log"
 )
 
 const (
diff --git a/tests/cl-go-client/main.go b/tests/cl-go-client/main.go
index 0783b9c8a..61633e9ee 100644
--- a/tests/cl-go-client/main.go
+++ b/tests/cl-go-client/main.go
@@ -159,7 +159,6 @@ func createPosition(client cosmosclient.Client, poolId uint64, senderKeyringAcco
 		TokenMinAmount1: tokenMinAmount1,
 	}
 	txResp, err := client.BroadcastTx(senderKeyringAccountName, msg)
-
 	if err != nil {
 		log.Fatal(err)
 	}
diff --git a/tests/e2e/configurer/chain/queries.go b/tests/e2e/configurer/chain/queries.go
index ce9c9be99..1da3ee1f0 100644
--- a/tests/e2e/configurer/chain/queries.go
+++ b/tests/e2e/configurer/chain/queries.go
@@ -281,6 +281,7 @@ func (n *NodeConfig) QueryConcentratedPositions(address string) []model.Position
 	require.NoError(n.t, err)
 	return positionsResponse.Positions
 }
+
 func (n *NodeConfig) QueryConcentratedPool(poolId uint64) (cltypes.ConcentratedPoolExtension, error) {
 	path := fmt.Sprintf("/osmosis/poolmanager/v1beta1/pools/%d", poolId)
 	bz, err := n.QueryGRPCGateway(path)
diff --git a/tests/e2e/e2e_test.go b/tests/e2e/e2e_test.go
index d746e39d6..eb6f7059b 100644
--- a/tests/e2e/e2e_test.go
+++ b/tests/e2e/e2e_test.go
@@ -74,7 +74,7 @@ func (s *IntegrationTestSuite) TestProtoRev() {
 	s.Require().Len(hotRoutes, 0)
 
 	// The module should have no trades by default.
-	numTrades, err := chainANode.QueryProtoRevNumberOfTrades()
+	_, err = chainANode.QueryProtoRevNumberOfTrades()
 	s.T().Logf("checking that the protorev module has no trades on init: %s", err)
 	s.Require().Error(err)
 
@@ -140,7 +140,7 @@ func (s *IntegrationTestSuite) TestProtoRev() {
 	s.Require().Equal(supplyBefore, supplyAfter)
 
 	// Check that the number of trades executed by the protorev module is 1.
-	numTrades, err = chainANode.QueryProtoRevNumberOfTrades()
+	numTrades, err := chainANode.QueryProtoRevNumberOfTrades()
 	s.T().Logf("checking that the protorev module has executed 1 trade")
 	s.Require().NoError(err)
 	s.Require().NotNil(numTrades)
@@ -660,10 +660,8 @@ func (s *IntegrationTestSuite) TestConcentratedLiquidity() {
 
 	// Withdraw Position
 
-	var (
-		// Withdraw Position parameters
-		defaultLiquidityRemoval string = "1000"
-	)
+	// Withdraw Position parameters
+	var defaultLiquidityRemoval string = "1000"
 
 	chainA.WaitForNumHeights(2)
 
@@ -730,7 +728,7 @@ func (s *IntegrationTestSuite) TestConcentratedLiquidity() {
 	}
 
 	// if querying proposal takes longer than timeoutPeriod, stop the goroutine and error
-	timeoutPeriod := time.Duration(2 * time.Minute)
+	timeoutPeriod := 2 * time.Minute
 	select {
 	case <-time.After(timeoutPeriod):
 		err := fmt.Errorf("go routine took longer than %s", timeoutPeriod)
@@ -977,7 +975,7 @@ func (s *IntegrationTestSuite) TestIBCTokenTransferRateLimiting() {
 
 	// Removing the rate limit so it doesn't affect other tests
 	node.WasmExecute(contract, `{"remove_path": {"channel_id": "channel-0", "denom": "uosmo"}}`, initialization.ValidatorWalletName)
-	//reset the param to the original contract if it existed
+	// reset the param to the original contract if it existed
 	if param != "" {
 		err = chainA.SubmitParamChangeProposal(
 			ibcratelimittypes.ModuleName,
@@ -991,7 +989,6 @@ func (s *IntegrationTestSuite) TestIBCTokenTransferRateLimiting() {
 		}, time.Second*30, time.Millisecond*500)
 
 	}
-
 }
 
 func (s *IntegrationTestSuite) TestLargeWasmUpload() {
@@ -1161,7 +1158,6 @@ func (s *IntegrationTestSuite) TestAddToExistingLock() {
 // because twap keep time = epoch time / 4 and we use a timer
 // to wait for at least the twap keep time.
 func (s *IntegrationTestSuite) TestArithmeticTWAP() {
-
 	s.T().Skip("TODO: investigate further: https://github.com/osmosis-labs/osmosis/issues/4342")
 
 	const (
@@ -1438,7 +1434,7 @@ func (s *IntegrationTestSuite) TestExpeditedProposals() {
 	}
 	// if querying proposal takes longer than timeoutPeriod, stop the goroutine and error
 	var elapsed time.Duration
-	timeoutPeriod := time.Duration(2 * time.Minute)
+	timeoutPeriod := 2 * time.Minute
 	select {
 	case elapsed = <-totalTimeChan:
 	case <-time.After(timeoutPeriod):
@@ -1559,10 +1555,8 @@ func (s *IntegrationTestSuite) TestAConcentratedLiquidity_CanonicalPool_And_Para
 		s.T().Skip("Skipping v16 canonical pool creation test because upgrade is not enabled")
 	}
 
-	var (
-		// Taken from: https://app.osmosis.zone/pool/674
-		expectedFee = sdk.MustNewDecFromStr("0.002")
-	)
+	// Taken from: https://app.osmosis.zone/pool/674
+	expectedFee := sdk.MustNewDecFromStr("0.002")
 
 	chainA := s.configurer.GetChainConfig(0)
 	chainANode, err := chainA.GetDefaultNode()
diff --git a/tests/e2e/helpers_e2e_test.go b/tests/e2e/helpers_e2e_test.go
index 2ab08c8b1..78b37131c 100644
--- a/tests/e2e/helpers_e2e_test.go
+++ b/tests/e2e/helpers_e2e_test.go
@@ -8,9 +8,7 @@ import (
 	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
 )
 
-var (
-	defaultFeePerTx = sdk.NewInt(1000)
-)
+var defaultFeePerTx = sdk.NewInt(1000)
 
 // calculateFeeGrowthGlobal calculates fee growth global per unit of virtual liquidity based on swap parameters:
 // amountIn - amount being swapped
@@ -84,6 +82,6 @@ func (s *IntegrationTestSuite) updatedPool(node *chain.NodeConfig, poolId uint64
 // Assert returned positions:
 func (s *IntegrationTestSuite) validateCLPosition(position model.Position, poolId uint64, lowerTick, upperTick int64) {
 	s.Require().Equal(position.PoolId, poolId)
-	s.Require().Equal(position.LowerTick, int64(lowerTick))
-	s.Require().Equal(position.UpperTick, int64(upperTick))
+	s.Require().Equal(position.LowerTick, lowerTick)
+	s.Require().Equal(position.UpperTick, upperTick)
 }
diff --git a/tests/e2e/initialization/config.go b/tests/e2e/initialization/config.go
index 34ccadc42..522c936b4 100644
--- a/tests/e2e/initialization/config.go
+++ b/tests/e2e/initialization/config.go
@@ -477,7 +477,7 @@ func updateTWAPGenesis(appGenState map[string]json.RawMessage) func(twapGenState
 					Asset0Denom:                 denomPair.Denom0,
 					Asset1Denom:                 denomPair.Denom0,
 					Height:                      1,
-					Time:                        time.Date(2023, 02, 1, 0, 0, 0, 0, time.UTC), // some time in the past.
+					Time:                        time.Date(2023, 0o2, 1, 0, 0, 0, 0, time.UTC), // some time in the past.
 					P0LastSpotPrice:             sp0,
 					P1LastSpotPrice:             sp1,
 					P0ArithmeticTwapAccumulator: sdk.ZeroDec(),
diff --git a/tests/ibc-hooks/ibc_middleware_test.go b/tests/ibc-hooks/ibc_middleware_test.go
index 69affe29b..1b5056d5a 100644
--- a/tests/ibc-hooks/ibc_middleware_test.go
+++ b/tests/ibc-hooks/ibc_middleware_test.go
@@ -3,11 +3,12 @@ package ibc_hooks_test
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/tidwall/gjson"
 	"strings"
 	"testing"
 	"time"
 
+	"github.com/tidwall/gjson"
+
 	"github.com/CosmWasm/wasmd/x/wasm/types"
 
 	ibchookskeeper "github.com/osmosis-labs/osmosis/x/ibc-hooks/keeper"
@@ -608,7 +609,6 @@ func (suite *HooksTestSuite) TestAcks() {
 		&suite.Suite, addr,
 		[]byte(fmt.Sprintf(`{"get_count": {"addr": "%s"}}`, addr)))
 	suite.Require().Equal(`{"count":2}`, state)
-
 }
 
 func (suite *HooksTestSuite) TestTimeouts() {
@@ -641,7 +641,6 @@ func (suite *HooksTestSuite) TestTimeouts() {
 		&suite.Suite, addr,
 		[]byte(fmt.Sprintf(`{"get_count": {"addr": "%s"}}`, addr)))
 	suite.Require().Equal(`{"count":10}`, state)
-
 }
 
 func (suite *HooksTestSuite) TestSendWithoutMemo() {
@@ -1200,7 +1199,6 @@ func (suite *HooksTestSuite) TestCrosschainSwapsViaIBCBadAck() {
 	// Calling recovery again should fail
 	_, err = contractKeeper.Execute(suite.chainA.GetContext(), crosschainAddr, recoverAddr2, []byte(recoverMsg), sdk.NewCoins())
 	suite.Require().Error(err)
-
 }
 
 // CrosschainSwapsViaIBCBadSwap tests that if the crosschain-swap fails, the tokens are returned to the sender
@@ -1363,7 +1361,6 @@ func (suite *HooksTestSuite) SetupIBCRouteOnChain(swaprouterAddr, owner sdk.AccA
 	suite.Require().NoError(err)
 	err = suite.pathAB.EndpointB.UpdateClient()
 	suite.Require().NoError(err)
-
 }
 
 func (suite *HooksTestSuite) SetupIBCSimpleRouteOnChain(swaprouterAddr, owner sdk.AccAddress, poolId uint64, chainName Chain, denom1, denom2 string) {
@@ -1390,7 +1387,6 @@ func (suite *HooksTestSuite) SetupIBCSimpleRouteOnChain(swaprouterAddr, owner sd
 	suite.Require().NoError(err)
 	err = suite.pathAB.EndpointB.UpdateClient()
 	suite.Require().NoError(err)
-
 }
 
 // TestCrosschainForwardWithMemo tests the that the next_memo field is correctly forwarded to the other chain on the IBC transfer.
@@ -1418,7 +1414,7 @@ func (suite *HooksTestSuite) TestCrosschainForwardWithMemo() {
 	fmt.Println("receiver now has: ", balanceToken0IBCBefore)
 	suite.Require().Equal(int64(0), balanceToken0IBCBefore.Amount.Int64())
 
-	//suite.Require().Equal(int64(0), balanceToken1.Amount.Int64())
+	// suite.Require().Equal(int64(0), balanceToken1.Amount.Int64())
 
 	// Generate swap instructions for the contract
 	//
@@ -1788,9 +1784,7 @@ func (suite *HooksTestSuite) TestMultiHopXCS() {
 
 			receivedTokenAfter := receiverChain.GetOsmosisApp().BankKeeper.GetBalance(receiverChain.GetContext(), tc.receiver.address, tc.receivedToken)
 			suite.Require().True(receivedTokenAfter.Amount.GT(receivedTokenBalance.Amount))
-
 		})
-
 	}
 }
 
@@ -1853,7 +1847,7 @@ func (suite *HooksTestSuite) ExecuteOutpostSwap(initializer, receiverAddr sdk.Ac
 
 	// But the receiver now has some token1IBC
 	balanceToken1After := osmosisAppB.BankKeeper.GetBalance(suite.chainB.GetContext(), receiverAddr, token1IBC)
-	//fmt.Println("receiver now has: ", balanceToken1After)
+	// fmt.Println("receiver now has: ", balanceToken1After)
 	suite.Require().Greater(balanceToken1After.Amount.Int64(), int64(0))
 }
 
diff --git a/tests/ibc-hooks/xcs_cw20_test.go b/tests/ibc-hooks/xcs_cw20_test.go
index fb441c845..0627ea6c7 100644
--- a/tests/ibc-hooks/xcs_cw20_test.go
+++ b/tests/ibc-hooks/xcs_cw20_test.go
@@ -4,6 +4,7 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
+
 	wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	transfertypes "github.com/cosmos/ibc-go/v4/modules/apps/transfer/types"
@@ -175,5 +176,4 @@ func (suite *HooksTestSuite) TestCW20ICS20() {
 	// Check that the receiver has more cw20 tokens than before
 	newCw20Balance := suite.getCW20Balance(chainB, cw20Addr, receiver2)
 	suite.Require().Greater(newCw20Balance.Int64(), cw20Balance.Int64())
-
 }
diff --git a/x/concentrated-liquidity/fees_test.go b/x/concentrated-liquidity/fees_test.go
index a231238c3..bbb580158 100644
--- a/x/concentrated-liquidity/fees_test.go
+++ b/x/concentrated-liquidity/fees_test.go
@@ -210,7 +210,6 @@ func (s *KeeperTestSuite) TestInitOrUpdateFeeAccumulatorPosition() {
 	for _, tc := range tests {
 		tc := tc
 		s.Run(tc.name, func() {
-
 			// System under test
 			err := clKeeper.InitOrUpdateFeeAccumulatorPosition(s.Ctx, tc.positionFields.poolId, tc.positionFields.lowerTick, tc.positionFields.upperTick, tc.positionFields.positionId, tc.positionFields.liquidity)
 			if tc.expectedPass {
@@ -1188,7 +1187,7 @@ func (s *KeeperTestSuite) TestPrepareClaimableFees() {
 			s.initializeTick(ctx, tc.currentTick, tc.lowerTick, tc.initialLiquidity, tc.lowerTickFeeGrowthOutside, emptyUptimeTrackers, false)
 			s.initializeTick(ctx, tc.currentTick, tc.upperTick, tc.initialLiquidity, tc.upperTickFeeGrowthOutside, emptyUptimeTrackers, true)
 			validPool.SetCurrentTick(sdk.NewInt(tc.currentTick))
-			clKeeper.SetPool(ctx, validPool)
+			_ = clKeeper.SetPool(ctx, validPool)
 
 			err = clKeeper.ChargeFee(ctx, validPoolId, tc.globalFeeGrowth[0])
 			s.Require().NoError(err)
diff --git a/x/concentrated-liquidity/incentives_test.go b/x/concentrated-liquidity/incentives_test.go
index f8916437d..ae7b8d54c 100644
--- a/x/concentrated-liquidity/incentives_test.go
+++ b/x/concentrated-liquidity/incentives_test.go
@@ -372,17 +372,17 @@ func (s *KeeperTestSuite) TestGetUptimeAccumulatorName() {
 		"pool id 1, uptime id 0": {
 			poolId:            defaultPoolId,
 			uptimeIndex:       uint64(0),
-			expectedAccumName: string(types.KeyUptimeAccumulator(1, 0)),
+			expectedAccumName: types.KeyUptimeAccumulator(1, 0),
 		},
 		"pool id 1, uptime id 999": {
 			poolId:            defaultPoolId,
 			uptimeIndex:       uint64(999),
-			expectedAccumName: string(types.KeyUptimeAccumulator(1, 999)),
+			expectedAccumName: types.KeyUptimeAccumulator(1, 999),
 		},
 		"pool id 999, uptime id 1": {
 			poolId:            uint64(999),
 			uptimeIndex:       uint64(1),
-			expectedAccumName: string(types.KeyUptimeAccumulator(999, 1)),
+			expectedAccumName: types.KeyUptimeAccumulator(999, 1),
 		},
 	}
 
@@ -1179,7 +1179,7 @@ func (s *KeeperTestSuite) TestGetInitialUptimeGrowthOutsidesForTick() {
 				uptimeAccum.AddToAccumulator(expectedUptimes.hundredTokensMultiDenom[uptimeId])
 			}
 
-			poolUptimeAccumulators, err = clKeeper.GetUptimeAccumulators(s.Ctx, tc.poolId)
+			_, err = clKeeper.GetUptimeAccumulators(s.Ctx, tc.poolId)
 			s.Require().NoError(err)
 
 			val, err := clKeeper.GetInitialUptimeGrowthOutsidesForTick(s.Ctx, tc.poolId, tc.tick)
@@ -2906,13 +2906,13 @@ func (s *KeeperTestSuite) TestQueryAndCollectIncentives() {
 			// Set up invalid pool ID for error-catching case(s)
 			sutPoolId := validPoolId
 			if tc.isInvalidPoolIdGiven {
-				sutPoolId = sutPoolId + 1
+				sutPoolId = sutPoolId + 1 //nolint:staticcheck,ineffassign
 			}
 
 			// System under test
 			incentivesClaimedQuery, incentivesForfeitedQuery, err := clKeeper.GetClaimableIncentives(ctx, DefaultPositionId)
 
-			poolBalanceAfterCollect := s.App.BankKeeper.GetAllBalances(ctx, validPool.GetAddress())
+			_ = s.App.BankKeeper.GetAllBalances(ctx, validPool.GetAddress())
 			incentivesBalanceAfterCollect := s.App.BankKeeper.GetAllBalances(ctx, validPool.GetIncentivesAddress())
 			ownerBalancerAfterCollect := s.App.BankKeeper.GetAllBalances(ctx, ownerWithValidPosition)
 
@@ -2933,7 +2933,7 @@ func (s *KeeperTestSuite) TestQueryAndCollectIncentives() {
 			s.Require().Equal(incentivesClaimedQuery, actualIncentivesClaimed)
 			s.Require().Equal(incentivesForfeitedQuery, actualIncetivesForfeited)
 
-			poolBalanceAfterCollect = s.App.BankKeeper.GetAllBalances(ctx, validPool.GetAddress())
+			poolBalanceAfterCollect := s.App.BankKeeper.GetAllBalances(ctx, validPool.GetAddress())
 			incentivesBalanceAfterCollect = s.App.BankKeeper.GetAllBalances(ctx, validPool.GetIncentivesAddress())
 			ownerBalancerAfterCollect = s.App.BankKeeper.GetAllBalances(ctx, ownerWithValidPosition)
 
diff --git a/x/concentrated-liquidity/keeper_test.go b/x/concentrated-liquidity/keeper_test.go
index ae9749bb1..a3eeba36a 100644
--- a/x/concentrated-liquidity/keeper_test.go
+++ b/x/concentrated-liquidity/keeper_test.go
@@ -291,7 +291,8 @@ func (s *KeeperTestSuite) validateListenerCallCount(
 	expectedPoolCreatedListenerCallCount,
 	expectedInitialPositionCreationListenerCallCount,
 	expectedLastPositionWithdrawalListenerCallCount,
-	expectedSwapListenerCallCount int) {
+	expectedSwapListenerCallCount int,
+) {
 	// Validate that listeners were called the desired number of times
 	listeners := s.App.ConcentratedLiquidityKeeper.GetListenersUnsafe()
 	s.Require().Len(listeners, 1)
diff --git a/x/concentrated-liquidity/lp_test.go b/x/concentrated-liquidity/lp_test.go
index 442e06dae..affb5559f 100644
--- a/x/concentrated-liquidity/lp_test.go
+++ b/x/concentrated-liquidity/lp_test.go
@@ -539,7 +539,7 @@ func (s *KeeperTestSuite) TestWithdrawPosition() {
 
 			expectedPoolBalanceDelta := expectedFeesClaimed.Add(sdk.NewCoin(ETH, config.amount0Expected.Abs())).Add(sdk.NewCoin(USDC, config.amount1Expected.Abs()))
 
-			withdrawAccount := sdk.AccAddress{}
+			var withdrawAccount sdk.AccAddress
 			if tc.withdrawWithNonOwner {
 				withdrawAccount = nonOwner
 			} else {
@@ -1371,13 +1371,11 @@ func (s *KeeperTestSuite) TestUpdatePosition() {
 }
 
 func (s *KeeperTestSuite) TestInitializeInitialPositionForPool() {
-	var (
-		sqrt = func(x int64) sdk.Dec {
-			sqrt, err := sdk.NewDec(x).ApproxSqrt()
-			s.Require().NoError(err)
-			return sqrt
-		}
-	)
+	sqrt := func(x int64) sdk.Dec {
+		sqrt, err := sdk.NewDec(x).ApproxSqrt()
+		s.Require().NoError(err)
+		return sqrt
+	}
 
 	type sendTest struct {
 		amount0Desired        sdk.Int
@@ -1464,7 +1462,6 @@ func (s *KeeperTestSuite) TestInitializeInitialPositionForPool() {
 }
 
 func (s *KeeperTestSuite) TestInverseRelation_CreatePosition_WithdrawPosition() {
-
 	tests := map[string]lpTest{}
 
 	// add test cases for different positions
diff --git a/x/concentrated-liquidity/math/math_test.go b/x/concentrated-liquidity/math/math_test.go
index 1713b69f6..6b21d9f82 100644
--- a/x/concentrated-liquidity/math/math_test.go
+++ b/x/concentrated-liquidity/math/math_test.go
@@ -431,7 +431,6 @@ func (suite *ConcentratedMathTestSuite) TestGetNextSqrtPriceFromAmount0InRoundin
 	for name, tc := range tests {
 		tc := tc
 		suite.Run(name, func() {
-
 			sqrtPriceNext := math.GetNextSqrtPriceFromAmount0InRoundingUp(tc.sqrtPriceCurrent, tc.liquidity, tc.amountZeroRemaininIn)
 
 			suite.Require().Equal(tc.expectedSqrtPriceNext.String(), sqrtPriceNext.String())
@@ -468,7 +467,6 @@ func (suite *ConcentratedMathTestSuite) TestGetNextSqrtPriceFromAmount0OutRoundi
 	for name, tc := range tests {
 		tc := tc
 		suite.Run(name, func() {
-
 			sqrtPriceNext := math.GetNextSqrtPriceFromAmount0OutRoundingUp(tc.sqrtPriceCurrent, tc.liquidity, tc.amountZeroRemainingOut)
 
 			suite.Require().Equal(tc.expectedSqrtPriceNext.String(), sqrtPriceNext.String())
@@ -505,7 +503,6 @@ func (suite *ConcentratedMathTestSuite) TestGetNextSqrtPriceFromAmount1InRoundin
 	for name, tc := range tests {
 		tc := tc
 		suite.Run(name, func() {
-
 			sqrtPriceNext := math.GetNextSqrtPriceFromAmount1InRoundingDown(tc.sqrtPriceCurrent, tc.liquidity, tc.amountOneRemainingIn)
 
 			suite.Require().Equal(tc.expectedSqrtPriceNext.String(), sqrtPriceNext.String())
@@ -542,7 +539,6 @@ func (suite *ConcentratedMathTestSuite) TestGetNextSqrtPriceFromAmount1OutRoundi
 	for name, tc := range tests {
 		tc := tc
 		suite.Run(name, func() {
-
 			sqrtPriceNext := math.GetNextSqrtPriceFromAmount1OutRoundingDown(tc.sqrtPriceCurrent, tc.liquidity, tc.amountOneRemainingOut)
 
 			suite.Require().Equal(tc.expectedSqrtPriceNext.String(), sqrtPriceNext.String())
diff --git a/x/concentrated-liquidity/math/tick_test.go b/x/concentrated-liquidity/math/tick_test.go
index 0a41f01f2..d3f960dda 100644
--- a/x/concentrated-liquidity/math/tick_test.go
+++ b/x/concentrated-liquidity/math/tick_test.go
@@ -330,7 +330,6 @@ func (suite *ConcentratedMathTestSuite) TestPriceToTick() {
 			tickExpected: sdk.NewInt(types.MaxTick - 100).String(),
 		},
 		"max sqrt price, max tick neg six -> max spot price": {
-
 			price:        types.MaxSqrtPrice.Power(2),
 			tickExpected: sdk.NewInt(types.MaxTick).String(),
 		},
@@ -444,7 +443,6 @@ func (suite *ConcentratedMathTestSuite) TestPriceToTick_RoundDown() {
 		tc := tc
 
 		suite.Run(name, func() {
-
 			tick, err := math.PriceToTickRoundDown(tc.price, tc.tickSpacing)
 
 			suite.Require().NoError(err)
diff --git a/x/concentrated-liquidity/pool_test.go b/x/concentrated-liquidity/pool_test.go
index 22a1ad403..a1818b619 100644
--- a/x/concentrated-liquidity/pool_test.go
+++ b/x/concentrated-liquidity/pool_test.go
@@ -389,7 +389,6 @@ func (s *KeeperTestSuite) TestSetPool() {
 			retrievedPool, err = s.App.ConcentratedLiquidityKeeper.GetPoolById(s.Ctx, test.pool.GetId())
 			s.Require().NoError(err)
 			s.Require().Equal(test.pool, retrievedPool)
-
 		})
 	}
 }
diff --git a/x/concentrated-liquidity/position_test.go b/x/concentrated-liquidity/position_test.go
index ad5cc92a2..2c9f3e778 100644
--- a/x/concentrated-liquidity/position_test.go
+++ b/x/concentrated-liquidity/position_test.go
@@ -14,9 +14,7 @@ import (
 	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
 )
 
-var (
-	DefaultIncentiveRecords = []types.IncentiveRecord{incentiveRecordOne, incentiveRecordTwo, incentiveRecordThree, incentiveRecordFour}
-)
+var DefaultIncentiveRecords = []types.IncentiveRecord{incentiveRecordOne, incentiveRecordTwo, incentiveRecordThree, incentiveRecordFour}
 
 func (s *KeeperTestSuite) TestInitOrUpdatePosition() {
 	const (
@@ -207,7 +205,7 @@ func (s *KeeperTestSuite) TestInitOrUpdatePosition() {
 			s.Require().NoError(err)
 
 			// Setup for checks
-			actualUptimeAccumDelta, expectedUptimeAccumValueGrowth, expectedIncentiveRecords, expectedGrowthCurAccum := emptyAccumValues, emptyAccumValues, test.incentiveRecords, sdk.DecCoins{}
+			actualUptimeAccumDelta, expectedUptimeAccumValueGrowth, expectedIncentiveRecords, _ := emptyAccumValues, emptyAccumValues, test.incentiveRecords, sdk.DecCoins{}
 
 			timeElapsedSec := sdk.NewDec(int64(test.timeElapsedSinceInit)).Quo(sdk.NewDec(10e8))
 			positionName := string(types.KeyPositionId(test.param.positionId))
@@ -237,7 +235,7 @@ func (s *KeeperTestSuite) TestInitOrUpdatePosition() {
 					// Track how much the current uptime accum has grown by
 					actualUptimeAccumDelta[uptimeIndex] = newUptimeAccumValues[uptimeIndex].Sub(initUptimeAccumValues[uptimeIndex])
 					if timeElapsedSec.GT(sdk.ZeroDec()) {
-						expectedGrowthCurAccum, expectedIncentiveRecords, err = cl.CalcAccruedIncentivesForAccum(s.Ctx, uptime, test.param.liquidityDelta, timeElapsedSec, expectedIncentiveRecords)
+						expectedGrowthCurAccum, _, err := cl.CalcAccruedIncentivesForAccum(s.Ctx, uptime, test.param.liquidityDelta, timeElapsedSec, expectedIncentiveRecords)
 						s.Require().NoError(err)
 						expectedUptimeAccumValueGrowth[uptimeIndex] = expectedGrowthCurAccum
 					}
@@ -260,7 +258,6 @@ func (s *KeeperTestSuite) TestInitOrUpdatePosition() {
 }
 
 func (s *KeeperTestSuite) TestGetPosition() {
-
 	tests := []struct {
 		name                      string
 		positionId                uint64
@@ -936,7 +933,7 @@ func (s *KeeperTestSuite) TestValidateAndFungifyChargedPositions() {
 				s.Require().Equal(sdk.Coins(nil), forfeitedRewards)
 
 				// Sanity check that cannot claim again.
-				claimedRewards, forfeitedRewards, err = s.App.ConcentratedLiquidityKeeper.ClaimAllIncentivesForPosition(s.Ctx, newPositionId)
+				claimedRewards, _, err = s.App.ConcentratedLiquidityKeeper.ClaimAllIncentivesForPosition(s.Ctx, newPositionId)
 				s.Require().NoError(err)
 
 				s.Require().Equal(sdk.Coins(nil), claimedRewards)
@@ -1460,7 +1457,6 @@ func (s *KeeperTestSuite) TestMintSharesLockAndUpdate() {
 			s.Require().NoError(err)
 			s.Require().Equal(underlyingLiquidityTokenized[0].Amount.String(), concentratedLock.Coins[0].Amount.String())
 			s.Require().Equal(test.remainingLockDuration, concentratedLock.Duration)
-
 		},
 		)
 	}
diff --git a/x/concentrated-liquidity/store_test.go b/x/concentrated-liquidity/store_test.go
index 0eb5ff574..58d62c356 100644
--- a/x/concentrated-liquidity/store_test.go
+++ b/x/concentrated-liquidity/store_test.go
@@ -125,7 +125,6 @@ func (s *KeeperTestSuite) TestParseFullTickFromBytes() {
 	for name, tc := range tests {
 		tc := tc
 		s.Run(name, func() {
-
 			fullTick, err := cl.ParseFullTickFromBytes(tc.key, tc.val)
 			if tc.expectedErr != nil {
 				s.Require().Error(err)
diff --git a/x/concentrated-liquidity/swaps_test.go b/x/concentrated-liquidity/swaps_test.go
index 6bff49b70..7a2da4695 100644
--- a/x/concentrated-liquidity/swaps_test.go
+++ b/x/concentrated-liquidity/swaps_test.go
@@ -1443,7 +1443,6 @@ var (
 )
 
 func (s *KeeperTestSuite) TestCalcAndSwapOutAmtGivenIn() {
-
 	tests := make(map[string]SwapTest, len(swapOutGivenInCases)+len(swapOutGivenInFeeCases)+len(swapOutGivenInErrorCases))
 	for name, test := range swapOutGivenInCases {
 		tests[name] = test
@@ -1598,7 +1597,6 @@ func (s *KeeperTestSuite) TestCalcAndSwapOutAmtGivenIn() {
 }
 
 func (s *KeeperTestSuite) TestSwapOutAmtGivenIn_TickUpdates() {
-
 	tests := make(map[string]SwapTest)
 	for name, test := range swapOutGivenInCases {
 		tests[name] = test
@@ -1677,7 +1675,6 @@ func (s *KeeperTestSuite) TestSwapOutAmtGivenIn_TickUpdates() {
 }
 
 func (s *KeeperTestSuite) TestCalcAndSwapInAmtGivenOut() {
-
 	tests := make(map[string]SwapTest, len(swapInGivenOutTestCases)+len(swapInGivenOutFeeTestCases)+len(swapInGivenOutErrorTestCases))
 	for name, test := range swapInGivenOutTestCases {
 		tests[name] = test
@@ -1847,7 +1844,6 @@ func (s *KeeperTestSuite) TestCalcAndSwapInAmtGivenOut() {
 }
 
 func (s *KeeperTestSuite) TestSwapInAmtGivenOut_TickUpdates() {
-
 	tests := make(map[string]SwapTest)
 	for name, test := range swapInGivenOutTestCases {
 		tests[name] = test
@@ -2285,7 +2281,6 @@ func (s *KeeperTestSuite) TestSwapExactAmountOut() {
 // TestCalcOutAmtGivenInWriteCtx tests that writeCtx successfully performs state changes as expected.
 // We expect writeCtx to only change fee accum state, since pool state change is not handled via writeCtx function.
 func (s *KeeperTestSuite) TestCalcOutAmtGivenInWriteCtx() {
-
 	// we only use fee cases here since write Ctx only takes effect in the fee accumulator
 	tests := make(map[string]SwapTest, len(swapOutGivenInFeeCases))
 
@@ -2370,7 +2365,6 @@ func (s *KeeperTestSuite) TestCalcOutAmtGivenInWriteCtx() {
 // TestCalcInAmtGivenOutWriteCtx tests that writeCtx succesfully perfroms state changes as expected.
 // We expect writeCtx to only change fee accum state, since pool state change is not handled via writeCtx function.
 func (s *KeeperTestSuite) TestCalcInAmtGivenOutWriteCtx() {
-
 	// we only use fee cases here since write Ctx only takes effect in the fee accumulator
 	tests := make(map[string]SwapTest, len(swapInGivenOutFeeTestCases))
 
@@ -2451,8 +2445,8 @@ func (s *KeeperTestSuite) TestCalcInAmtGivenOutWriteCtx() {
 		})
 	}
 }
-func (s *KeeperTestSuite) TestInverseRelationshipSwapOutAmtGivenIn() {
 
+func (s *KeeperTestSuite) TestInverseRelationshipSwapOutAmtGivenIn() {
 	tests := swapOutGivenInCases
 
 	for name, test := range tests {
diff --git a/x/concentrated-liquidity/swapstrategy/fees_test.go b/x/concentrated-liquidity/swapstrategy/fees_test.go
index 21d8faf29..b6e476b95 100644
--- a/x/concentrated-liquidity/swapstrategy/fees_test.go
+++ b/x/concentrated-liquidity/swapstrategy/fees_test.go
@@ -7,9 +7,7 @@ import (
 	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/swapstrategy"
 )
 
-var (
-	onePercentFee = sdk.NewDecWithPrec(1, 2)
-)
+var onePercentFee = sdk.NewDecWithPrec(1, 2)
 
 func (suite *StrategyTestSuite) TestComputeFeeChargePerSwapStepOutGivenIn() {
 	tests := map[string]struct {
diff --git a/x/concentrated-liquidity/swapstrategy/one_for_zero_test.go b/x/concentrated-liquidity/swapstrategy/one_for_zero_test.go
index 5bfcfc429..ced6d67eb 100644
--- a/x/concentrated-liquidity/swapstrategy/one_for_zero_test.go
+++ b/x/concentrated-liquidity/swapstrategy/one_for_zero_test.go
@@ -41,7 +41,6 @@ func (suite *StrategyTestSuite) TestGetSqrtTargetPrice_OneForZero() {
 			actualSqrtTargetPrice := strategy.GetSqrtTargetPrice(tc.nextTickSqrtPrice)
 
 			suite.Require().Equal(tc.expectedResult, actualSqrtTargetPrice)
-
 		})
 	}
 }
diff --git a/x/concentrated-liquidity/swapstrategy/swap_strategy_test.go b/x/concentrated-liquidity/swapstrategy/swap_strategy_test.go
index ff93369e5..2c2172275 100644
--- a/x/concentrated-liquidity/swapstrategy/swap_strategy_test.go
+++ b/x/concentrated-liquidity/swapstrategy/swap_strategy_test.go
@@ -57,7 +57,6 @@ func (suite *StrategyTestSuite) TestNextInitializedTick() {
 
 	suite.Run("lte=true", func() {
 		suite.Run("returns tick to right if at initialized tick", func() {
-
 			swapStrategy := swapstrategy.New(false, sdk.ZeroDec(), clStoreKey, sdk.ZeroDec(), defaultTickSpacing)
 
 			n, initd := swapStrategy.NextInitializedTick(ctx, 1, 78)
diff --git a/x/concentrated-liquidity/swapstrategy/zero_for_one_test.go b/x/concentrated-liquidity/swapstrategy/zero_for_one_test.go
index 095226105..0e49e3477 100644
--- a/x/concentrated-liquidity/swapstrategy/zero_for_one_test.go
+++ b/x/concentrated-liquidity/swapstrategy/zero_for_one_test.go
@@ -48,7 +48,6 @@ func (suite *StrategyTestSuite) TestGetSqrtTargetPrice_ZeroForOne() {
 			actualSqrtTargetPrice := sut.GetSqrtTargetPrice(tc.nextTickSqrtPrice)
 
 			suite.Require().Equal(tc.expectedResult, actualSqrtTargetPrice)
-
 		})
 	}
 }
diff --git a/x/concentrated-liquidity/types/params_test.go b/x/concentrated-liquidity/types/params_test.go
index b0d16cda3..5eb3aadfe 100644
--- a/x/concentrated-liquidity/types/params_test.go
+++ b/x/concentrated-liquidity/types/params_test.go
@@ -45,7 +45,6 @@ func TestValidateTicks(t *testing.T) {
 	for name, tc := range tests {
 		tc := tc
 		t.Run(name, func(t *testing.T) {
-
 			err := types.ValidateTicks(tc.i)
 
 			if tc.expectError {
diff --git a/x/downtime-detector/client/cli/query_test.go b/x/downtime-detector/client/cli/query_test.go
index 68955d802..77b626804 100644
--- a/x/downtime-detector/client/cli/query_test.go
+++ b/x/downtime-detector/client/cli/query_test.go
@@ -18,32 +18,37 @@ func TestRecoveredSinceQueryCmd(t *testing.T) {
 			Cmd: "30s 10m",
 			ExpectedQuery: &queryproto.RecoveredSinceDowntimeOfLengthRequest{
 				Downtime: types.Downtime_DURATION_30S,
-				Recovery: time.Minute * 10},
+				Recovery: time.Minute * 10,
+			},
 		},
 		"invalid duration": {
 			Cmd: "31s 10m",
 			ExpectedQuery: &queryproto.RecoveredSinceDowntimeOfLengthRequest{
 				Downtime: types.Downtime_DURATION_30S,
-				Recovery: time.Minute * 10},
+				Recovery: time.Minute * 10,
+			},
 			ExpectedErr: true,
 		},
 		"90m": {
 			Cmd: "90m 10m",
 			ExpectedQuery: &queryproto.RecoveredSinceDowntimeOfLengthRequest{
 				Downtime: types.Downtime_DURATION_1_5H,
-				Recovery: time.Minute * 10},
+				Recovery: time.Minute * 10,
+			},
 		},
 		"1.5h": {
 			Cmd: "1.5h 10m",
 			ExpectedQuery: &queryproto.RecoveredSinceDowntimeOfLengthRequest{
 				Downtime: types.Downtime_DURATION_1_5H,
-				Recovery: time.Minute * 10},
+				Recovery: time.Minute * 10,
+			},
 		},
 		"1h30m": {
 			Cmd: "1h30m 10m",
 			ExpectedQuery: &queryproto.RecoveredSinceDowntimeOfLengthRequest{
 				Downtime: types.Downtime_DURATION_1_5H,
-				Recovery: time.Minute * 10},
+				Recovery: time.Minute * 10,
+			},
 		},
 	}
 	osmocli.RunQueryTestCases(t, desc, tcs)
diff --git a/x/downtime-detector/keeper_test.go b/x/downtime-detector/keeper_test.go
index 8982b9b8d..b993097c3 100644
--- a/x/downtime-detector/keeper_test.go
+++ b/x/downtime-detector/keeper_test.go
@@ -10,9 +10,11 @@ import (
 	"github.com/osmosis-labs/osmosis/v15/x/downtime-detector/types"
 )
 
-var baseTime = time.Unix(1257894000, 0).UTC()
-var sec = time.Second
-var min = time.Minute
+var (
+	baseTime = time.Unix(1257894000, 0).UTC()
+	sec      = time.Second
+	min      = time.Minute
+)
 
 type blocktimes []time.Duration
 
@@ -33,10 +35,12 @@ func (suite *KeeperTestSuite) runBlocktimes(times blocktimes) {
 	}
 }
 
-var abruptRecovery5minDowntime10min blocktimes = []time.Duration{sec, 10 * min, 5 * min}
-var smootherRecovery5minDowntime10min blocktimes = []time.Duration{sec, 10 * min, min, min, min, min, min}
-var fifteenMinEndtime = abruptRecovery5minDowntime10min.EndTime()
-var tenMinEndtime = abruptRecovery5minDowntime10min.EndTime().Add(-5 * min)
+var (
+	abruptRecovery5minDowntime10min   blocktimes = []time.Duration{sec, 10 * min, 5 * min}
+	smootherRecovery5minDowntime10min blocktimes = []time.Duration{sec, 10 * min, min, min, min, min, min}
+	fifteenMinEndtime                            = abruptRecovery5minDowntime10min.EndTime()
+	tenMinEndtime                                = abruptRecovery5minDowntime10min.EndTime().Add(-5 * min)
+)
 
 func (suite *KeeperTestSuite) TestBeginBlock() {
 	tests := map[string]struct {
diff --git a/x/epochs/keeper/keeper_test.go b/x/epochs/keeper/keeper_test.go
index 7029cb3f9..cc9f97ba2 100644
--- a/x/epochs/keeper/keeper_test.go
+++ b/x/epochs/keeper/keeper_test.go
@@ -48,10 +48,9 @@ func Setup() (sdk.Context, *epochskeeper.Keeper) {
 	epochsKeeper.InitGenesis(ctx, *types.DefaultGenesis())
 	SetEpochStartTime(ctx, epochsKeeper)
 	return ctx, epochsKeeper
-
 }
-func SetEpochStartTime(ctx sdk.Context, epochsKeeper *epochskeeper.Keeper) {
 
+func SetEpochStartTime(ctx sdk.Context, epochsKeeper *epochskeeper.Keeper) {
 	for _, epoch := range epochsKeeper.AllEpochInfos(ctx) {
 		epoch.StartTime = ctx.BlockTime()
 		epochsKeeper.DeleteEpochInfo(ctx, epoch.Identifier)
diff --git a/x/gamm/client/cli/cli_test.go b/x/gamm/client/cli/cli_test.go
index 0eecf4f4d..dedf5c48b 100644
--- a/x/gamm/client/cli/cli_test.go
+++ b/x/gamm/client/cli/cli_test.go
@@ -315,7 +315,7 @@ func TestNewMigrateSharesToFullRangeConcentratedPosition(t *testing.T) {
 			ExpectedMsg: &balancer.MsgMigrateSharesToFullRangeConcentratedPosition{
 				Sender:          testAddresses[0].String(),
 				SharesToMigrate: sdk.NewCoin("stake", sdk.NewInt(1000)),
-				TokenOutMins:  sdk.NewCoins(sdk.NewInt64Coin("stake", 100), sdk.NewInt64Coin("uosmo", 1000)),
+				TokenOutMins:    sdk.NewCoins(sdk.NewInt64Coin("stake", 100), sdk.NewInt64Coin("uosmo", 1000)),
 			},
 		},
 	}
diff --git a/x/gamm/client/cli/tx_test.go b/x/gamm/client/cli/tx_test.go
index 48f493ec1..293496408 100644
--- a/x/gamm/client/cli/tx_test.go
+++ b/x/gamm/client/cli/tx_test.go
@@ -61,7 +61,6 @@ func TestParseCoinsNoSort(t *testing.T) {
 
 	for name, tc := range tests {
 		t.Run(name, func(t *testing.T) {
-
 			coins, err := cli.ParseCoinsNoSort(tc.coinsStr)
 
 			require.NoError(t, err)
diff --git a/x/gamm/keeper/genesis_test.go b/x/gamm/keeper/genesis_test.go
index 20ea53c97..11dee6197 100644
--- a/x/gamm/keeper/genesis_test.go
+++ b/x/gamm/keeper/genesis_test.go
@@ -17,13 +17,11 @@ import (
 	"github.com/osmosis-labs/osmosis/v15/x/gamm/types"
 )
 
-var (
-	DefaultMigrationRecords = types.MigrationRecords{BalancerToConcentratedPoolLinks: []types.BalancerToConcentratedPoolLink{
-		{BalancerPoolId: 1, ClPoolId: 4},
-		{BalancerPoolId: 2, ClPoolId: 5},
-		{BalancerPoolId: 3, ClPoolId: 6},
-	}}
-)
+var DefaultMigrationRecords = types.MigrationRecords{BalancerToConcentratedPoolLinks: []types.BalancerToConcentratedPoolLink{
+	{BalancerPoolId: 1, ClPoolId: 4},
+	{BalancerPoolId: 2, ClPoolId: 5},
+	{BalancerPoolId: 3, ClPoolId: 6},
+}}
 
 func TestGammInitGenesis(t *testing.T) {
 	app := osmoapp.Setup(false)
diff --git a/x/gamm/keeper/pool_test.go b/x/gamm/keeper/pool_test.go
index 722a48650..65fb34180 100644
--- a/x/gamm/keeper/pool_test.go
+++ b/x/gamm/keeper/pool_test.go
@@ -378,7 +378,6 @@ func (suite *KeeperTestSuite) TestConvertToCFMMPool() {
 // change the underlying bytes. This shows that migrations are
 // not necessary.
 func (suite *KeeperTestSuite) TestMarshalUnmarshalPool() {
-
 	suite.SetupTest()
 	k := suite.App.GAMMKeeper
 
@@ -525,5 +524,4 @@ func (suite *KeeperTestSuite) TestSetStableSwapScalingFactors() {
 			}
 		})
 	}
-
 }
diff --git a/x/gamm/pool-models/balancer/pool_suite_test.go b/x/gamm/pool-models/balancer/pool_suite_test.go
index 13f0ad57c..0bc9051d7 100644
--- a/x/gamm/pool-models/balancer/pool_suite_test.go
+++ b/x/gamm/pool-models/balancer/pool_suite_test.go
@@ -1007,7 +1007,7 @@ func (suite *KeeperTestSuite) TestRandomizedJoinPoolExitPoolInvariants() {
 		denomIn  = "denomIn"
 	)
 
-	now := int64(time.Now().Unix())
+	now := time.Now().Unix()
 	rng := rand.NewSource(now)
 	suite.T().Logf("Using random source of %d\n", now)
 
diff --git a/x/gamm/pool-models/balancer/pool_test.go b/x/gamm/pool-models/balancer/pool_test.go
index 6aa90b864..078929d6c 100644
--- a/x/gamm/pool-models/balancer/pool_test.go
+++ b/x/gamm/pool-models/balancer/pool_test.go
@@ -19,7 +19,7 @@ import (
 
 var (
 	defaultSwapFee            = sdk.MustNewDecFromStr("0.025")
-	defaultZeroExitFee            = sdk.ZeroDec()
+	defaultZeroExitFee        = sdk.ZeroDec()
 	defaultPoolId             = uint64(10)
 	defaultBalancerPoolParams = balancer.PoolParams{
 		SwapFee: defaultSwapFee,
@@ -570,7 +570,8 @@ func (suite *BalancerTestSuite) TestBalancerCalculateAmountOutAndIn_InverseRelat
 				suite.Require().NotNil(pool)
 
 				errTolerance := osmomath.ErrTolerance{
-					AdditiveTolerance: sdk.OneDec(), MultiplicativeTolerance: sdk.Dec{}}
+					AdditiveTolerance: sdk.OneDec(), MultiplicativeTolerance: sdk.Dec{},
+				}
 				sut := func() {
 					test_helpers.TestCalculateAmountOutAndIn_InverseRelationship(suite.T(), ctx, pool, poolAssetIn.Token.Denom, poolAssetOut.Token.Denom, tc.initialCalcOut, swapFeeDec, errTolerance)
 				}
diff --git a/x/gamm/pool-models/stableswap/msgs_test.go b/x/gamm/pool-models/stableswap/msgs_test.go
index ea20a8891..869242e1a 100644
--- a/x/gamm/pool-models/stableswap/msgs_test.go
+++ b/x/gamm/pool-models/stableswap/msgs_test.go
@@ -338,7 +338,6 @@ func (suite *TestSuite) TestMsgCreateStableswapPool() {
 
 	for name, tc := range tests {
 		suite.Run(name, func() {
-
 			pool, err := tc.msg.CreatePool(suite.Ctx, 1)
 
 			if tc.expectError {
diff --git a/x/gamm/pool-models/stableswap/pool_test.go b/x/gamm/pool-models/stableswap/pool_test.go
index 5cab54fa3..3b489523d 100644
--- a/x/gamm/pool-models/stableswap/pool_test.go
+++ b/x/gamm/pool-models/stableswap/pool_test.go
@@ -1365,7 +1365,6 @@ func TestStableswapSpotPrice(t *testing.T) {
 }
 
 func TestValidateScalingFactors(t *testing.T) {
-
 	tests := map[string]struct {
 		scalingFactors []uint64
 		numAssets      int
diff --git a/x/ibc-rate-limit/ibc_middleware_test.go b/x/ibc-rate-limit/ibc_middleware_test.go
index 541e0895c..489b63782 100644
--- a/x/ibc-rate-limit/ibc_middleware_test.go
+++ b/x/ibc-rate-limit/ibc_middleware_test.go
@@ -147,9 +147,9 @@ func (suite *MiddlewareTestSuite) TestInvalidReceiver() {
 		0,
 	)
 	_, ack, _ := suite.FullSendBToA(msg)
-	suite.Require().Contains(string(ack), "error",
+	suite.Require().Contains(ack, "error",
 		"acknowledgment is not an error")
-	suite.Require().Contains(string(ack), fmt.Sprintf("ABCI code: %d", types.ErrBadMessage.ABCICode()),
+	suite.Require().Contains(ack, fmt.Sprintf("ABCI code: %d", types.ErrBadMessage.ABCICode()),
 		"acknowledgment error is not of the right type")
 }
 
@@ -218,12 +218,12 @@ func (suite *MiddlewareTestSuite) AssertReceive(success bool, msg sdk.Msg) (stri
 	_, ack, err := suite.FullSendBToA(msg)
 	if success {
 		suite.Require().NoError(err)
-		suite.Require().NotContains(string(ack), "error",
+		suite.Require().NotContains(ack, "error",
 			"acknowledgment is an error")
 	} else {
-		suite.Require().Contains(string(ack), "error",
+		suite.Require().Contains(ack, "error",
 			"acknowledgment is not an error")
-		suite.Require().Contains(string(ack), fmt.Sprintf("ABCI code: %d", types.ErrRateLimitExceeded.ABCICode()),
+		suite.Require().Contains(ack, fmt.Sprintf("ABCI code: %d", types.ErrRateLimitExceeded.ABCICode()),
 			"acknowledgment error is not of the right type")
 	}
 	return ack, err
diff --git a/x/incentives/client/cli/cli_test.go b/x/incentives/client/cli/cli_test.go
index 841e99411..3afa1fe40 100644
--- a/x/incentives/client/cli/cli_test.go
+++ b/x/incentives/client/cli/cli_test.go
@@ -52,7 +52,8 @@ func TestGetCmdActiveGauges(t *testing.T) {
 			Cmd: "--offset=2",
 			ExpectedQuery: &types.ActiveGaugesRequest{
 				Pagination: &query.PageRequest{Key: []uint8{}, Offset: 2, Limit: 100},
-			}},
+			},
+		},
 	}
 	osmocli.RunQueryTestCases(t, desc, tcs)
 }
@@ -65,7 +66,8 @@ func TestGetCmdActiveGaugesPerDenom(t *testing.T) {
 			ExpectedQuery: &types.ActiveGaugesPerDenomRequest{
 				Denom:      "uosmo",
 				Pagination: &query.PageRequest{Key: []uint8{}, Offset: 2, Limit: 100},
-			}},
+			},
+		},
 	}
 	osmocli.RunQueryTestCases(t, desc, tcs)
 }
@@ -77,7 +79,8 @@ func TestGetCmdUpcomingGauges(t *testing.T) {
 			Cmd: "--offset=2",
 			ExpectedQuery: &types.UpcomingGaugesRequest{
 				Pagination: &query.PageRequest{Key: []uint8{}, Offset: 2, Limit: 100},
-			}},
+			},
+		},
 	}
 	osmocli.RunQueryTestCases(t, desc, tcs)
 }
@@ -90,7 +93,8 @@ func TestGetCmdUpcomingGaugesPerDenom(t *testing.T) {
 			ExpectedQuery: &types.UpcomingGaugesPerDenomRequest{
 				Denom:      "uosmo",
 				Pagination: &query.PageRequest{Key: []uint8{}, Offset: 2, Limit: 100},
-			}},
+			},
+		},
 	}
 	osmocli.RunQueryTestCases(t, desc, tcs)
 }
diff --git a/x/incentives/keeper/msg_server_test.go b/x/incentives/keeper/msg_server_test.go
index 4e4ce9cbb..9ecbbf880 100644
--- a/x/incentives/keeper/msg_server_test.go
+++ b/x/incentives/keeper/msg_server_test.go
@@ -17,8 +17,10 @@ import (
 
 var _ = suite.TestingSuite(nil)
 
-var seventyTokens = sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(70000000)))
-var tenTokens = sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(10000000)))
+var (
+	seventyTokens = sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(70000000)))
+	tenTokens     = sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(10000000)))
+)
 
 func (suite *KeeperTestSuite) TestCreateGauge_Fee() {
 	tests := []struct {
diff --git a/x/lockup/keeper/grpc_query_test.go b/x/lockup/keeper/grpc_query_test.go
index 308a1448d..cd84867b1 100644
--- a/x/lockup/keeper/grpc_query_test.go
+++ b/x/lockup/keeper/grpc_query_test.go
@@ -343,7 +343,7 @@ func (suite *KeeperTestSuite) TestLockedByID() {
 	addr1 := sdk.AccAddress([]byte("addr1---------------"))
 
 	// lock by not available id check
-	res, err := suite.querier.LockedByID(sdk.WrapSDKContext(suite.Ctx), &types.LockedRequest{LockId: 0})
+	_, err := suite.querier.LockedByID(sdk.WrapSDKContext(suite.Ctx), &types.LockedRequest{LockId: 0})
 	suite.Require().Error(err)
 
 	// lock coins
@@ -351,7 +351,7 @@ func (suite *KeeperTestSuite) TestLockedByID() {
 	suite.LockTokens(addr1, coins, time.Second)
 
 	// lock by available available id check
-	res, err = suite.querier.LockedByID(sdk.WrapSDKContext(suite.Ctx), &types.LockedRequest{LockId: 1})
+	res, err := suite.querier.LockedByID(sdk.WrapSDKContext(suite.Ctx), &types.LockedRequest{LockId: 1})
 	suite.Require().NoError(err)
 	suite.Require().Equal(res.Lock.ID, uint64(1))
 	suite.Require().Equal(res.Lock.Owner, addr1.String())
@@ -389,11 +389,11 @@ func (suite *KeeperTestSuite) TestAccountLockedLongerDuration() {
 	addr1 := sdk.AccAddress([]byte("addr1---------------"))
 
 	// empty address locks longer than duration check
-	res, err := suite.querier.AccountLockedLongerDuration(sdk.WrapSDKContext(suite.Ctx), &types.AccountLockedLongerDurationRequest{Owner: "", Duration: time.Second})
+	_, err := suite.querier.AccountLockedLongerDuration(sdk.WrapSDKContext(suite.Ctx), &types.AccountLockedLongerDurationRequest{Owner: "", Duration: time.Second})
 	suite.Require().Error(err)
 
 	// initial check
-	res, err = suite.querier.AccountLockedLongerDuration(sdk.WrapSDKContext(suite.Ctx), &types.AccountLockedLongerDurationRequest{Owner: addr1.String(), Duration: time.Second})
+	res, err := suite.querier.AccountLockedLongerDuration(sdk.WrapSDKContext(suite.Ctx), &types.AccountLockedLongerDurationRequest{Owner: addr1.String(), Duration: time.Second})
 	suite.Require().NoError(err)
 	suite.Require().Len(res.Locks, 0)
 
@@ -423,11 +423,11 @@ func (suite *KeeperTestSuite) TestAccountLockedLongerDurationNotUnlockingOnly()
 	addr1 := sdk.AccAddress([]byte("addr1---------------"))
 
 	// empty address locks longer than duration check
-	res, err := suite.querier.AccountLockedLongerDurationNotUnlockingOnly(sdk.WrapSDKContext(suite.Ctx), &types.AccountLockedLongerDurationNotUnlockingOnlyRequest{Owner: "", Duration: time.Second})
+	_, err := suite.querier.AccountLockedLongerDurationNotUnlockingOnly(sdk.WrapSDKContext(suite.Ctx), &types.AccountLockedLongerDurationNotUnlockingOnlyRequest{Owner: "", Duration: time.Second})
 	suite.Require().Error(err)
 
 	// initial check
-	res, err = suite.querier.AccountLockedLongerDurationNotUnlockingOnly(sdk.WrapSDKContext(suite.Ctx), &types.AccountLockedLongerDurationNotUnlockingOnlyRequest{Owner: addr1.String(), Duration: time.Second})
+	res, err := suite.querier.AccountLockedLongerDurationNotUnlockingOnly(sdk.WrapSDKContext(suite.Ctx), &types.AccountLockedLongerDurationNotUnlockingOnlyRequest{Owner: addr1.String(), Duration: time.Second})
 	suite.Require().NoError(err)
 	suite.Require().Len(res.Locks, 0)
 
@@ -453,11 +453,11 @@ func (suite *KeeperTestSuite) TestAccountLockedLongerDurationDenom() {
 	addr1 := sdk.AccAddress([]byte("addr1---------------"))
 
 	// empty address locks longer than duration by denom check
-	res, err := suite.querier.AccountLockedLongerDurationDenom(sdk.WrapSDKContext(suite.Ctx), &types.AccountLockedLongerDurationDenomRequest{Owner: "", Duration: time.Second, Denom: "stake"})
+	_, err := suite.querier.AccountLockedLongerDurationDenom(sdk.WrapSDKContext(suite.Ctx), &types.AccountLockedLongerDurationDenomRequest{Owner: "", Duration: time.Second, Denom: "stake"})
 	suite.Require().Error(err)
 
 	// initial check
-	res, err = suite.querier.AccountLockedLongerDurationDenom(sdk.WrapSDKContext(suite.Ctx), &types.AccountLockedLongerDurationDenomRequest{Owner: addr1.String(), Duration: time.Second, Denom: "stake"})
+	res, err := suite.querier.AccountLockedLongerDurationDenom(sdk.WrapSDKContext(suite.Ctx), &types.AccountLockedLongerDurationDenomRequest{Owner: addr1.String(), Duration: time.Second, Denom: "stake"})
 	suite.Require().NoError(err)
 	suite.Require().Len(res.Locks, 0)
 
diff --git a/x/lockup/keeper/lock_test.go b/x/lockup/keeper/lock_test.go
index 7d923e573..764d41051 100644
--- a/x/lockup/keeper/lock_test.go
+++ b/x/lockup/keeper/lock_test.go
@@ -235,7 +235,7 @@ func (suite *KeeperTestSuite) TestUnlock() {
 		ctx := suite.Ctx
 
 		addr1 := sdk.AccAddress([]byte("addr1---------------"))
-		lock := types.NewPeriodLock(1, addr1, time.Second, time.Time{}, tc.fundAcc)
+		_ = types.NewPeriodLock(1, addr1, time.Second, time.Time{}, tc.fundAcc)
 
 		// lock with balance
 		suite.FundAcc(addr1, tc.fundAcc)
@@ -319,7 +319,6 @@ func (suite *KeeperTestSuite) TestUnlock() {
 }
 
 func (suite *KeeperTestSuite) TestUnlockMaturedLockInternalLogic() {
-
 	testCases := []struct {
 		name                       string
 		coinsLocked, coinsBurned   sdk.Coins
@@ -417,7 +416,6 @@ func (suite *KeeperTestSuite) TestUnlockMaturedLockInternalLogic() {
 					suite.Require().Equal(sdk.ZeroInt().String(), assetsSupplyAtLockEnd.AmountOf(coin.Denom).String())
 				}
 			}
-
 		})
 	}
 }
diff --git a/x/pool-incentives/keeper/keeper_test.go b/x/pool-incentives/keeper/keeper_test.go
index be029d5c1..cedbd9feb 100644
--- a/x/pool-incentives/keeper/keeper_test.go
+++ b/x/pool-incentives/keeper/keeper_test.go
@@ -112,7 +112,7 @@ func (suite *KeeperTestSuite) TestCreateLockablePoolGauges() {
 			name:                   "Create Gauge with valid PoolId",
 			poolId:                 uint64(1),
 			expectedGaugeDurations: durations,
-			expectedGaugeIds:       []uint64{4, 5, 6}, //note: it's not 1,2,3 because we create 3 gauges during setup of suite.PrepareBalancerPool()
+			expectedGaugeIds:       []uint64{4, 5, 6}, // note: it's not 1,2,3 because we create 3 gauges during setup of suite.PrepareBalancerPool()
 			expectedErr:            false,
 		},
 		{
@@ -303,7 +303,6 @@ func (suite *KeeperTestSuite) TestGetLongestLockableDuration() {
 
 	for _, tc := range testCases {
 		suite.Run(tc.name, func() {
-
 			suite.App.PoolIncentivesKeeper.SetLockableDurations(suite.Ctx, tc.lockableDurations)
 
 			result, err := suite.App.PoolIncentivesKeeper.GetLongestLockableDuration(suite.Ctx)
diff --git a/x/poolmanager/client/cli/cli_test.go b/x/poolmanager/client/cli/cli_test.go
index c4e93a3f0..75f75f0e3 100644
--- a/x/poolmanager/client/cli/cli_test.go
+++ b/x/poolmanager/client/cli/cli_test.go
@@ -63,7 +63,6 @@ func (s *IntegrationTestSuite) TearDownSuite() {
 }
 
 func TestIntegrationTestSuite(t *testing.T) {
-
 	// TODO: re-enable this once poolmanager is fully merged.
 	t.SkipNow()
 
diff --git a/x/poolmanager/client/cli/query_test.go b/x/poolmanager/client/cli/query_test.go
index c1fe49608..fa595f95e 100644
--- a/x/poolmanager/client/cli/query_test.go
+++ b/x/poolmanager/client/cli/query_test.go
@@ -2,9 +2,10 @@ package cli_test
 
 import (
 	gocontext "context"
-	"github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
 	"testing"
 
+	"github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+
 	"github.com/stretchr/testify/suite"
 
 	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
diff --git a/x/poolmanager/client/cli/tx_test.go b/x/poolmanager/client/cli/tx_test.go
index bbc8684ad..9a4997574 100644
--- a/x/poolmanager/client/cli/tx_test.go
+++ b/x/poolmanager/client/cli/tx_test.go
@@ -61,7 +61,6 @@ func TestParseCoinsNoSort(t *testing.T) {
 
 	for name, tc := range tests {
 		t.Run(name, func(t *testing.T) {
-
 			coins, err := cli.ParseCoinsNoSort(tc.coinsStr)
 
 			require.NoError(t, err)
diff --git a/x/poolmanager/create_pool_test.go b/x/poolmanager/create_pool_test.go
index 8f33ad3b1..1208e9ec4 100644
--- a/x/poolmanager/create_pool_test.go
+++ b/x/poolmanager/create_pool_test.go
@@ -116,7 +116,6 @@ func (suite *KeeperTestSuite) TestPoolCreationFee() {
 
 // TestCreatePool tests that all possible pools are created correctly.
 func (suite *KeeperTestSuite) TestCreatePool() {
-
 	var (
 		validBalancerPoolMsg = balancer.NewMsgCreateBalancerPool(suite.TestAccs[0], balancer.NewPoolParams(sdk.ZeroDec(), sdk.ZeroDec(), nil), []balancer.PoolAsset{
 			{
diff --git a/x/poolmanager/export_test.go b/x/poolmanager/export_test.go
index 9b0faad18..d659850f6 100644
--- a/x/poolmanager/export_test.go
+++ b/x/poolmanager/export_test.go
@@ -6,16 +6,15 @@ import (
 	"github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
 )
 
-var (
-	IntMaxValue = intMaxValue
-)
+var IntMaxValue = intMaxValue
 
 func (k Keeper) GetNextPoolIdAndIncrement(ctx sdk.Context) uint64 {
 	return k.getNextPoolIdAndIncrement(ctx)
 }
 
 func (k Keeper) GetOsmoRoutedMultihopTotalSwapFee(ctx sdk.Context, route types.MultihopRoute) (
-	totalPathSwapFee sdk.Dec, sumOfSwapFees sdk.Dec, err error) {
+	totalPathSwapFee sdk.Dec, sumOfSwapFees sdk.Dec, err error,
+) {
 	return k.getOsmoRoutedMultihopTotalSwapFee(ctx, route)
 }
 
diff --git a/x/poolmanager/types/msgs_test.go b/x/poolmanager/types/msgs_test.go
index 11fddc0e7..184df735b 100644
--- a/x/poolmanager/types/msgs_test.go
+++ b/x/poolmanager/types/msgs_test.go
@@ -443,7 +443,6 @@ func TestMsgSplitRouteSwapExactAmountIn(t *testing.T) {
 	for name, tc := range tests {
 		tc := tc
 		t.Run(name, func(t *testing.T) {
-
 			err := tc.msg.ValidateBasic()
 
 			if tc.expectError {
@@ -558,7 +557,6 @@ func TestMsgSplitRouteSwapExactAmountOut(t *testing.T) {
 	for name, tc := range tests {
 		tc := tc
 		t.Run(name, func(t *testing.T) {
-
 			err := tc.msg.ValidateBasic()
 
 			if tc.expectError {
diff --git a/x/protorev/keeper/developer_fees_test.go b/x/protorev/keeper/developer_fees_test.go
index 8f2af6cd2..adaaff1e7 100644
--- a/x/protorev/keeper/developer_fees_test.go
+++ b/x/protorev/keeper/developer_fees_test.go
@@ -131,7 +131,6 @@ func (suite *KeeperTestSuite) TestUpdateDeveloperFees() {
 			profit:      sdk.NewInt(200),
 			alterState: func() {
 				suite.App.ProtoRevKeeper.SetDaysSinceModuleGenesis(suite.Ctx, 731)
-
 			},
 			expected: sdk.NewCoin(types.OsmosisDenomination, sdk.NewInt(10)),
 		},
@@ -141,7 +140,6 @@ func (suite *KeeperTestSuite) TestUpdateDeveloperFees() {
 			profit:      sdk.NewInt(200),
 			alterState: func() {
 				suite.App.ProtoRevKeeper.SetDaysSinceModuleGenesis(suite.Ctx, 365*10+1)
-
 			},
 			expected: sdk.NewCoin(types.OsmosisDenomination, sdk.NewInt(10)),
 		},
diff --git a/x/protorev/keeper/epoch_hook_test.go b/x/protorev/keeper/epoch_hook_test.go
index 5c3cba341..e7075d3ef 100644
--- a/x/protorev/keeper/epoch_hook_test.go
+++ b/x/protorev/keeper/epoch_hook_test.go
@@ -3,7 +3,6 @@ package keeper_test
 import (
 	"fmt"
 	"strings"
-
 	"testing"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
diff --git a/x/protorev/keeper/grpc_query_test.go b/x/protorev/keeper/grpc_query_test.go
index 5dad19b40..9c8b398df 100644
--- a/x/protorev/keeper/grpc_query_test.go
+++ b/x/protorev/keeper/grpc_query_test.go
@@ -279,7 +279,6 @@ func (suite *KeeperTestSuite) TestGetProtoRevDeveloperAccount() {
 	res, err = suite.queryClient.GetProtoRevDeveloperAccount(sdk.WrapSDKContext(suite.Ctx), req)
 	suite.Require().NoError(err)
 	suite.Require().Equal(developerAccount.String(), res.DeveloperAccount)
-
 }
 
 // TestGetProtoRevPoolWeights tests the query to retrieve the pool weights
diff --git a/x/protorev/keeper/msg_server_test.go b/x/protorev/keeper/msg_server_test.go
index 9d36a56f5..19263d927 100644
--- a/x/protorev/keeper/msg_server_test.go
+++ b/x/protorev/keeper/msg_server_test.go
@@ -222,7 +222,6 @@ func (suite *KeeperTestSuite) TestMsgSetHotRoutes() {
 			} else {
 				suite.Require().Error(err)
 			}
-
 		})
 	}
 }
diff --git a/x/protorev/keeper/posthandler_test.go b/x/protorev/keeper/posthandler_test.go
index dc654197e..e87643e9e 100644
--- a/x/protorev/keeper/posthandler_test.go
+++ b/x/protorev/keeper/posthandler_test.go
@@ -554,7 +554,6 @@ func (suite *KeeperTestSuite) TestAnteHandle() {
 			} else if strings.Contains(tc.name, "Block Pool Points Limit") {
 				suite.App.ProtoRevKeeper.SetMaxPointsPerBlock(suite.Ctx, 100)
 			}
-
 		})
 	}
 }
@@ -915,7 +914,6 @@ func (suite *KeeperTestSuite) TestExtractSwappedPools() {
 
 	for _, tc := range tests {
 		suite.Run(tc.name, func() {
-
 			suite.Ctx = suite.Ctx.WithIsCheckTx(tc.params.isCheckTx)
 			suite.Ctx = suite.Ctx.WithGasMeter(sdk.NewInfiniteGasMeter())
 			suite.Ctx = suite.Ctx.WithMinGasPrices(tc.params.minGasPrices)
diff --git a/x/protorev/keeper/rebalance_test.go b/x/protorev/keeper/rebalance_test.go
index 6aaa42c1b..47de1af64 100644
--- a/x/protorev/keeper/rebalance_test.go
+++ b/x/protorev/keeper/rebalance_test.go
@@ -23,7 +23,8 @@ var routeTwoAssetSameWeight = poolmanagertypes.SwapAmountInRoutes{
 	poolmanagertypes.SwapAmountInRoute{
 		PoolId:        24,
 		TokenOutDenom: "uosmo",
-	}}
+	},
+}
 
 // Mainnet Arb Route - Multi Asset, Same Weights (Block: 6906570)
 // expectedAmtIn:  sdk.NewInt(4800000),
@@ -40,7 +41,8 @@ var routeMultiAssetSameWeight = poolmanagertypes.SwapAmountInRoutes{
 	poolmanagertypes.SwapAmountInRoute{
 		PoolId:        27,
 		TokenOutDenom: "uosmo",
-	}}
+	},
+}
 
 // Arb Route - Multi Asset, Same Weights - Pool 22 instead of 26 (Block: 6906570)
 // expectedAmtIn:  sdk.NewInt(519700000),
@@ -57,7 +59,8 @@ var routeMostProfitable = poolmanagertypes.SwapAmountInRoutes{
 	poolmanagertypes.SwapAmountInRoute{
 		PoolId:        27,
 		TokenOutDenom: "uosmo",
-	}}
+	},
+}
 
 // Mainnet Arb Route - Multi Asset, Different Weights (Block: 6908256)
 // expectedAmtIn:  sdk.NewInt(4100000),
@@ -74,7 +77,8 @@ var routeDiffDenom = poolmanagertypes.SwapAmountInRoutes{
 	poolmanagertypes.SwapAmountInRoute{
 		PoolId:        33,
 		TokenOutDenom: "Atom",
-	}}
+	},
+}
 
 // No Arbitrage Opportunity
 // expectedAmtIn:  sdk.NewInt(0),
@@ -91,7 +95,8 @@ var routeNoArb = poolmanagertypes.SwapAmountInRoutes{
 	poolmanagertypes.SwapAmountInRoute{
 		PoolId:        8,
 		TokenOutDenom: "uosmo",
-	}}
+	},
+}
 
 // StableSwap Test Route
 // expectedAmtIn:  sdk.NewInt(137600000),
@@ -108,7 +113,8 @@ var routeStableSwap = poolmanagertypes.SwapAmountInRoutes{
 	poolmanagertypes.SwapAmountInRoute{
 		PoolId:        30,
 		TokenOutDenom: "uosmo",
-	}}
+	},
+}
 
 // Four Pool Test Route (Mainnet Block: 1855422)
 // expectedAmtIn:  sdk.NewInt(1_147_000_000)
@@ -171,7 +177,6 @@ var panicRoute = poolmanagertypes.SwapAmountInRoutes{
 }
 
 func (suite *KeeperTestSuite) TestFindMaxProfitRoute() {
-
 	type param struct {
 		route           poolmanagertypes.SwapAmountInRoutes
 		expectedAmtIn   sdk.Int
@@ -319,7 +324,6 @@ func (suite *KeeperTestSuite) TestFindMaxProfitRoute() {
 }
 
 func (suite *KeeperTestSuite) TestExecuteTrade() {
-
 	type param struct {
 		route          poolmanagertypes.SwapAmountInRoutes
 		inputCoin      sdk.Coin
@@ -444,7 +448,8 @@ func (suite *KeeperTestSuite) TestIterateRoutes() {
 		params     paramm
 		expectPass bool
 	}{
-		{name: "Single Route Test",
+		{
+			name: "Single Route Test",
 			params: paramm{
 				routes:                     []poolmanagertypes.SwapAmountInRoutes{routeTwoAssetSameWeight},
 				expectedMaxProfitAmount:    sdk.NewInt(24848),
@@ -454,7 +459,8 @@ func (suite *KeeperTestSuite) TestIterateRoutes() {
 			},
 			expectPass: true,
 		},
-		{name: "Two routes with same arb denom test - more profitable route second",
+		{
+			name: "Two routes with same arb denom test - more profitable route second",
 			params: paramm{
 				routes:                     []poolmanagertypes.SwapAmountInRoutes{routeMultiAssetSameWeight, routeTwoAssetSameWeight},
 				expectedMaxProfitAmount:    sdk.NewInt(24848),
@@ -464,7 +470,8 @@ func (suite *KeeperTestSuite) TestIterateRoutes() {
 			},
 			expectPass: true,
 		},
-		{name: "Three routes with same arb denom test - most profitable route first",
+		{
+			name: "Three routes with same arb denom test - most profitable route first",
 			params: paramm{
 				routes:                     []poolmanagertypes.SwapAmountInRoutes{routeMostProfitable, routeMultiAssetSameWeight, routeTwoAssetSameWeight},
 				expectedMaxProfitAmount:    sdk.NewInt(67511675),
@@ -474,7 +481,8 @@ func (suite *KeeperTestSuite) TestIterateRoutes() {
 			},
 			expectPass: true,
 		},
-		{name: "Two routes, different arb denoms test - more profitable route second",
+		{
+			name: "Two routes, different arb denoms test - more profitable route second",
 			params: paramm{
 				routes:                     []poolmanagertypes.SwapAmountInRoutes{routeNoArb, routeDiffDenom},
 				expectedMaxProfitAmount:    sdk.NewInt(4880),
@@ -484,7 +492,8 @@ func (suite *KeeperTestSuite) TestIterateRoutes() {
 			},
 			expectPass: true,
 		},
-		{name: "Four-pool route test",
+		{
+			name: "Four-pool route test",
 			params: paramm{
 				routes:                     []poolmanagertypes.SwapAmountInRoutes{fourPoolRoute},
 				expectedMaxProfitAmount:    sdk.NewInt(13_202_729),
@@ -494,7 +503,8 @@ func (suite *KeeperTestSuite) TestIterateRoutes() {
 			},
 			expectPass: true,
 		},
-		{name: "Two-pool route test",
+		{
+			name: "Two-pool route test",
 			params: paramm{
 				routes:                     []poolmanagertypes.SwapAmountInRoutes{twoPoolRoute},
 				expectedMaxProfitAmount:    sdk.NewInt(198_653_535),
@@ -543,7 +553,8 @@ func (suite *KeeperTestSuite) TestConvertProfits() {
 		param      param
 		expectPass bool
 	}{
-		{name: "Convert atom to uosmo",
+		{
+			name: "Convert atom to uosmo",
 			param: param{
 				inputCoin:           sdk.NewCoin("Atom", sdk.NewInt(100)),
 				profit:              sdk.NewInt(10),
@@ -551,7 +562,8 @@ func (suite *KeeperTestSuite) TestConvertProfits() {
 			},
 			expectPass: true,
 		},
-		{name: "Convert juno to uosmo (random denom)",
+		{
+			name: "Convert juno to uosmo (random denom)",
 			param: param{
 				inputCoin:           sdk.NewCoin("juno", sdk.NewInt(100)),
 				profit:              sdk.NewInt(10),
@@ -559,7 +571,8 @@ func (suite *KeeperTestSuite) TestConvertProfits() {
 			},
 			expectPass: true,
 		},
-		{name: "Convert denom without pool to uosmo",
+		{
+			name: "Convert denom without pool to uosmo",
 			param: param{
 				inputCoin:           sdk.NewCoin("random", sdk.NewInt(100)),
 				profit:              sdk.NewInt(10),
diff --git a/x/protorev/keeper/routes_test.go b/x/protorev/keeper/routes_test.go
index 53df0bf75..edaca6993 100644
--- a/x/protorev/keeper/routes_test.go
+++ b/x/protorev/keeper/routes_test.go
@@ -361,7 +361,6 @@ func (suite *KeeperTestSuite) TestCalculateRoutePoolPoints() {
 			} else {
 				suite.Require().Error(err)
 			}
-
 		})
 	}
 }
diff --git a/x/superfluid/keeper/concentrated_liquidity_test.go b/x/superfluid/keeper/concentrated_liquidity_test.go
index 7b459bcf6..9fc7f8b54 100644
--- a/x/superfluid/keeper/concentrated_liquidity_test.go
+++ b/x/superfluid/keeper/concentrated_liquidity_test.go
@@ -221,7 +221,6 @@ func (suite *KeeperTestSuite) TestAddToConcentratedLiquiditySuperfluidPosition()
 			delegationAmt, found := stakingKeeper.GetDelegation(ctx, newIntermediaryAcc, valAddr)
 			suite.Require().True(found)
 			suite.Require().Equal(expectedDelegationAmt, delegationAmt.Shares.TruncateInt())
-
 		})
 	}
 }
@@ -247,7 +246,7 @@ func (suite *KeeperTestSuite) SetupSuperfluidConcentratedPosition(ctx sdk.Contex
 	}
 
 	// Set up a single validator.
-	valAddr = suite.SetupValidator(stakingtypes.BondStatus(stakingtypes.Bonded))
+	valAddr = suite.SetupValidator(stakingtypes.Bonded)
 
 	// Create a cl pool.
 	clPool := suite.PrepareCustomConcentratedPool(poolCreateAcc, defaultPoolAssets[0].Token.Denom, defaultPoolAssets[1].Token.Denom, 1, sdk.ZeroDec())
diff --git a/x/superfluid/keeper/gov/gov_test.go b/x/superfluid/keeper/gov/gov_test.go
index 16537db71..8a7927bd1 100644
--- a/x/superfluid/keeper/gov/gov_test.go
+++ b/x/superfluid/keeper/gov/gov_test.go
@@ -4,8 +4,8 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/tendermint/tendermint/crypto/ed25519"
 
-	cltypes "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
 	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
+	cltypes "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
 	"github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/balancer"
 	minttypes "github.com/osmosis-labs/osmosis/v15/x/mint/types"
 	"github.com/osmosis-labs/osmosis/v15/x/superfluid/keeper/gov"
@@ -189,9 +189,7 @@ func (suite *KeeperTestSuite) TestHandleUnpoolWhiteListChange() {
 		testDescription = "test description"
 	)
 
-	var (
-		basePoolIds = []uint64{1, 2, 3}
-	)
+	basePoolIds := []uint64{1, 2, 3}
 
 	tests := map[string]struct {
 		preCreatedPoolCount int
diff --git a/x/superfluid/keeper/grpc_query_test.go b/x/superfluid/keeper/grpc_query_test.go
index 144d164cd..23ddd9bd1 100644
--- a/x/superfluid/keeper/grpc_query_test.go
+++ b/x/superfluid/keeper/grpc_query_test.go
@@ -66,6 +66,7 @@ func (suite *KeeperTestSuite) TestTotalDelegationByValidatorForAsset() {
 		}
 	}
 }
+
 func (suite *KeeperTestSuite) TestGRPCSuperfluidAsset() {
 	suite.SetupTest()
 
diff --git a/x/superfluid/keeper/keeper_test.go b/x/superfluid/keeper/keeper_test.go
index dafb1ba1e..de91f0c33 100644
--- a/x/superfluid/keeper/keeper_test.go
+++ b/x/superfluid/keeper/keeper_test.go
@@ -20,9 +20,7 @@ import (
 	epochtypes "github.com/osmosis-labs/osmosis/x/epochs/types"
 )
 
-var (
-	DefaultGammAsset = "gamm/pool/1"
-)
+var DefaultGammAsset = "gamm/pool/1"
 
 type KeeperTestSuite struct {
 	apptesting.KeeperTestHelper
diff --git a/x/superfluid/keeper/migrate_test.go b/x/superfluid/keeper/migrate_test.go
index 153d7adf9..15c4592a1 100644
--- a/x/superfluid/keeper/migrate_test.go
+++ b/x/superfluid/keeper/migrate_test.go
@@ -736,7 +736,7 @@ func (suite *KeeperTestSuite) SetupMigrationTest(ctx sdk.Context, superfluidDele
 	}
 
 	// Set up a single validator.
-	valAddr = suite.SetupValidator(stakingtypes.BondStatus(stakingtypes.Bonded))
+	valAddr = suite.SetupValidator(stakingtypes.Bonded)
 
 	// Create a balancer pool of "stake" and "foo".
 	msg := balancer.NewMsgCreateBalancerPool(poolCreateAcc, balancer.PoolParams{
diff --git a/x/superfluid/keeper/msg_server_test.go b/x/superfluid/keeper/msg_server_test.go
index bb7baeaa7..2cf3795da 100644
--- a/x/superfluid/keeper/msg_server_test.go
+++ b/x/superfluid/keeper/msg_server_test.go
@@ -146,7 +146,6 @@ func (suite *KeeperTestSuite) TestMsgCreateFullRangePositionAndSuperfluidDelegat
 		expectedLockId     uint64
 		expectedPositionId uint64
 	}{
-
 		{
 			name:               "happy case",
 			param:              param{},
diff --git a/x/superfluid/keeper/unpool_test.go b/x/superfluid/keeper/unpool_test.go
index 601848da8..917d515c2 100644
--- a/x/superfluid/keeper/unpool_test.go
+++ b/x/superfluid/keeper/unpool_test.go
@@ -108,7 +108,7 @@ func (suite *KeeperTestSuite) TestUnpool() {
 			}
 
 			// set up validator
-			valAddr := suite.SetupValidator(stakingtypes.BondStatus(stakingtypes.Bonded))
+			valAddr := suite.SetupValidator(stakingtypes.Bonded)
 
 			// create pool of "stake" and "foo"
 			msg := balancer.NewMsgCreateBalancerPool(poolCreateAcc, balancer.PoolParams{
diff --git a/x/tokenfactory/keeper/admins_test.go b/x/tokenfactory/keeper/admins_test.go
index f638c4765..46f1e4297 100644
--- a/x/tokenfactory/keeper/admins_test.go
+++ b/x/tokenfactory/keeper/admins_test.go
@@ -45,7 +45,6 @@ func (suite *KeeperTestSuite) TestAdminMsgs() {
 
 	// Test burning from own account
 	_, err = suite.msgServer.Burn(sdk.WrapSDKContext(suite.Ctx), types.NewMsgBurn(suite.TestAccs[0].String(), sdk.NewInt64Coin(suite.defaultDenom, 5)))
-	addr0bal -= 5
 	suite.Require().NoError(err)
 	suite.Require().True(bankKeeper.GetBalance(suite.Ctx, suite.TestAccs[1], suite.defaultDenom).Amount.Int64() == addr1bal)
 
diff --git a/x/tokenfactory/keeper/before_send_test.go b/x/tokenfactory/keeper/before_send_test.go
index 66a5c7e51..ca018cba2 100644
--- a/x/tokenfactory/keeper/before_send_test.go
+++ b/x/tokenfactory/keeper/before_send_test.go
@@ -2,7 +2,7 @@ package keeper_test
 
 import (
 	"fmt"
-	"io/ioutil"
+	"os"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
@@ -90,7 +90,7 @@ func (suite *KeeperTestSuite) TestBeforeSendHook() {
 			suite.SetupTest()
 
 			// upload and instantiate wasm code
-			wasmCode, err := ioutil.ReadFile(tc.wasmFile)
+			wasmCode, err := os.ReadFile(tc.wasmFile)
 			suite.Require().NoError(err, "test: %v", tc.desc)
 			codeID, _, err := suite.contractKeeper.Create(suite.Ctx, suite.TestAccs[0], wasmCode, nil)
 			suite.Require().NoError(err, "test: %v", tc.desc)
diff --git a/x/twap/strategy_test.go b/x/twap/strategy_test.go
index f15b37f5b..55c106c0e 100644
--- a/x/twap/strategy_test.go
+++ b/x/twap/strategy_test.go
@@ -298,7 +298,6 @@ func (s *TestSuite) TestComputeGeometricStrategyTwap() {
 		tc := tc
 		s.Run(name, func() {
 			osmoassert.ConditionalPanic(s.T(), tc.expPanic, func() {
-
 				geometricStrategy := &twap.GeometricTwapStrategy{TwapKeeper: *s.App.TwapKeeper}
 				actualTwap := geometricStrategy.ComputeTwap(tc.startRecord, tc.endRecord, tc.quoteAsset)
 
diff --git a/x/valset-pref/msg_server_test.go b/x/valset-pref/msg_server_test.go
index fae31b98b..fc76a8469 100644
--- a/x/valset-pref/msg_server_test.go
+++ b/x/valset-pref/msg_server_test.go
@@ -220,7 +220,7 @@ func (suite *KeeperTestSuite) TestDelegateToValidatorSet() {
 		{
 			name:             "Delegate very small amount to existing valSet",
 			delegator:        sdk.AccAddress([]byte("addr4---------------")),
-			amountToDelegate: sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(010_013)), // small case
+			amountToDelegate: sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(0o10_013)), // small case
 			expectedShares:   []sdk.Dec{sdk.NewDec(821), sdk.NewDec(1355), sdk.NewDec(492), sdk.NewDec(1439)},
 			setValSet:        true,
 			expectPass:       true,
diff --git a/x/valset-pref/types/msgs_test.go b/x/valset-pref/types/msgs_test.go
index 6b9d3c6d2..4ce0eec9d 100644
--- a/x/valset-pref/types/msgs_test.go
+++ b/x/valset-pref/types/msgs_test.go
@@ -153,5 +153,4 @@ func TestMsgSetValidatorSetPreference(t *testing.T) {
 			}
 		})
 	}
-
 }
diff --git a/x/valset-pref/validator_set_test.go b/x/valset-pref/validator_set_test.go
index 01bcb7803..eecdc7e21 100644
--- a/x/valset-pref/validator_set_test.go
+++ b/x/valset-pref/validator_set_test.go
@@ -7,7 +7,6 @@ import (
 )
 
 func (suite *KeeperTestSuite) TestValidateLockForForceUnlock() {
-
 	locks := suite.SetupLocks(sdk.AccAddress([]byte("addr1---------------")))
 
 	tests := []struct {
@@ -211,7 +210,6 @@ func (suite *KeeperTestSuite) TestIsValidatorSetEqual() {
 			suite.Require().Equal(test.expectEqual, isEqual)
 		})
 	}
-
 }
 
 func (suite *KeeperTestSuite) TestIsPreferenceValid() {