linters and format

.github/lint.yml

@@ -0,0 +1,12 @@
+name: Lint
+on: [pull_request]
+jobs:
+  golangci-lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      - name: golangci-lint
+        uses: reviewdog/action-golangci-lint@v1
+        with:
+          github_token: ${{ secrets.github_token }}
+          reporter: github-pr-review

Makefile

@@ -103,6 +103,19 @@ clean:
 link-check:
 	@go run github.com/raviqqe/liche -r . --exclude "^http://127.*|^https://riot.im/app*|^http://kava-testnet*|^https://testnet-dex*"
 
+
+lint:
+	golangci-lint run
+	find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" | xargs gofmt -d -s
+	go mod verify
+.PHONY: lint
+
+format:
+	find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -name '*.pb.go' | xargs gofmt -w -s
+	find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -name '*.pb.go' | xargs misspell -w
+	find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -name '*.pb.go' | xargs goimports -w -local github.com/kava-labs/kava
+.PHONY: format
+
 ########################################
 ### Testing
 

app/sim_test.go

@@ -20,6 +20,11 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/slashing"
 	"github.com/cosmos/cosmos-sdk/x/staking"
 	"github.com/cosmos/cosmos-sdk/x/supply"
+	"github.com/stretchr/testify/require"
+	abci "github.com/tendermint/tendermint/abci/types"
+	"github.com/tendermint/tendermint/libs/log"
+	dbm "github.com/tendermint/tm-db"
+
 	"github.com/kava-labs/kava/x/auction"
 	"github.com/kava-labs/kava/x/bep3"
 	"github.com/kava-labs/kava/x/cdp"
@@ -27,10 +32,6 @@ import (
 	"github.com/kava-labs/kava/x/kavadist"
 	"github.com/kava-labs/kava/x/pricefeed"
 	validatorvesting "github.com/kava-labs/kava/x/validator-vesting"
-	"github.com/stretchr/testify/require"
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/libs/log"
-	dbm "github.com/tendermint/tm-db"
 )
 
 type StoreKeysPrefixes struct {

cmd/kvcli/main.go

@@ -8,13 +8,13 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 
-	amino "github.com/tendermint/go-amino"
 	"github.com/tendermint/tendermint/libs/cli"
 
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/client/lcd"
 	"github.com/cosmos/cosmos-sdk/client/rpc"
+	"github.com/cosmos/cosmos-sdk/codec"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/version"
 	"github.com/cosmos/cosmos-sdk/x/auth"
@@ -79,7 +79,7 @@ func main() {
 	}
 }
 
-func queryCmd(cdc *amino.Codec) *cobra.Command {
+func queryCmd(cdc *codec.Codec) *cobra.Command {
 	queryCmd := &cobra.Command{
 		Use:     "query",
 		Aliases: []string{"q"},
@@ -102,7 +102,7 @@ func queryCmd(cdc *amino.Codec) *cobra.Command {
 	return queryCmd
 }
 
-func txCmd(cdc *amino.Codec) *cobra.Command {
+func txCmd(cdc *codec.Codec) *cobra.Command {
 	txCmd := &cobra.Command{
 		Use:   "tx",
 		Short: "Transactions subcommands",

cmd/kvd/add_account.go

@@ -9,9 +9,10 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 
-	validatorvesting "github.com/kava-labs/kava/x/validator-vesting"
 	"github.com/tendermint/tendermint/libs/cli"
 
+	validatorvesting "github.com/kava-labs/kava/x/validator-vesting"
+
 	"github.com/cosmos/cosmos-sdk/client/keys"
 	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/server"

go.mod

@@ -5,6 +5,7 @@ go 1.13
 require (
 	github.com/btcsuite/btcd v0.20.1-beta // indirect
 	github.com/cosmos/cosmos-sdk v0.38.3
+	github.com/gogo/protobuf v1.3.1
 	github.com/gorilla/mux v1.7.3
 	github.com/spf13/cobra v0.0.6
 	github.com/spf13/viper v1.6.2

golangci.yml

@@ -0,0 +1,63 @@
+run:
+  tests: false
+#   # timeout for analysis, e.g. 30s, 5m, default is 1m
+#   timeout: 5m
+
+linters:
+  disable-all: true
+  enable:
+    - bodyclose
+    - deadcode
+    - depguard
+    - dogsled
+    # - errcheck
+    - goconst
+    - gocritic
+    - gofmt
+    - goimports
+    - golint
+    - gosec
+    - gosimple
+    - govet
+    - ineffassign
+    - interfacer
+    - maligned
+    - misspell
+    - nakedret
+    - prealloc
+    - scopelint
+    - staticcheck
+    - structcheck
+    - stylecheck
+    - typecheck
+    - unconvert
+    - unused
+    - misspell
+    - wsl
+
+issues:
+  exclude-rules:
+    - text: "Use of weak random number generator"
+      linters:
+        - gosec
+    - text: "comment on exported var"
+      linters:
+        - golint
+    - text: "don't use an underscore in package name"
+      linters:
+        - golint
+    - text: "ST1003:"
+      linters:
+        - stylecheck
+    # FIXME: Disabled until golangci-lint updates stylecheck with this fix:
+    # https://github.com/dominikh/go-tools/issues/389
+    - text: "ST1016:"
+      linters:
+        - stylecheck
+
+linters-settings:
+  dogsled:
+    max-blank-identifiers: 3
+  maligned:
+    # print struct with more effective memory layout or not, false by default
+    suggest-new: true

rest_test/setup/setuptest.go

@@ -10,6 +10,7 @@ import (
 	"time"
 
 	"github.com/cosmos/cosmos-sdk/client/keys"
+	"github.com/cosmos/cosmos-sdk/codec"
 	crkeys "github.com/cosmos/cosmos-sdk/crypto/keys"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkrest "github.com/cosmos/cosmos-sdk/types/rest"
@@ -21,11 +22,11 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/gov"
 	"github.com/cosmos/cosmos-sdk/x/gov/types"
 	"github.com/cosmos/cosmos-sdk/x/staking"
+	tmtime "github.com/tendermint/tendermint/types/time"
+
 	"github.com/kava-labs/kava/app"
 	"github.com/kava-labs/kava/x/cdp"
 	"github.com/kava-labs/kava/x/pricefeed"
-	"github.com/tendermint/go-amino"
-	tmtime "github.com/tendermint/tendermint/types/time"
 )
 
 func init() {
@@ -394,7 +395,7 @@ func getKeybase() crkeys.Keybase {
 }
 
 // sendMsgToBlockchain sends a message to the blockchain via the rest api
-func sendMsgToBlockchain(cdc *amino.Codec, address string, keyname string,
+func sendMsgToBlockchain(cdc *codec.Codec, address string, keyname string,
 	password string, msg []sdk.Msg, keybase crkeys.Keybase) {
 
 	// get the account number and sequence number
@@ -450,7 +451,7 @@ func sendMsgToBlockchain(cdc *amino.Codec, address string, keyname string,
 }
 
 // getAccountNumberAndSequenceNumber gets an account number and sequence number from the blockchain
-func getAccountNumberAndSequenceNumber(cdc *amino.Codec, address string) (accountNumber uint64, sequenceNumber uint64) {
+func getAccountNumberAndSequenceNumber(cdc *codec.Codec, address string) (accountNumber uint64, sequenceNumber uint64) {
 
 	// we need to setup the account number and sequence in order to have a valid transaction
 	resp, err := http.Get("http://localhost:1317/auth/accounts/" + address)

x/auction/alias.go

@@ -12,29 +12,29 @@ import (
 // ALIASGEN: github.com/kava-labs/kava/x/auction/types
 
 const (
-	EventTypeAuctionStart                 = types.EventTypeAuctionStart
-	EventTypeAuctionBid                   = types.EventTypeAuctionBid
-	EventTypeAuctionClose                 = types.EventTypeAuctionClose
-	AttributeValueCategory                = types.AttributeValueCategory
-	AttributeKeyAuctionID                 = types.AttributeKeyAuctionID
-	AttributeKeyAuctionType               = types.AttributeKeyAuctionType
-	AttributeKeyBidder                    = types.AttributeKeyBidder
-	AttributeKeyBidDenom                  = types.AttributeKeyBidDenom
-	AttributeKeyLotDenom                  = types.AttributeKeyLotDenom
-	AttributeKeyBidAmount                 = types.AttributeKeyBidAmount
-	AttributeKeyLotAmount                 = types.AttributeKeyLotAmount
-	AttributeKeyEndTime                   = types.AttributeKeyEndTime
-	DefaultNextAuctionID                  = types.DefaultNextAuctionID
-	ModuleName                            = types.ModuleName
-	StoreKey                              = types.StoreKey
-	RouterKey                             = types.RouterKey
-	DefaultParamspace                     = types.DefaultParamspace
-	QuerierRoute                          = types.QuerierRoute
-	DefaultMaxAuctionDuration             = types.DefaultMaxAuctionDuration
-	DefaultBidDuration                    = types.DefaultBidDuration
-	QueryGetAuction                       = types.QueryGetAuction
-	QueryGetAuctions                      = types.QueryGetAuctions
-	QueryGetParams                        = types.QueryGetParams
+	EventTypeAuctionStart     = types.EventTypeAuctionStart
+	EventTypeAuctionBid       = types.EventTypeAuctionBid
+	EventTypeAuctionClose     = types.EventTypeAuctionClose
+	AttributeValueCategory    = types.AttributeValueCategory
+	AttributeKeyAuctionID     = types.AttributeKeyAuctionID
+	AttributeKeyAuctionType   = types.AttributeKeyAuctionType
+	AttributeKeyBidder        = types.AttributeKeyBidder
+	AttributeKeyBidDenom      = types.AttributeKeyBidDenom
+	AttributeKeyLotDenom      = types.AttributeKeyLotDenom
+	AttributeKeyBidAmount     = types.AttributeKeyBidAmount
+	AttributeKeyLotAmount     = types.AttributeKeyLotAmount
+	AttributeKeyEndTime       = types.AttributeKeyEndTime
+	DefaultNextAuctionID      = types.DefaultNextAuctionID
+	ModuleName                = types.ModuleName
+	StoreKey                  = types.StoreKey
+	RouterKey                 = types.RouterKey
+	DefaultParamspace         = types.DefaultParamspace
+	QuerierRoute              = types.QuerierRoute
+	DefaultMaxAuctionDuration = types.DefaultMaxAuctionDuration
+	DefaultBidDuration        = types.DefaultBidDuration
+	QueryGetAuction           = types.QueryGetAuction
+	QueryGetAuctions          = types.QueryGetAuctions
+	QueryGetParams            = types.QueryGetParams
 )
 
 var (

x/auction/keeper/auctions.go

@@ -7,6 +7,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	"github.com/cosmos/cosmos-sdk/x/supply"
+
 	"github.com/kava-labs/kava/x/auction/types"
 )
 

x/auction/keeper/params.go

@@ -2,6 +2,7 @@ package keeper
 
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
+
 	"github.com/kava-labs/kava/x/auction/types"
 )
 

x/auction/keeper/querier_test.go

@@ -10,13 +10,14 @@ import (
 	authexported "github.com/cosmos/cosmos-sdk/x/auth/exported"
 	"github.com/cosmos/cosmos-sdk/x/simulation"
 	"github.com/cosmos/cosmos-sdk/x/supply"
+	"github.com/stretchr/testify/suite"
+	abci "github.com/tendermint/tendermint/abci/types"
+	tmtime "github.com/tendermint/tendermint/types/time"
+
 	"github.com/kava-labs/kava/app"
 	"github.com/kava-labs/kava/x/auction/keeper"
 	"github.com/kava-labs/kava/x/auction/types"
 	"github.com/kava-labs/kava/x/cdp"
-	"github.com/stretchr/testify/suite"
-	abci "github.com/tendermint/tendermint/abci/types"
-	tmtime "github.com/tendermint/tendermint/types/time"
 )
 
 const (

x/bep3/client/cli/tx.go

@@ -14,9 +14,10 @@ import (
 	"github.com/cosmos/cosmos-sdk/version"
 	"github.com/cosmos/cosmos-sdk/x/auth"
 	"github.com/cosmos/cosmos-sdk/x/auth/client/utils"
-	"github.com/kava-labs/kava/x/bep3/types"
 	"github.com/spf13/cobra"
 	tmtime "github.com/tendermint/tendermint/types/time"
+
+	"github.com/kava-labs/kava/x/bep3/types"
 )
 
 // GetTxCmd returns the transaction commands for this module

x/bep3/client/rest/query.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/client/context"
 	"github.com/cosmos/cosmos-sdk/types/rest"
+
 	"github.com/kava-labs/kava/x/bep3/types"
 )
 

x/bep3/keeper/asset_test.go

@@ -4,12 +4,13 @@ import (
 	"testing"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/kava-labs/kava/app"
-	"github.com/kava-labs/kava/x/bep3/keeper"
-	"github.com/kava-labs/kava/x/bep3/types"
 	"github.com/stretchr/testify/suite"
 	abci "github.com/tendermint/tendermint/abci/types"
 	tmtime "github.com/tendermint/tendermint/types/time"
+
+	"github.com/kava-labs/kava/app"
+	"github.com/kava-labs/kava/x/bep3/keeper"
+	"github.com/kava-labs/kava/x/bep3/types"
 )
 
 type AssetTestSuite struct {

x/bep3/keeper/integration_test.go

@@ -4,11 +4,12 @@ import (
 	"time"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/tendermint/tendermint/crypto"
+	tmtime "github.com/tendermint/tendermint/types/time"
+
 	"github.com/kava-labs/kava/app"
 	"github.com/kava-labs/kava/x/bep3"
 	"github.com/kava-labs/kava/x/bep3/types"
-	"github.com/tendermint/tendermint/crypto"
-	tmtime "github.com/tendermint/tendermint/types/time"
 )
 
 const (

x/bep3/keeper/keeper.go

@@ -7,8 +7,9 @@ import (
 	"github.com/cosmos/cosmos-sdk/store/prefix"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/params/subspace"
-	"github.com/kava-labs/kava/x/bep3/types"
 	"github.com/tendermint/tendermint/libs/log"
+
+	"github.com/kava-labs/kava/x/bep3/types"
 )
 
 // Keeper of the bep3 store

x/bep3/keeper/keeper_test.go

@@ -5,12 +5,13 @@ import (
 	"time"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/kava-labs/kava/app"
-	"github.com/kava-labs/kava/x/bep3/keeper"
-	"github.com/kava-labs/kava/x/bep3/types"
 	"github.com/stretchr/testify/suite"
 	abci "github.com/tendermint/tendermint/abci/types"
 	tmtime "github.com/tendermint/tendermint/types/time"
+
+	"github.com/kava-labs/kava/app"
+	"github.com/kava-labs/kava/x/bep3/keeper"
+	"github.com/kava-labs/kava/x/bep3/types"
 )
 
 const LongtermStorageDuration = 86400

x/bep3/keeper/params_test.go

@@ -5,12 +5,13 @@ import (
 	"testing"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/kava-labs/kava/app"
-	"github.com/kava-labs/kava/x/bep3/keeper"
-	"github.com/kava-labs/kava/x/bep3/types"
 	"github.com/stretchr/testify/suite"
 	abci "github.com/tendermint/tendermint/abci/types"
 	tmtime "github.com/tendermint/tendermint/types/time"
+
+	"github.com/kava-labs/kava/app"
+	"github.com/kava-labs/kava/x/bep3/keeper"
+	"github.com/kava-labs/kava/x/bep3/types"
 )
 
 type ParamsTestSuite struct {

x/bep3/keeper/swap.go

@@ -245,13 +245,13 @@ func (k Keeper) UpdateExpiredAtomicSwaps(ctx sdk.Context) error {
 	}
 
 	// Emit 'swaps_expired' event
-		ctx.EventManager().EmitEvent(
-			sdk.NewEvent(
-				types.EventTypeSwapsExpired,
-				sdk.NewAttribute(types.AttributeKeyAtomicSwapIDs, fmt.Sprintf("%s", expiredSwapIDs)),
-				sdk.NewAttribute(types.AttributeExpirationBlock, fmt.Sprintf("%d", ctx.BlockHeight())),
-			),
-		)
+	ctx.EventManager().EmitEvent(
+		sdk.NewEvent(
+			types.EventTypeSwapsExpired,
+			sdk.NewAttribute(types.AttributeKeyAtomicSwapIDs, fmt.Sprintf("%s", expiredSwapIDs)),
+			sdk.NewAttribute(types.AttributeExpirationBlock, fmt.Sprintf("%d", ctx.BlockHeight())),
+		),
+	)
 
 	return nil
 }

x/bep3/simulation/genesis.go

@@ -12,6 +12,7 @@ import (
 	authexported "github.com/cosmos/cosmos-sdk/x/auth/exported"
 	"github.com/cosmos/cosmos-sdk/x/simulation"
 	"github.com/cosmos/cosmos-sdk/x/supply"
+
 	"github.com/kava-labs/kava/x/bep3/types"
 )
 

x/bep3/types/common_test.go

@@ -4,8 +4,9 @@ import (
 	"time"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/kava-labs/kava/x/bep3/types"
 	tmtime "github.com/tendermint/tendermint/types/time"
+
+	"github.com/kava-labs/kava/x/bep3/types"
 )
 
 func i(in int64) sdk.Int                    { return sdk.NewInt(in) }

x/bep3/types/genesis_test.go

@@ -4,9 +4,10 @@ import (
 	"testing"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/stretchr/testify/suite"
+
 	"github.com/kava-labs/kava/app"
 	"github.com/kava-labs/kava/x/bep3/types"
-	"github.com/stretchr/testify/suite"
 )
 
 type GenesisTestSuite struct {

x/bep3/types/hash_test.go

@@ -4,9 +4,10 @@ import (
 	"testing"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/stretchr/testify/suite"
+
 	"github.com/kava-labs/kava/app"
 	"github.com/kava-labs/kava/x/bep3/types"
-	"github.com/stretchr/testify/suite"
 )
 
 type HashTestSuite struct {
@@ -58,4 +59,4 @@ func (suite *HashTestSuite) TestCalculateSwapID() {
 
 func TestHashTestSuite(t *testing.T) {
 	suite.Run(t, new(HashTestSuite))
-}
+}

x/bep3/types/params_test.go

@@ -4,9 +4,10 @@ import (
 	"testing"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/stretchr/testify/suite"
+
 	"github.com/kava-labs/kava/app"
 	"github.com/kava-labs/kava/x/bep3/types"
-	"github.com/stretchr/testify/suite"
 )
 
 type ParamsTestSuite struct {

x/cdp/abci.go

@@ -4,8 +4,9 @@ import (
 	"fmt"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/kava-labs/kava/x/cdp/types"
 	abci "github.com/tendermint/tendermint/abci/types"
+
+	"github.com/kava-labs/kava/x/cdp/types"
 )
 
 // BeginBlocker compounds the debt in outstanding cdps and liquidates cdps that are below the required collateralization ratio

x/cdp/abci_test.go

@@ -7,12 +7,13 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/simulation"
-	"github.com/kava-labs/kava/app"
-	"github.com/kava-labs/kava/x/auction"
-	"github.com/kava-labs/kava/x/cdp"
 	"github.com/stretchr/testify/suite"
 	abci "github.com/tendermint/tendermint/abci/types"
 	tmtime "github.com/tendermint/tendermint/types/time"
+
+	"github.com/kava-labs/kava/app"
+	"github.com/kava-labs/kava/x/auction"
+	"github.com/kava-labs/kava/x/cdp"
 )
 
 type ModuleTestSuite struct {

x/cdp/genesis.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
+
 	"github.com/kava-labs/kava/x/cdp/types"
 )
 

x/cdp/genesis_test.go

@@ -6,9 +6,10 @@ import (
 	"time"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/stretchr/testify/suite"
+
 	"github.com/kava-labs/kava/app"
 	"github.com/kava-labs/kava/x/cdp"
-	"github.com/stretchr/testify/suite"
 )
 
 type GenesisTestSuite struct {

x/cdp/handler_test.go

@@ -4,11 +4,12 @@ import (
 	"testing"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/kava-labs/kava/app"
-	"github.com/kava-labs/kava/x/cdp"
 	abci "github.com/tendermint/tendermint/abci/types"
 	tmtime "github.com/tendermint/tendermint/types/time"
 
+	"github.com/kava-labs/kava/app"
+	"github.com/kava-labs/kava/x/cdp"
+
 	"github.com/stretchr/testify/suite"
 )
 

x/cdp/integration_test.go

@@ -5,10 +5,11 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
+	tmtime "github.com/tendermint/tendermint/types/time"
+
 	"github.com/kava-labs/kava/app"
 	"github.com/kava-labs/kava/x/cdp"
 	"github.com/kava-labs/kava/x/pricefeed"
-	tmtime "github.com/tendermint/tendermint/types/time"
 )
 
 // Avoid cluttering test cases with long function names
@@ -21,11 +22,11 @@ func NewPricefeedGenState(asset string, price sdk.Dec) app.GenesisState {
 	pfGenesis := pricefeed.GenesisState{
 		Params: pricefeed.Params{
 			Markets: []pricefeed.Market{
-				pricefeed.Market{MarketID: asset + ":usd", BaseAsset: asset, QuoteAsset: "usd", Oracles: []sdk.AccAddress{}, Active: true},
+				{MarketID: asset + ":usd", BaseAsset: asset, QuoteAsset: "usd", Oracles: []sdk.AccAddress{}, Active: true},
 			},
 		},
 		PostedPrices: []pricefeed.PostedPrice{
-			pricefeed.PostedPrice{
+			{
 				MarketID:      asset + ":usd",
 				OracleAddress: sdk.AccAddress{},
 				Price:         price,
@@ -77,18 +78,18 @@ func NewPricefeedGenStateMulti() app.GenesisState {
 	pfGenesis := pricefeed.GenesisState{
 		Params: pricefeed.Params{
 			Markets: []pricefeed.Market{
-				pricefeed.Market{MarketID: "btc:usd", BaseAsset: "btc", QuoteAsset: "usd", Oracles: []sdk.AccAddress{}, Active: true},
-				pricefeed.Market{MarketID: "xrp:usd", BaseAsset: "xrp", QuoteAsset: "usd", Oracles: []sdk.AccAddress{}, Active: true},
+				{MarketID: "btc:usd", BaseAsset: "btc", QuoteAsset: "usd", Oracles: []sdk.AccAddress{}, Active: true},
+				{MarketID: "xrp:usd", BaseAsset: "xrp", QuoteAsset: "usd", Oracles: []sdk.AccAddress{}, Active: true},
 			},
 		},
 		PostedPrices: []pricefeed.PostedPrice{
-			pricefeed.PostedPrice{
+			{
 				MarketID:      "btc:usd",
 				OracleAddress: sdk.AccAddress{},
 				Price:         sdk.MustNewDecFromStr("8000.00"),
 				Expiry:        time.Now().Add(1 * time.Hour),
 			},
-			pricefeed.PostedPrice{
+			{
 				MarketID:      "xrp:usd",
 				OracleAddress: sdk.AccAddress{},
 				Price:         sdk.MustNewDecFromStr("0.25"),

x/cdp/keeper/auctions.go

@@ -2,6 +2,7 @@ package keeper
 
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
+
 	"github.com/kava-labs/kava/x/cdp/types"
 )
 

x/cdp/keeper/auctions_test.go

@@ -4,6 +4,7 @@ import (
 	"testing"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
+
 	"github.com/kava-labs/kava/app"
 	"github.com/kava-labs/kava/x/auction"
 	"github.com/kava-labs/kava/x/cdp/keeper"

x/cdp/keeper/cdp.go

@@ -7,6 +7,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/store/prefix"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
+
 	"github.com/kava-labs/kava/x/cdp/types"
 )
 
@@ -431,7 +432,7 @@ func (k Keeper) LoadAugmentedCDP(ctx sdk.Context, cdp types.CDP) (types.Augmente
 		return types.AugmentedCDP{}, err
 	}
 
-	// total debt is the sum of all oustanding principal and fees
+	// total debt is the sum of all outstanding principal and fees
 	var totalDebt int64
 	totalDebt += cdp.Principal.Amount.Int64()
 	totalDebt += cdp.AccumulatedFees.Amount.Int64()

x/cdp/keeper/cdp_test.go

@@ -6,12 +6,13 @@ import (
 	"time"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/kava-labs/kava/app"
-	"github.com/kava-labs/kava/x/cdp/keeper"
-	"github.com/kava-labs/kava/x/cdp/types"
 	"github.com/stretchr/testify/suite"
 	abci "github.com/tendermint/tendermint/abci/types"
 	tmtime "github.com/tendermint/tendermint/types/time"
+
+	"github.com/kava-labs/kava/app"
+	"github.com/kava-labs/kava/x/cdp/keeper"
+	"github.com/kava-labs/kava/x/cdp/types"
 )
 
 type CdpTestSuite struct {

x/cdp/keeper/deposit.go

@@ -6,6 +6,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/store/prefix"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
+
 	"github.com/kava-labs/kava/x/cdp/types"
 )
 

x/cdp/keeper/deposit_test.go

@@ -5,12 +5,13 @@ import (
 	"testing"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/kava-labs/kava/app"
-	"github.com/kava-labs/kava/x/cdp/keeper"
-	"github.com/kava-labs/kava/x/cdp/types"
 	"github.com/stretchr/testify/suite"
 	abci "github.com/tendermint/tendermint/abci/types"
 	tmtime "github.com/tendermint/tendermint/types/time"
+
+	"github.com/kava-labs/kava/app"
+	"github.com/kava-labs/kava/x/cdp/keeper"
+	"github.com/kava-labs/kava/x/cdp/types"
 )
 
 type DepositTestSuite struct {

x/cdp/keeper/draw.go

@@ -5,6 +5,7 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
+
 	"github.com/kava-labs/kava/x/cdp/types"
 )
 

x/cdp/keeper/draw_test.go

@@ -6,12 +6,13 @@ import (
 	"time"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/kava-labs/kava/app"
-	"github.com/kava-labs/kava/x/cdp/keeper"
-	"github.com/kava-labs/kava/x/cdp/types"
 	"github.com/stretchr/testify/suite"
 	abci "github.com/tendermint/tendermint/abci/types"
 	tmtime "github.com/tendermint/tendermint/types/time"
+
+	"github.com/kava-labs/kava/app"
+	"github.com/kava-labs/kava/x/cdp/keeper"
+	"github.com/kava-labs/kava/x/cdp/types"
 )
 
 type DrawTestSuite struct {

x/cdp/keeper/fees.go

@@ -3,6 +3,7 @@ package keeper
 import (
 	"github.com/cosmos/cosmos-sdk/store/prefix"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+
 	"github.com/kava-labs/kava/x/cdp/types"
 )
 

x/cdp/keeper/fees_test.go

@@ -6,11 +6,12 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/kava-labs/kava/app"
-	"github.com/kava-labs/kava/x/cdp/keeper"
 	"github.com/stretchr/testify/suite"
 	abci "github.com/tendermint/tendermint/abci/types"
 	tmtime "github.com/tendermint/tendermint/types/time"
+
+	"github.com/kava-labs/kava/app"
+	"github.com/kava-labs/kava/x/cdp/keeper"
 )
 
 type FeeTestSuite struct {

x/cdp/keeper/integration_test.go

@@ -5,10 +5,11 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
+	tmtime "github.com/tendermint/tendermint/types/time"
+
 	"github.com/kava-labs/kava/app"
 	"github.com/kava-labs/kava/x/cdp"
 	"github.com/kava-labs/kava/x/pricefeed"
-	tmtime "github.com/tendermint/tendermint/types/time"
 )
 
 // Avoid cluttering test cases with long function names
@@ -21,11 +22,11 @@ func NewPricefeedGenState(asset string, price sdk.Dec) app.GenesisState {
 	pfGenesis := pricefeed.GenesisState{
 		Params: pricefeed.Params{
 			Markets: []pricefeed.Market{
-				pricefeed.Market{MarketID: asset + ":usd", BaseAsset: asset, QuoteAsset: "usd", Oracles: []sdk.AccAddress{}, Active: true},
+				{MarketID: asset + ":usd", BaseAsset: asset, QuoteAsset: "usd", Oracles: []sdk.AccAddress{}, Active: true},
 			},
 		},
 		PostedPrices: []pricefeed.PostedPrice{
-			pricefeed.PostedPrice{
+			{
 				MarketID:      asset + ":usd",
 				OracleAddress: sdk.AccAddress{},
 				Price:         price,
@@ -77,18 +78,18 @@ func NewPricefeedGenStateMulti() app.GenesisState {
 	pfGenesis := pricefeed.GenesisState{
 		Params: pricefeed.Params{
 			Markets: []pricefeed.Market{
-				pricefeed.Market{MarketID: "btc:usd", BaseAsset: "btc", QuoteAsset: "usd", Oracles: []sdk.AccAddress{}, Active: true},
-				pricefeed.Market{MarketID: "xrp:usd", BaseAsset: "xrp", QuoteAsset: "usd", Oracles: []sdk.AccAddress{}, Active: true},
+				{MarketID: "btc:usd", BaseAsset: "btc", QuoteAsset: "usd", Oracles: []sdk.AccAddress{}, Active: true},
+				{MarketID: "xrp:usd", BaseAsset: "xrp", QuoteAsset: "usd", Oracles: []sdk.AccAddress{}, Active: true},
 			},
 		},
 		PostedPrices: []pricefeed.PostedPrice{
-			pricefeed.PostedPrice{
+			{
 				MarketID:      "btc:usd",
 				OracleAddress: sdk.AccAddress{},
 				Price:         sdk.MustNewDecFromStr("8000.00"),
 				Expiry:        time.Now().Add(1 * time.Hour),
 			},
-			pricefeed.PostedPrice{
+			{
 				MarketID:      "xrp:usd",
 				OracleAddress: sdk.AccAddress{},
 				Price:         sdk.MustNewDecFromStr("0.25"),

x/cdp/keeper/keeper.go

@@ -7,6 +7,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/store/prefix"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/params/subspace"
+
 	"github.com/kava-labs/kava/x/cdp/types"
 )
 

x/cdp/keeper/keeper_bench_test.go

@@ -5,11 +5,12 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/auth/exported"
+	abci "github.com/tendermint/tendermint/abci/types"
+	tmtime "github.com/tendermint/tendermint/types/time"
+
 	"github.com/kava-labs/kava/app"
 	"github.com/kava-labs/kava/x/cdp"
 	"github.com/kava-labs/kava/x/cdp/keeper"
-	abci "github.com/tendermint/tendermint/abci/types"
-	tmtime "github.com/tendermint/tendermint/types/time"
 )
 
 // saving the result to a module level variable ensures the compiler doesn't optimize the test away

x/cdp/keeper/params.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
+
 	"github.com/kava-labs/kava/x/cdp/types"
 )
 

x/cdp/keeper/querier_test.go

@@ -9,14 +9,15 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/simulation"
+	"github.com/stretchr/testify/suite"
+	abci "github.com/tendermint/tendermint/abci/types"
+	tmtime "github.com/tendermint/tendermint/types/time"
+
 	"github.com/kava-labs/kava/app"
 	"github.com/kava-labs/kava/x/cdp/keeper"
 	"github.com/kava-labs/kava/x/cdp/types"
 	pfkeeper "github.com/kava-labs/kava/x/pricefeed/keeper"
 	pftypes "github.com/kava-labs/kava/x/pricefeed/types"
-	"github.com/stretchr/testify/suite"
-	abci "github.com/tendermint/tendermint/abci/types"
-	tmtime "github.com/tendermint/tendermint/types/time"
 )
 
 const (

x/cdp/keeper/savings.go

@@ -9,6 +9,7 @@ import (
 	authexported "github.com/cosmos/cosmos-sdk/x/auth/exported"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	supplyexported "github.com/cosmos/cosmos-sdk/x/supply/exported"
+
 	auctiontypes "github.com/kava-labs/kava/x/auction/types"
 	"github.com/kava-labs/kava/x/cdp/types"
 )

x/cdp/keeper/savings_test.go

@@ -4,12 +4,13 @@ import (
 	"testing"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/kava-labs/kava/app"
-	"github.com/kava-labs/kava/x/cdp/keeper"
-	"github.com/kava-labs/kava/x/cdp/types"
 	"github.com/stretchr/testify/suite"
 	abci "github.com/tendermint/tendermint/abci/types"
 	tmtime "github.com/tendermint/tendermint/types/time"
+
+	"github.com/kava-labs/kava/app"
+	"github.com/kava-labs/kava/x/cdp/keeper"
+	"github.com/kava-labs/kava/x/cdp/types"
 )
 
 type SavingsTestSuite struct {

x/cdp/keeper/seize.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
+
 	"github.com/kava-labs/kava/x/cdp/types"
 )
 

x/cdp/simulation/genesis.go

@@ -10,6 +10,7 @@ import (
 	authexported "github.com/cosmos/cosmos-sdk/x/auth/exported"
 	"github.com/cosmos/cosmos-sdk/x/supply"
 	supplyexported "github.com/cosmos/cosmos-sdk/x/supply/exported"
+
 	"github.com/kava-labs/kava/x/cdp/types"
 )
 

x/cdp/simulation/utils_test.go

@@ -4,8 +4,9 @@ import (
 	"testing"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/kava-labs/kava/x/cdp/simulation"
 	"github.com/stretchr/testify/require"
+
+	"github.com/kava-labs/kava/x/cdp/simulation"
 )
 
 func TestShiftDec(t *testing.T) {

x/cdp/types/expected_keepers.go

@@ -6,6 +6,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	authexported "github.com/cosmos/cosmos-sdk/x/auth/exported"
 	supplyexported "github.com/cosmos/cosmos-sdk/x/supply/exported"
+
 	pftypes "github.com/kava-labs/kava/x/pricefeed/types"
 )
 

x/cdp/types/genesis_test.go

@@ -19,4 +19,4 @@ func TestEqualProposalID(t *testing.T) {
 	state2.StartingCdpID = 1
 	require.Equal(t, state1, state2)
 	require.True(t, state1.Equal(state2))
-}
+}

x/cdp/types/keys.go

@@ -140,7 +140,7 @@ func CollateralRatioKey(denomByte byte, cdpID uint64, ratio sdk.Dec) []byte {
 // SplitCollateralRatioKey split the collateral ratio key and return the denom, cdp id, and collateral:debt ratio
 func SplitCollateralRatioKey(key []byte) (denom byte, cdpID uint64, ratio sdk.Dec) {
 
-	cdpID = GetCdpIDFromBytes(key[len(key)-8 : len(key)])
+	cdpID = GetCdpIDFromBytes(key[len(key)-8:])
 	split := bytes.Split(key[:len(key)-8], sep)
 	denom = split[0][0]
 

x/cdp/types/params_test.go

@@ -6,8 +6,9 @@ import (
 	"time"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/kava-labs/kava/x/cdp/types"
 	"github.com/stretchr/testify/suite"
+
+	"github.com/kava-labs/kava/x/cdp/types"
 )
 
 type ParamsTestSuite struct {

x/cdp/types/utils_test.go

@@ -6,7 +6,6 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-
 )
 
 func TestSortableDecBytes(t *testing.T) {

x/committee/genesis.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
+
 	"github.com/kava-labs/kava/x/committee/types"
 )
 

x/committee/proposal_handler_test.go

@@ -100,7 +100,7 @@ func (suite *ProposalHandlerTestSuite) TestProposalHandler_ChangeCommittee() {
 		{
 			name: "invalid title",
 			proposal: committee.NewCommitteeChangeProposal(
-				"A Title That Is Much Too Long And Really Quite Unreasonable Given That It Is Trying To Fullfill The Roll Of An Acceptable Governance Proposal Title That Should Succinctly Communicate The Goal And Contents Of The Proposed Proposal To All Parties Involved",
+				"A Title That Is Much Too Long And Really Quite Unreasonable Given That It Is Trying To Fulfill The Roll Of An Acceptable Governance Proposal Title That Should Succinctly Communicate The Goal And Contents Of The Proposed Proposal To All Parties Involved",
 				"A proposal description.",
 				suite.testGenesis.Committees[0],
 			),
@@ -177,7 +177,7 @@ func (suite *ProposalHandlerTestSuite) TestProposalHandler_DeleteCommittee() {
 		{
 			name: "invalid title",
 			proposal: committee.NewCommitteeDeleteProposal(
-				"A Title That Is Much Too Long And Really Quite Unreasonable Given That It Is Trying To Fullfill The Roll Of An Acceptable Governance Proposal Title That Should Succinctly Communicate The Goal And Contents Of The Proposed Proposal To All Parties Involved",
+				"A Title That Is Much Too Long And Really Quite Unreasonable Given That It Is Trying To Fulfill The Roll Of An Acceptable Governance Proposal Title That Should Succinctly Communicate The Goal And Contents Of The Proposed Proposal To All Parties Involved",
 				"A proposal description.",
 				suite.testGenesis.Committees[1].ID,
 			),

x/committee/types/committee.go

@@ -4,9 +4,10 @@ import (
 	"fmt"
 	"time"
 
+	yaml "gopkg.in/yaml.v2"
+
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
-	"gopkg.in/yaml.v2"
 )
 
 const MaxCommitteeDescriptionLength int = 512
@@ -98,7 +99,7 @@ func (c Committee) Validate() error {
 
 // PubProposal is the interface that all proposals must fulfill to be submitted to a committee.
 // Proposal types can be created external to this module. For example a ParamChangeProposal, or CommunityPoolSpendProposal.
-// It is pinned to the equivalent type in the gov module to create compatability between proposal types.
+// It is pinned to the equivalent type in the gov module to create compatibility between proposal types.
 type PubProposal govtypes.Content
 
 // Proposal is an internal record of a governance proposal submitted to a committee.

x/committee/types/genesis.go

@@ -81,7 +81,7 @@ func (gs GenesisState) Validate() error {
 
 		// check committee exists
 		if !committeeMap[p.CommitteeID] {
-			return fmt.Errorf("proposal refers to non existant committee; proposal: %+v", p)
+			return fmt.Errorf("proposal refers to non existent committee; proposal: %+v", p)
 		}
 
 		// validate pubProposal
@@ -94,7 +94,7 @@ func (gs GenesisState) Validate() error {
 	for _, v := range gs.Votes {
 		// check proposal exists
 		if !proposalMap[v.ProposalID] {
-			return fmt.Errorf("vote refers to non existant proposal; vote: %+v", v)
+			return fmt.Errorf("vote refers to non existent proposal; vote: %+v", v)
 		}
 		// validate address
 		if v.Voter.Empty() {

x/committee/types/proposal.go

@@ -1,7 +1,7 @@
 package types
 
 import (
-	"gopkg.in/yaml.v2"
+	yaml "gopkg.in/yaml.v2"
 
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"

x/incentive/abci.go

@@ -2,6 +2,7 @@ package incentive
 
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
+
 	"github.com/kava-labs/kava/x/incentive/keeper"
 )
 

x/incentive/client/cli/query.go

@@ -9,8 +9,9 @@ import (
 	"github.com/cosmos/cosmos-sdk/codec"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/version"
-	"github.com/kava-labs/kava/x/incentive/types"
 	"github.com/spf13/cobra"
+
+	"github.com/kava-labs/kava/x/incentive/types"
 )
 
 // GetQueryCmd returns the cli query commands for the incentive module

x/incentive/client/cli/tx.go

@@ -12,8 +12,9 @@ import (
 	"github.com/cosmos/cosmos-sdk/version"
 	"github.com/cosmos/cosmos-sdk/x/auth"
 	"github.com/cosmos/cosmos-sdk/x/auth/client/utils"
-	"github.com/kava-labs/kava/x/incentive/types"
 	"github.com/spf13/cobra"
+
+	"github.com/kava-labs/kava/x/incentive/types"
 )
 
 // GetTxCmd returns the transaction cli commands for the incentive module

x/incentive/client/rest/query.go

@@ -8,6 +8,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/rest"
 	"github.com/gorilla/mux"
+
 	"github.com/kava-labs/kava/x/incentive/types"
 )
 

x/incentive/client/rest/tx.go

@@ -8,6 +8,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/types/rest"
 	"github.com/cosmos/cosmos-sdk/x/auth/client/utils"
 	"github.com/gorilla/mux"
+
 	"github.com/kava-labs/kava/x/incentive/types"
 )
 

x/incentive/genesis.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
+
 	"github.com/kava-labs/kava/x/incentive/keeper"
 	"github.com/kava-labs/kava/x/incentive/types"
 )

x/incentive/handler.go

@@ -3,6 +3,7 @@ package incentive
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
+
 	"github.com/kava-labs/kava/x/incentive/keeper"
 	"github.com/kava-labs/kava/x/incentive/types"
 )

x/incentive/handler_test.go

@@ -5,12 +5,13 @@ import (
 	"time"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/kava-labs/kava/app"
-	"github.com/kava-labs/kava/x/incentive"
-	"github.com/kava-labs/kava/x/kavadist"
 	"github.com/stretchr/testify/suite"
 	abci "github.com/tendermint/tendermint/abci/types"
 	tmtime "github.com/tendermint/tendermint/types/time"
+
+	"github.com/kava-labs/kava/app"
+	"github.com/kava-labs/kava/x/incentive"
+	"github.com/kava-labs/kava/x/kavadist"
 )
 
 func cs(coins ...sdk.Coin) sdk.Coins        { return sdk.NewCoins(coins...) }

x/incentive/keeper/keeper.go

@@ -7,6 +7,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/store/prefix"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/params/subspace"
+
 	"github.com/kava-labs/kava/x/incentive/types"
 )
 

x/incentive/keeper/keeper_test.go

@@ -7,12 +7,13 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	authexported "github.com/cosmos/cosmos-sdk/x/auth/exported"
 	supplyexported "github.com/cosmos/cosmos-sdk/x/supply/exported"
-	"github.com/kava-labs/kava/app"
-	"github.com/kava-labs/kava/x/incentive/keeper"
-	"github.com/kava-labs/kava/x/incentive/types"
 	"github.com/stretchr/testify/suite"
 	abci "github.com/tendermint/tendermint/abci/types"
 	tmtime "github.com/tendermint/tendermint/types/time"
+
+	"github.com/kava-labs/kava/app"
+	"github.com/kava-labs/kava/x/incentive/keeper"
+	"github.com/kava-labs/kava/x/incentive/types"
 )
 
 // Test suite used for all keeper tests

x/incentive/keeper/params.go

@@ -2,6 +2,7 @@ package keeper
 
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
+
 	"github.com/kava-labs/kava/x/incentive/types"
 )
 

x/incentive/keeper/payout.go

@@ -9,6 +9,7 @@ import (
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	"github.com/cosmos/cosmos-sdk/x/auth/vesting"
 	supplyExported "github.com/cosmos/cosmos-sdk/x/supply/exported"
+
 	"github.com/kava-labs/kava/x/incentive/types"
 	validatorvesting "github.com/kava-labs/kava/x/validator-vesting"
 )

x/incentive/keeper/payout_test.go

@@ -7,12 +7,13 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/auth"
 	"github.com/cosmos/cosmos-sdk/x/auth/vesting"
+	abci "github.com/tendermint/tendermint/abci/types"
+
 	"github.com/kava-labs/kava/app"
 	"github.com/kava-labs/kava/x/cdp"
 	"github.com/kava-labs/kava/x/incentive/types"
 	"github.com/kava-labs/kava/x/kavadist"
 	validatorvesting "github.com/kava-labs/kava/x/validator-vesting"
-	abci "github.com/tendermint/tendermint/abci/types"
 )
 
 func (suite *KeeperTestSuite) setupChain() {

x/incentive/keeper/querier.go

@@ -4,8 +4,9 @@ import (
 	"github.com/cosmos/cosmos-sdk/codec"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
-	"github.com/kava-labs/kava/x/incentive/types"
 	abci "github.com/tendermint/tendermint/abci/types"
+
+	"github.com/kava-labs/kava/x/incentive/types"
 )
 
 // NewQuerier is the module level router for state queries

x/incentive/keeper/querier_test.go

@@ -3,9 +3,10 @@ package keeper_test
 import (
 	"strings"
 
+	abci "github.com/tendermint/tendermint/abci/types"
+
 	"github.com/kava-labs/kava/x/incentive/keeper"
 	"github.com/kava-labs/kava/x/incentive/types"
-	abci "github.com/tendermint/tendermint/abci/types"
 )
 
 func (suite *KeeperTestSuite) TestQuerier() {

x/incentive/keeper/rewards.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/store/prefix"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+
 	cdptypes "github.com/kava-labs/kava/x/cdp/types"
 	"github.com/kava-labs/kava/x/incentive/types"
 )
@@ -19,7 +20,7 @@ func (k Keeper) HandleRewardPeriodExpiry(ctx sdk.Context, rp types.RewardPeriod)
 
 // CreateNewRewardPeriod creates a new reward period from the input reward
 func (k Keeper) CreateNewRewardPeriod(ctx sdk.Context, reward types.Reward) {
-	// reward periods store the amount of rewards payed PER SECOND
+	// reward periods store the amount of rewards paid PER SECOND
 	rewardsPerSecond := sdk.NewDecFromInt(reward.AvailableRewards.Amount).Quo(sdk.NewDecFromInt(sdk.NewInt(int64(reward.Duration.Seconds())))).TruncateInt()
 	rewardCoinPerSecond := sdk.NewCoin(reward.AvailableRewards.Denom, rewardsPerSecond)
 	rp := types.RewardPeriod{

x/incentive/keeper/rewards_test.go

@@ -4,12 +4,13 @@ import (
 	"time"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	abci "github.com/tendermint/tendermint/abci/types"
+	tmtime "github.com/tendermint/tendermint/types/time"
+
 	"github.com/kava-labs/kava/app"
 	"github.com/kava-labs/kava/x/cdp"
 	"github.com/kava-labs/kava/x/incentive/types"
 	"github.com/kava-labs/kava/x/pricefeed"
-	abci "github.com/tendermint/tendermint/abci/types"
-	tmtime "github.com/tendermint/tendermint/types/time"
 )
 
 func (suite *KeeperTestSuite) TestExpireRewardPeriod() {
@@ -160,11 +161,11 @@ func (suite *KeeperTestSuite) setupCdpChain() {
 	pricefeedGS := pricefeed.GenesisState{
 		Params: pricefeed.Params{
 			Markets: []pricefeed.Market{
-				pricefeed.Market{MarketID: "bnb:usd", BaseAsset: "bnb", QuoteAsset: "usd", Oracles: []sdk.AccAddress{}, Active: true},
+				{MarketID: "bnb:usd", BaseAsset: "bnb", QuoteAsset: "usd", Oracles: []sdk.AccAddress{}, Active: true},
 			},
 		},
 		PostedPrices: []pricefeed.PostedPrice{
-			pricefeed.PostedPrice{
+			{
 				MarketID:      "bnb:usd",
 				OracleAddress: sdk.AccAddress{},
 				Price:         d("12.29"),

x/incentive/module.go

@@ -11,13 +11,14 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/auth"
 	sim "github.com/cosmos/cosmos-sdk/x/simulation"
 	"github.com/gorilla/mux"
+	"github.com/spf13/cobra"
+	abci "github.com/tendermint/tendermint/abci/types"
+
 	"github.com/kava-labs/kava/x/incentive/client/cli"
 	"github.com/kava-labs/kava/x/incentive/client/rest"
 	"github.com/kava-labs/kava/x/incentive/keeper"
 	"github.com/kava-labs/kava/x/incentive/simulation"
 	"github.com/kava-labs/kava/x/incentive/types"
-	"github.com/spf13/cobra"
-	abci "github.com/tendermint/tendermint/abci/types"
 )
 
 var (

x/incentive/simulation/params.go

@@ -5,6 +5,7 @@ import (
 	"math/rand"
 
 	"github.com/cosmos/cosmos-sdk/x/simulation"
+
 	"github.com/kava-labs/kava/x/incentive/types"
 )
 

x/incentive/types/account_test.go

@@ -5,8 +5,9 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/auth/vesting"
-	"github.com/kava-labs/kava/x/incentive/types"
 	"github.com/stretchr/testify/suite"
+
+	"github.com/kava-labs/kava/x/incentive/types"
 )
 
 type accountTest struct {
@@ -22,7 +23,7 @@ type AccountTestSuite struct {
 
 func (suite *AccountTestSuite) SetupTest() {
 	tests := []accountTest{
-		accountTest{
+		{
 			periods: vesting.Periods{
 				vesting.Period{
 					Length: int64(100),

x/incentive/types/expected_keepers.go

@@ -4,6 +4,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	authexported "github.com/cosmos/cosmos-sdk/x/auth/exported"
 	supplyexported "github.com/cosmos/cosmos-sdk/x/supply/exported"
+
 	cdptypes "github.com/kava-labs/kava/x/cdp/types"
 )
 

x/incentive/types/msg_test.go

@@ -4,9 +4,10 @@ import (
 	"testing"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/kava-labs/kava/x/incentive/types"
 	"github.com/stretchr/testify/suite"
 	"github.com/tendermint/tendermint/crypto"
+
+	"github.com/kava-labs/kava/x/incentive/types"
 )
 
 type msgTest struct {
@@ -23,17 +24,17 @@ type MsgTestSuite struct {
 
 func (suite *MsgTestSuite) SetupTest() {
 	tests := []msgTest{
-		msgTest{
+		{
 			from:       sdk.AccAddress(crypto.AddressHash([]byte("KavaTest1"))),
 			denom:      "bnb",
 			expectPass: true,
 		},
-		msgTest{
+		{
 			from:       sdk.AccAddress(crypto.AddressHash([]byte("KavaTest1"))),
 			denom:      "",
 			expectPass: false,
 		},
-		msgTest{
+		{
 			from:       sdk.AccAddress{},
 			denom:      "bnb",
 			expectPass: false,

x/incentive/types/params.go

@@ -7,9 +7,10 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/params"
+	tmtime "github.com/tendermint/tendermint/types/time"
+
 	cdptypes "github.com/kava-labs/kava/x/cdp/types"
 	kavadistTypes "github.com/kava-labs/kava/x/kavadist/types"
-	tmtime "github.com/tendermint/tendermint/types/time"
 )
 
 // Parameter keys and default values

x/incentive/types/params_test.go

@@ -6,8 +6,9 @@ import (
 	"time"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/kava-labs/kava/x/incentive/types"
 	"github.com/stretchr/testify/suite"
+
+	"github.com/kava-labs/kava/x/incentive/types"
 )
 
 type paramTest struct {
@@ -29,7 +30,7 @@ type ParamTestSuite struct {
 
 func (suite *ParamTestSuite) SetupTest() {
 	suite.tests = []paramTest{
-		paramTest{
+		{
 			name: "valid - active",
 			params: types.Params{
 				Active: true,
@@ -49,7 +50,7 @@ func (suite *ParamTestSuite) SetupTest() {
 				contains:   "",
 			},
 		},
-		paramTest{
+		{
 			name: "valid - inactive",
 			params: types.Params{
 				Active: false,
@@ -69,7 +70,7 @@ func (suite *ParamTestSuite) SetupTest() {
 				contains:   "",
 			},
 		},
-		paramTest{
+		{
 			name: "duplicate reward",
 			params: types.Params{
 				Active: true,
@@ -97,7 +98,7 @@ func (suite *ParamTestSuite) SetupTest() {
 				contains:   "cannot have duplicate reward denoms",
 			},
 		},
-		paramTest{
+		{
 			name: "negative reward duration",
 			params: types.Params{
 				Active: true,
@@ -117,7 +118,7 @@ func (suite *ParamTestSuite) SetupTest() {
 				contains:   "reward duration must be positive",
 			},
 		},
-		paramTest{
+		{
 			name: "negative time lock",
 			params: types.Params{
 				Active: true,
@@ -137,7 +138,7 @@ func (suite *ParamTestSuite) SetupTest() {
 				contains:   "reward timelock must be non-negative",
 			},
 		},
-		paramTest{
+		{
 			name: "zero claim duration",
 			params: types.Params{
 				Active: true,
@@ -157,7 +158,7 @@ func (suite *ParamTestSuite) SetupTest() {
 				contains:   "claim duration must be positive",
 			},
 		},
-		paramTest{
+		{
 			name: "zero reward",
 			params: types.Params{
 				Active: true,
@@ -177,7 +178,7 @@ func (suite *ParamTestSuite) SetupTest() {
 				contains:   "reward amount must be positive",
 			},
 		},
-		paramTest{
+		{
 			name: "empty reward denom",
 			params: types.Params{
 				Active: true,

x/kavadist/genesis.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
+
 	"github.com/kava-labs/kava/x/kavadist/types"
 )
 
@@ -35,5 +36,5 @@ func ExportGenesis(ctx sdk.Context, k Keeper) GenesisState {
 	if !found {
 		previousBlockTime = DefaultPreviousBlockTime
 	}
-	return NewGenesisState(params,previousBlockTime)
+	return NewGenesisState(params, previousBlockTime)
 }

x/kavadist/keeper/keeper.go

@@ -7,6 +7,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/store/prefix"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/params/subspace"
+
 	"github.com/kava-labs/kava/x/kavadist/types"
 )
 

x/kavadist/keeper/mint.go

@@ -2,11 +2,12 @@ package keeper
 
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
+
 	cdptypes "github.com/kava-labs/kava/x/cdp/types"
 	"github.com/kava-labs/kava/x/kavadist/types"
 )
 
-// MintPeriodInflation mints new tokens according to the inflation schedule specified in the paramters
+// MintPeriodInflation mints new tokens according to the inflation schedule specified in the parameters
 func (k Keeper) MintPeriodInflation(ctx sdk.Context) error {
 	params := k.GetParams(ctx)
 	if !params.Active {

x/kavadist/keeper/mint_test.go

@@ -5,12 +5,13 @@ import (
 	"time"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/kava-labs/kava/app"
-	"github.com/kava-labs/kava/x/kavadist/keeper"
-	"github.com/kava-labs/kava/x/kavadist/types"
 	"github.com/stretchr/testify/suite"
 	abci "github.com/tendermint/tendermint/abci/types"
 	tmtime "github.com/tendermint/tendermint/types/time"
+
+	"github.com/kava-labs/kava/app"
+	"github.com/kava-labs/kava/x/kavadist/keeper"
+	"github.com/kava-labs/kava/x/kavadist/types"
 )
 
 type MintTestSuite struct {

x/kavadist/keeper/params.go

@@ -2,6 +2,7 @@ package keeper
 
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
+
 	"github.com/kava-labs/kava/x/kavadist/types"
 )
 

x/kavadist/module.go

@@ -12,9 +12,10 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
 	sim "github.com/cosmos/cosmos-sdk/x/simulation"
+	abci "github.com/tendermint/tendermint/abci/types"
+
 	"github.com/kava-labs/kava/x/kavadist/simulation"
 	"github.com/kava-labs/kava/x/kavadist/types"
-	abci "github.com/tendermint/tendermint/abci/types"
 )
 
 var (

x/kavadist/types/params.go

@@ -6,8 +6,9 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/params"
-	cdptypes "github.com/kava-labs/kava/x/cdp/types"
 	tmtime "github.com/tendermint/tendermint/types/time"
+
+	cdptypes "github.com/kava-labs/kava/x/cdp/types"
 )
 
 // Parameter keys and default values

x/kavadist/types/params_test.go

@@ -5,8 +5,9 @@ import (
 	"time"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/kava-labs/kava/x/kavadist/types"
 	"github.com/stretchr/testify/suite"
+
+	"github.com/kava-labs/kava/x/kavadist/types"
 )
 
 type paramTest struct {
@@ -68,15 +69,15 @@ func (suite *ParamTestSuite) SetupTest() {
 	}
 
 	suite.tests = []paramTest{
-		paramTest{
+		{
 			params:     p1,
 			expectPass: true,
 		},
-		paramTest{
+		{
 			params:     p2,
 			expectPass: false,
 		},
-		paramTest{
+		{
 			params:     p3,
 			expectPass: false,
 		},

x/pricefeed/client/cli/query.go

@@ -8,8 +8,9 @@ import (
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/codec"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/kava-labs/kava/x/pricefeed/types"
 	"github.com/spf13/cobra"
+
+	"github.com/kava-labs/kava/x/pricefeed/types"
 )
 
 // GetQueryCmd returns the cli query commands for this module

x/pricefeed/client/cli/tx.go

@@ -14,8 +14,9 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/auth"
 	"github.com/cosmos/cosmos-sdk/x/auth/client/utils"
-	"github.com/kava-labs/kava/x/pricefeed/types"
 	tmtime "github.com/tendermint/tendermint/types/time"
+
+	"github.com/kava-labs/kava/x/pricefeed/types"
 )
 
 // GetTxCmd returns the transaction commands for this module

x/pricefeed/client/rest/tx.go

@@ -10,8 +10,9 @@ import (
 	"github.com/cosmos/cosmos-sdk/types/rest"
 	"github.com/cosmos/cosmos-sdk/x/auth/client/utils"
 	"github.com/gorilla/mux"
-	"github.com/kava-labs/kava/x/pricefeed/types"
 	tmtime "github.com/tendermint/tendermint/types/time"
+
+	"github.com/kava-labs/kava/x/pricefeed/types"
 )
 
 func registerTxRoutes(cliCtx context.CLIContext, r *mux.Router) {

x/pricefeed/genesis_test.go

@@ -4,6 +4,7 @@ import (
 	"testing"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
+
 	"github.com/kava-labs/kava/app"
 	"github.com/kava-labs/kava/x/pricefeed"
 

x/pricefeed/integration_test.go

@@ -13,18 +13,18 @@ func NewPricefeedGenStateMulti() app.GenesisState {
 	pfGenesis := pricefeed.GenesisState{
 		Params: pricefeed.Params{
 			Markets: []pricefeed.Market{
-				pricefeed.Market{MarketID: "btc:usd", BaseAsset: "btc", QuoteAsset: "usd", Oracles: []sdk.AccAddress{}, Active: true},
-				pricefeed.Market{MarketID: "xrp:usd", BaseAsset: "xrp", QuoteAsset: "usd", Oracles: []sdk.AccAddress{}, Active: true},
+				{MarketID: "btc:usd", BaseAsset: "btc", QuoteAsset: "usd", Oracles: []sdk.AccAddress{}, Active: true},
+				{MarketID: "xrp:usd", BaseAsset: "xrp", QuoteAsset: "usd", Oracles: []sdk.AccAddress{}, Active: true},
 			},
 		},
 		PostedPrices: []pricefeed.PostedPrice{
-			pricefeed.PostedPrice{
+			{
 				MarketID:      "btc:usd",
 				OracleAddress: sdk.AccAddress{},
 				Price:         sdk.MustNewDecFromStr("8000.00"),
 				Expiry:        time.Now().Add(1 * time.Hour),
 			},
-			pricefeed.PostedPrice{
+			{
 				MarketID:      "xrp:usd",
 				OracleAddress: sdk.AccAddress{},
 				Price:         sdk.MustNewDecFromStr("0.25"),
@@ -39,18 +39,18 @@ func NewPricefeedGenStateWithOracles(addrs []sdk.AccAddress) app.GenesisState {
 	pfGenesis := pricefeed.GenesisState{
 		Params: pricefeed.Params{
 			Markets: []pricefeed.Market{
-				pricefeed.Market{MarketID: "btc:usd", BaseAsset: "btc", QuoteAsset: "usd", Oracles: addrs, Active: true},
-				pricefeed.Market{MarketID: "xrp:usd", BaseAsset: "xrp", QuoteAsset: "usd", Oracles: addrs, Active: true},
+				{MarketID: "btc:usd", BaseAsset: "btc", QuoteAsset: "usd", Oracles: addrs, Active: true},
+				{MarketID: "xrp:usd", BaseAsset: "xrp", QuoteAsset: "usd", Oracles: addrs, Active: true},
 			},
 		},
 		PostedPrices: []pricefeed.PostedPrice{
-			pricefeed.PostedPrice{
+			{
 				MarketID:      "btc:usd",
 				OracleAddress: addrs[0],
 				Price:         sdk.MustNewDecFromStr("8000.00"),
 				Expiry:        time.Now().Add(1 * time.Hour),
 			},
-			pricefeed.PostedPrice{
+			{
 				MarketID:      "xrp:usd",
 				OracleAddress: addrs[0],
 				Price:         sdk.MustNewDecFromStr("0.25"),

x/pricefeed/keeper/integration_test.go

@@ -13,18 +13,18 @@ func NewPricefeedGenStateMulti() app.GenesisState {
 	pfGenesis := pricefeed.GenesisState{
 		Params: pricefeed.Params{
 			Markets: []pricefeed.Market{
-				pricefeed.Market{MarketID: "btc:usd", BaseAsset: "btc", QuoteAsset: "usd", Oracles: []sdk.AccAddress{}, Active: true},
-				pricefeed.Market{MarketID: "xrp:usd", BaseAsset: "xrp", QuoteAsset: "usd", Oracles: []sdk.AccAddress{}, Active: true},
+				{MarketID: "btc:usd", BaseAsset: "btc", QuoteAsset: "usd", Oracles: []sdk.AccAddress{}, Active: true},
+				{MarketID: "xrp:usd", BaseAsset: "xrp", QuoteAsset: "usd", Oracles: []sdk.AccAddress{}, Active: true},
 			},
 		},
 		PostedPrices: []pricefeed.PostedPrice{
-			pricefeed.PostedPrice{
+			{
 				MarketID:      "btc:usd",
 				OracleAddress: sdk.AccAddress{},
 				Price:         sdk.MustNewDecFromStr("8000.00"),
 				Expiry:        time.Now().Add(1 * time.Hour),
 			},
-			pricefeed.PostedPrice{
+			{
 				MarketID:      "xrp:usd",
 				OracleAddress: sdk.AccAddress{},
 				Price:         sdk.MustNewDecFromStr("0.25"),

x/pricefeed/keeper/params_test.go

@@ -4,11 +4,12 @@ import (
 	"testing"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/kava-labs/kava/app"
-	"github.com/kava-labs/kava/x/pricefeed/keeper"
 	"github.com/stretchr/testify/suite"
 	abci "github.com/tendermint/tendermint/abci/types"
 	tmtime "github.com/tendermint/tendermint/types/time"
+
+	"github.com/kava-labs/kava/app"
+	"github.com/kava-labs/kava/x/pricefeed/keeper"
 )
 
 type KeeperTestSuite struct {