From fe72a24aa09ae82c557787d67674523ae7b7bf55 Mon Sep 17 00:00:00 2001 From: Federico Kunze Date: Thu, 30 Apr 2020 10:23:41 -0400 Subject: [PATCH] update format --- Makefile | 2 ++ app/app.go | 3 ++- app/app_test.go | 3 ++- app/sim_test.go | 6 ++++-- app/test_common.go | 3 ++- cmd/kvcli/cmd_keys.go | 5 +++-- cmd/kvd/main.go | 3 ++- rest_test/setup/setuptest.go | 1 + x/auction/abci_test.go | 4 +++- x/auction/keeper/auctions_test.go | 4 +++- x/auction/keeper/bidding_test.go | 4 +++- x/auction/keeper/keeper.go | 1 + x/auction/keeper/keeper_test.go | 1 + x/auction/keeper/math_test.go | 3 ++- x/auction/keeper/querier_test.go | 4 +++- x/auction/module.go | 1 + x/auction/simulation/decoder_test.go | 1 + x/auction/types/auctions_test.go | 3 ++- x/auction/types/genesis_test.go | 3 ++- x/auction/types/msg_test.go | 3 ++- x/auction/types/params_test.go | 3 ++- x/bep3/client/cli/query.go | 4 +++- x/bep3/client/cli/tx.go | 4 +++- x/bep3/client/rest/tx.go | 3 ++- x/bep3/genesis_test.go | 4 +++- x/bep3/integration_test.go | 1 + x/bep3/keeper/asset_test.go | 4 +++- x/bep3/keeper/integration_test.go | 1 + x/bep3/keeper/keeper.go | 1 + x/bep3/keeper/keeper_test.go | 4 +++- x/bep3/keeper/params_test.go | 4 +++- x/bep3/module.go | 6 ++++-- x/bep3/types/common_test.go | 1 + x/bep3/types/genesis_test.go | 3 ++- x/bep3/types/hash.go | 1 + x/bep3/types/hash_test.go | 3 ++- x/bep3/types/params_test.go | 3 ++- x/cdp/abci.go | 1 + x/cdp/abci_test.go | 4 +++- x/cdp/genesis_test.go | 3 ++- x/cdp/handler_test.go | 1 + x/cdp/keeper/auctions_test.go | 1 + x/cdp/keeper/cdp_test.go | 4 +++- x/cdp/keeper/deposit_test.go | 4 +++- x/cdp/keeper/draw_test.go | 4 +++- x/cdp/keeper/fees_test.go | 1 + x/cdp/keeper/keeper_bench_test.go | 1 + x/cdp/keeper/querier_test.go | 4 +++- x/cdp/keeper/savings_test.go | 4 +++- x/cdp/keeper/seize_test.go | 4 +++- x/cdp/module.go | 1 + x/cdp/simulation/decoder_test.go | 1 + x/cdp/simulation/utils_test.go | 3 ++- x/cdp/types/keys_test.go | 4 +++- x/cdp/types/msg_test.go | 3 ++- x/cdp/types/params.go | 1 + x/cdp/types/params_test.go | 3 ++- x/cdp/types/utils_test.go | 3 ++- x/committee/abci.go | 1 + x/committee/abci_test.go | 1 + x/committee/client/cli/cli_test.go | 3 ++- x/committee/client/cli/tx.go | 1 + x/committee/genesis_test.go | 1 + x/committee/handler_test.go | 4 +++- x/committee/keeper/keeper_test.go | 1 + x/committee/keeper/proposal_test.go | 1 + x/committee/keeper/querier.go | 1 + x/committee/keeper/querier_test.go | 1 + x/committee/module.go | 1 + x/committee/proposal_handler_test.go | 4 +++- x/committee/simulation/decoder.go | 1 + x/committee/types/committee_test.go | 3 ++- x/committee/types/genesis_test.go | 1 + x/committee/types/permissions_test.go | 3 ++- x/incentive/client/cli/query.go | 3 ++- x/incentive/client/cli/tx.go | 3 ++- x/incentive/client/rest/query.go | 3 ++- x/incentive/client/rest/tx.go | 3 ++- x/incentive/handler_test.go | 4 +++- x/incentive/keeper/keeper_test.go | 4 +++- x/incentive/keeper/payout_test.go | 1 + x/incentive/keeper/querier.go | 1 + x/incentive/keeper/rewards_test.go | 1 + x/incentive/module.go | 6 ++++-- x/incentive/simulation/decoder.go | 1 + x/incentive/simulation/decoder_test.go | 4 +++- x/incentive/types/account_test.go | 3 ++- x/incentive/types/msg_test.go | 4 +++- x/incentive/types/params.go | 1 + x/incentive/types/params_test.go | 3 ++- x/kavadist/keeper/mint_test.go | 4 +++- x/kavadist/module.go | 1 + x/kavadist/simulation/utils_test.go | 3 ++- x/kavadist/types/params.go | 1 + x/kavadist/types/params_test.go | 3 ++- x/pricefeed/client/cli/query.go | 3 ++- x/pricefeed/client/cli/tx.go | 1 + x/pricefeed/client/rest/rest.go | 3 ++- x/pricefeed/client/rest/tx.go | 4 +++- x/pricefeed/keeper/keeper_test.go | 4 +++- x/pricefeed/keeper/params_test.go | 4 +++- x/pricefeed/module.go | 1 + x/pricefeed/simulation/decoder.go | 1 + x/pricefeed/simulation/decoder_test.go | 1 + x/pricefeed/types/msgs_test.go | 4 +++- x/validator-vesting/abci.go | 1 + x/validator-vesting/abci_test.go | 4 +++- x/validator-vesting/client/rest/query.go | 3 ++- x/validator-vesting/keeper/keeper.go | 1 + x/validator-vesting/keeper/keeper_test.go | 1 + x/validator-vesting/keeper/test_common.go | 3 ++- x/validator-vesting/module.go | 1 + x/validator-vesting/simulation/decoder.go | 1 + x/validator-vesting/simulation/decoder_test.go | 4 +++- x/validator-vesting/types/validator_vesting_account.go | 1 + x/validator-vesting/types/validator_vesting_account_test.go | 1 + 116 files changed, 223 insertions(+), 72 deletions(-) diff --git a/Makefile b/Makefile index 23bc0592..9bb3f462 100644 --- a/Makefile +++ b/Makefile @@ -113,6 +113,8 @@ 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/tendermint/tendermint + find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -name '*.pb.go' | xargs goimports -w -local github.com/cosmos/cosmos-sdk 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 diff --git a/app/app.go b/app/app.go index ba62c3c2..f1ba2e71 100644 --- a/app/app.go +++ b/app/app.go @@ -4,10 +4,11 @@ import ( "io" "os" + dbm "github.com/tendermint/tm-db" + abci "github.com/tendermint/tendermint/abci/types" "github.com/tendermint/tendermint/libs/log" tmos "github.com/tendermint/tendermint/libs/os" - dbm "github.com/tendermint/tm-db" bam "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/codec" diff --git a/app/app_test.go b/app/app_test.go index ae3dfbf2..19801b7b 100644 --- a/app/app_test.go +++ b/app/app_test.go @@ -5,9 +5,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/libs/log" db "github.com/tendermint/tm-db" + "github.com/tendermint/tendermint/libs/log" + "github.com/cosmos/cosmos-sdk/codec" abci "github.com/tendermint/tendermint/abci/types" diff --git a/app/sim_test.go b/app/sim_test.go index 3b341cbd..52741ab5 100644 --- a/app/sim_test.go +++ b/app/sim_test.go @@ -6,6 +6,9 @@ import ( "os" "testing" + "github.com/stretchr/testify/require" + dbm "github.com/tendermint/tm-db" + "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/simapp" "github.com/cosmos/cosmos-sdk/simapp/helpers" @@ -20,10 +23,9 @@ 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" diff --git a/app/test_common.go b/app/test_common.go index f0d4b0e7..78b80486 100644 --- a/app/test_common.go +++ b/app/test_common.go @@ -6,12 +6,13 @@ import ( "github.com/stretchr/testify/require" + tmdb "github.com/tendermint/tm-db" + abci "github.com/tendermint/tendermint/abci/types" "github.com/tendermint/tendermint/crypto" "github.com/tendermint/tendermint/crypto/ed25519" "github.com/tendermint/tendermint/crypto/secp256k1" "github.com/tendermint/tendermint/libs/log" - tmdb "github.com/tendermint/tm-db" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/cmd/kvcli/cmd_keys.go b/cmd/kvcli/cmd_keys.go index d1bc35cd..c17d8927 100644 --- a/cmd/kvcli/cmd_keys.go +++ b/cmd/kvcli/cmd_keys.go @@ -3,11 +3,12 @@ package main import ( "fmt" + "github.com/spf13/cobra" + "github.com/spf13/viper" + "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/keys" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/spf13/cobra" - "github.com/spf13/viper" "github.com/kava-labs/kava/app" ) diff --git a/cmd/kvd/main.go b/cmd/kvd/main.go index 148f3ba8..d551ab96 100644 --- a/cmd/kvd/main.go +++ b/cmd/kvd/main.go @@ -7,11 +7,12 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" + dbm "github.com/tendermint/tm-db" + abci "github.com/tendermint/tendermint/abci/types" "github.com/tendermint/tendermint/libs/cli" "github.com/tendermint/tendermint/libs/log" tmtypes "github.com/tendermint/tendermint/types" - dbm "github.com/tendermint/tm-db" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/client/flags" diff --git a/rest_test/setup/setuptest.go b/rest_test/setup/setuptest.go index 4f7daca6..c6d384a3 100644 --- a/rest_test/setup/setuptest.go +++ b/rest_test/setup/setuptest.go @@ -22,6 +22,7 @@ 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" diff --git a/x/auction/abci_test.go b/x/auction/abci_test.go index c7274b7b..fed82a39 100644 --- a/x/auction/abci_test.go +++ b/x/auction/abci_test.go @@ -3,11 +3,13 @@ package auction_test import ( "testing" + "github.com/stretchr/testify/require" + sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/auth" authexported "github.com/cosmos/cosmos-sdk/x/auth/exported" "github.com/cosmos/cosmos-sdk/x/supply" - "github.com/stretchr/testify/require" + abci "github.com/tendermint/tendermint/abci/types" "github.com/kava-labs/kava/app" diff --git a/x/auction/keeper/auctions_test.go b/x/auction/keeper/auctions_test.go index c8c19c1b..2da0a9f4 100644 --- a/x/auction/keeper/auctions_test.go +++ b/x/auction/keeper/auctions_test.go @@ -4,11 +4,13 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/auth" authexported "github.com/cosmos/cosmos-sdk/x/auth/exported" "github.com/cosmos/cosmos-sdk/x/supply" - "github.com/stretchr/testify/require" + abci "github.com/tendermint/tendermint/abci/types" "github.com/kava-labs/kava/app" diff --git a/x/auction/keeper/bidding_test.go b/x/auction/keeper/bidding_test.go index 9a34cabc..34638194 100644 --- a/x/auction/keeper/bidding_test.go +++ b/x/auction/keeper/bidding_test.go @@ -6,11 +6,13 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/auth" authexported "github.com/cosmos/cosmos-sdk/x/auth/exported" "github.com/cosmos/cosmos-sdk/x/supply" - "github.com/stretchr/testify/require" + abci "github.com/tendermint/tendermint/abci/types" "github.com/kava-labs/kava/app" diff --git a/x/auction/keeper/keeper.go b/x/auction/keeper/keeper.go index da8caf89..7250db4e 100644 --- a/x/auction/keeper/keeper.go +++ b/x/auction/keeper/keeper.go @@ -8,6 +8,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/tendermint/tendermint/libs/log" "github.com/kava-labs/kava/x/auction/types" diff --git a/x/auction/keeper/keeper_test.go b/x/auction/keeper/keeper_test.go index 4b811bb9..48044b85 100644 --- a/x/auction/keeper/keeper_test.go +++ b/x/auction/keeper/keeper_test.go @@ -5,6 +5,7 @@ import ( "time" "github.com/stretchr/testify/require" + abci "github.com/tendermint/tendermint/abci/types" "github.com/kava-labs/kava/app" diff --git a/x/auction/keeper/math_test.go b/x/auction/keeper/math_test.go index ee42c594..6ff02765 100644 --- a/x/auction/keeper/math_test.go +++ b/x/auction/keeper/math_test.go @@ -3,8 +3,9 @@ package keeper import ( "testing" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" + + sdk "github.com/cosmos/cosmos-sdk/types" ) func TestSplitIntIntoWeightedBuckets(t *testing.T) { diff --git a/x/auction/keeper/querier_test.go b/x/auction/keeper/querier_test.go index 78ce6b5d..20763bc8 100644 --- a/x/auction/keeper/querier_test.go +++ b/x/auction/keeper/querier_test.go @@ -5,12 +5,14 @@ import ( "strings" "testing" + "github.com/stretchr/testify/suite" + sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/auth" 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" diff --git a/x/auction/module.go b/x/auction/module.go index dd1134a0..617ecc82 100644 --- a/x/auction/module.go +++ b/x/auction/module.go @@ -14,6 +14,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" "github.com/cosmos/cosmos-sdk/x/auth" sim "github.com/cosmos/cosmos-sdk/x/simulation" + abci "github.com/tendermint/tendermint/abci/types" "github.com/kava-labs/kava/x/auction/client/cli" diff --git a/x/auction/simulation/decoder_test.go b/x/auction/simulation/decoder_test.go index f1109332..e46f2a72 100644 --- a/x/auction/simulation/decoder_test.go +++ b/x/auction/simulation/decoder_test.go @@ -6,6 +6,7 @@ import ( "time" "github.com/stretchr/testify/require" + "github.com/tendermint/tendermint/libs/kv" "github.com/cosmos/cosmos-sdk/codec" diff --git a/x/auction/types/auctions_test.go b/x/auction/types/auctions_test.go index f46968d6..49953cbe 100644 --- a/x/auction/types/auctions_test.go +++ b/x/auction/types/auctions_test.go @@ -4,8 +4,9 @@ import ( "testing" "time" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" + + sdk "github.com/cosmos/cosmos-sdk/types" ) const ( diff --git a/x/auction/types/genesis_test.go b/x/auction/types/genesis_test.go index 4810741e..4248d6e6 100644 --- a/x/auction/types/genesis_test.go +++ b/x/auction/types/genesis_test.go @@ -3,8 +3,9 @@ package types import ( "testing" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" + + sdk "github.com/cosmos/cosmos-sdk/types" ) var testCoin = sdk.NewInt64Coin("test", 20) diff --git a/x/auction/types/msg_test.go b/x/auction/types/msg_test.go index f78e7102..7ac2909c 100644 --- a/x/auction/types/msg_test.go +++ b/x/auction/types/msg_test.go @@ -3,8 +3,9 @@ package types import ( "testing" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" + + sdk "github.com/cosmos/cosmos-sdk/types" ) func TestMsgPlaceBid_ValidateBasic(t *testing.T) { diff --git a/x/auction/types/params_test.go b/x/auction/types/params_test.go index 253a180a..f2d65091 100644 --- a/x/auction/types/params_test.go +++ b/x/auction/types/params_test.go @@ -4,8 +4,9 @@ import ( "testing" "time" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" + + sdk "github.com/cosmos/cosmos-sdk/types" ) func TestParams_Validate(t *testing.T) { diff --git a/x/bep3/client/cli/query.go b/x/bep3/client/cli/query.go index a60e52af..edcca618 100644 --- a/x/bep3/client/cli/query.go +++ b/x/bep3/client/cli/query.go @@ -6,11 +6,13 @@ import ( "strconv" "strings" + "github.com/spf13/cobra" + "github.com/cosmos/cosmos-sdk/client/context" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/spf13/cobra" + tmtime "github.com/tendermint/tendermint/types/time" "github.com/kava-labs/kava/x/bep3/types" diff --git a/x/bep3/client/cli/tx.go b/x/bep3/client/cli/tx.go index 6de11a45..47c45410 100644 --- a/x/bep3/client/cli/tx.go +++ b/x/bep3/client/cli/tx.go @@ -7,6 +7,8 @@ import ( "strconv" "strings" + "github.com/spf13/cobra" + "github.com/cosmos/cosmos-sdk/client/context" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/codec" @@ -14,7 +16,7 @@ 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/spf13/cobra" + tmtime "github.com/tendermint/tendermint/types/time" "github.com/kava-labs/kava/x/bep3/types" diff --git a/x/bep3/client/rest/tx.go b/x/bep3/client/rest/tx.go index 022993e3..2f5a08ae 100644 --- a/x/bep3/client/rest/tx.go +++ b/x/bep3/client/rest/tx.go @@ -4,11 +4,12 @@ import ( "fmt" "net/http" + "github.com/gorilla/mux" + "github.com/cosmos/cosmos-sdk/client/context" sdk "github.com/cosmos/cosmos-sdk/types" "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/bep3/types" ) diff --git a/x/bep3/genesis_test.go b/x/bep3/genesis_test.go index 7b76af77..e29ef730 100644 --- a/x/bep3/genesis_test.go +++ b/x/bep3/genesis_test.go @@ -3,8 +3,10 @@ package bep3_test import ( "testing" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/suite" + + sdk "github.com/cosmos/cosmos-sdk/types" + abci "github.com/tendermint/tendermint/abci/types" tmtime "github.com/tendermint/tendermint/types/time" diff --git a/x/bep3/integration_test.go b/x/bep3/integration_test.go index bb9bc7c2..1abfd8ee 100644 --- a/x/bep3/integration_test.go +++ b/x/bep3/integration_test.go @@ -4,6 +4,7 @@ import ( "time" sdk "github.com/cosmos/cosmos-sdk/types" + tmtime "github.com/tendermint/tendermint/types/time" "github.com/kava-labs/kava/app" diff --git a/x/bep3/keeper/asset_test.go b/x/bep3/keeper/asset_test.go index 4d4f2748..67447c55 100644 --- a/x/bep3/keeper/asset_test.go +++ b/x/bep3/keeper/asset_test.go @@ -3,8 +3,10 @@ package keeper_test import ( "testing" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/suite" + + sdk "github.com/cosmos/cosmos-sdk/types" + abci "github.com/tendermint/tendermint/abci/types" tmtime "github.com/tendermint/tendermint/types/time" diff --git a/x/bep3/keeper/integration_test.go b/x/bep3/keeper/integration_test.go index 6b231bb2..88c38d3f 100644 --- a/x/bep3/keeper/integration_test.go +++ b/x/bep3/keeper/integration_test.go @@ -4,6 +4,7 @@ import ( "time" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/tendermint/tendermint/crypto" tmtime "github.com/tendermint/tendermint/types/time" diff --git a/x/bep3/keeper/keeper.go b/x/bep3/keeper/keeper.go index f7612aaf..430f658d 100644 --- a/x/bep3/keeper/keeper.go +++ b/x/bep3/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/tendermint/tendermint/libs/log" "github.com/kava-labs/kava/x/bep3/types" diff --git a/x/bep3/keeper/keeper_test.go b/x/bep3/keeper/keeper_test.go index 4bd4e109..363a0ea3 100644 --- a/x/bep3/keeper/keeper_test.go +++ b/x/bep3/keeper/keeper_test.go @@ -4,8 +4,10 @@ import ( "testing" "time" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/suite" + + sdk "github.com/cosmos/cosmos-sdk/types" + abci "github.com/tendermint/tendermint/abci/types" tmtime "github.com/tendermint/tendermint/types/time" diff --git a/x/bep3/keeper/params_test.go b/x/bep3/keeper/params_test.go index b4131dc0..8c602dba 100644 --- a/x/bep3/keeper/params_test.go +++ b/x/bep3/keeper/params_test.go @@ -4,8 +4,10 @@ import ( "errors" "testing" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/suite" + + sdk "github.com/cosmos/cosmos-sdk/types" + abci "github.com/tendermint/tendermint/abci/types" tmtime "github.com/tendermint/tendermint/types/time" diff --git a/x/bep3/module.go b/x/bep3/module.go index bf675bff..de15fac9 100644 --- a/x/bep3/module.go +++ b/x/bep3/module.go @@ -4,14 +4,16 @@ import ( "encoding/json" "math/rand" + "github.com/gorilla/mux" + "github.com/spf13/cobra" + "github.com/cosmos/cosmos-sdk/client/context" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" "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/bep3/client/cli" diff --git a/x/bep3/types/common_test.go b/x/bep3/types/common_test.go index 0e0d9743..2dccb4fe 100644 --- a/x/bep3/types/common_test.go +++ b/x/bep3/types/common_test.go @@ -4,6 +4,7 @@ import ( "time" sdk "github.com/cosmos/cosmos-sdk/types" + tmtime "github.com/tendermint/tendermint/types/time" "github.com/kava-labs/kava/x/bep3/types" diff --git a/x/bep3/types/genesis_test.go b/x/bep3/types/genesis_test.go index 772a84f0..4c2be611 100644 --- a/x/bep3/types/genesis_test.go +++ b/x/bep3/types/genesis_test.go @@ -3,9 +3,10 @@ package types_test import ( "testing" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/suite" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/kava-labs/kava/app" "github.com/kava-labs/kava/x/bep3/types" ) diff --git a/x/bep3/types/hash.go b/x/bep3/types/hash.go index bcb23fcf..f5772eb0 100644 --- a/x/bep3/types/hash.go +++ b/x/bep3/types/hash.go @@ -8,6 +8,7 @@ import ( "strings" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/tendermint/tendermint/crypto/tmhash" ) diff --git a/x/bep3/types/hash_test.go b/x/bep3/types/hash_test.go index b38c59a7..ebfb0e46 100644 --- a/x/bep3/types/hash_test.go +++ b/x/bep3/types/hash_test.go @@ -3,9 +3,10 @@ package types_test import ( "testing" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/suite" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/kava-labs/kava/app" "github.com/kava-labs/kava/x/bep3/types" ) diff --git a/x/bep3/types/params_test.go b/x/bep3/types/params_test.go index 0965a447..9532cbf5 100644 --- a/x/bep3/types/params_test.go +++ b/x/bep3/types/params_test.go @@ -3,9 +3,10 @@ package types_test import ( "testing" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/suite" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/kava-labs/kava/app" "github.com/kava-labs/kava/x/bep3/types" ) diff --git a/x/cdp/abci.go b/x/cdp/abci.go index 7df7e69d..23410150 100644 --- a/x/cdp/abci.go +++ b/x/cdp/abci.go @@ -4,6 +4,7 @@ import ( "fmt" sdk "github.com/cosmos/cosmos-sdk/types" + abci "github.com/tendermint/tendermint/abci/types" "github.com/kava-labs/kava/x/cdp/types" diff --git a/x/cdp/abci_test.go b/x/cdp/abci_test.go index d9a37977..7f627976 100644 --- a/x/cdp/abci_test.go +++ b/x/cdp/abci_test.go @@ -5,9 +5,11 @@ import ( "testing" "time" + "github.com/stretchr/testify/suite" + 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" diff --git a/x/cdp/genesis_test.go b/x/cdp/genesis_test.go index c02574e2..849583eb 100644 --- a/x/cdp/genesis_test.go +++ b/x/cdp/genesis_test.go @@ -5,9 +5,10 @@ import ( "testing" "time" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/suite" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/kava-labs/kava/app" "github.com/kava-labs/kava/x/cdp" ) diff --git a/x/cdp/handler_test.go b/x/cdp/handler_test.go index 7d26c1de..13509145 100644 --- a/x/cdp/handler_test.go +++ b/x/cdp/handler_test.go @@ -4,6 +4,7 @@ import ( "testing" sdk "github.com/cosmos/cosmos-sdk/types" + abci "github.com/tendermint/tendermint/abci/types" tmtime "github.com/tendermint/tendermint/types/time" diff --git a/x/cdp/keeper/auctions_test.go b/x/cdp/keeper/auctions_test.go index 4be3af65..ba276772 100644 --- a/x/cdp/keeper/auctions_test.go +++ b/x/cdp/keeper/auctions_test.go @@ -11,6 +11,7 @@ import ( "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" ) diff --git a/x/cdp/keeper/cdp_test.go b/x/cdp/keeper/cdp_test.go index a7630c49..87d0d8ef 100644 --- a/x/cdp/keeper/cdp_test.go +++ b/x/cdp/keeper/cdp_test.go @@ -5,8 +5,10 @@ import ( "testing" "time" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/suite" + + sdk "github.com/cosmos/cosmos-sdk/types" + abci "github.com/tendermint/tendermint/abci/types" tmtime "github.com/tendermint/tendermint/types/time" diff --git a/x/cdp/keeper/deposit_test.go b/x/cdp/keeper/deposit_test.go index 76a0a1b3..7a1e27d7 100644 --- a/x/cdp/keeper/deposit_test.go +++ b/x/cdp/keeper/deposit_test.go @@ -4,8 +4,10 @@ import ( "errors" "testing" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/suite" + + sdk "github.com/cosmos/cosmos-sdk/types" + abci "github.com/tendermint/tendermint/abci/types" tmtime "github.com/tendermint/tendermint/types/time" diff --git a/x/cdp/keeper/draw_test.go b/x/cdp/keeper/draw_test.go index e4a9991b..8948ba80 100644 --- a/x/cdp/keeper/draw_test.go +++ b/x/cdp/keeper/draw_test.go @@ -5,8 +5,10 @@ import ( "testing" "time" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/suite" + + sdk "github.com/cosmos/cosmos-sdk/types" + abci "github.com/tendermint/tendermint/abci/types" tmtime "github.com/tendermint/tendermint/types/time" diff --git a/x/cdp/keeper/fees_test.go b/x/cdp/keeper/fees_test.go index 7c7ced3b..fc2966d0 100644 --- a/x/cdp/keeper/fees_test.go +++ b/x/cdp/keeper/fees_test.go @@ -7,6 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/suite" + abci "github.com/tendermint/tendermint/abci/types" tmtime "github.com/tendermint/tendermint/types/time" diff --git a/x/cdp/keeper/keeper_bench_test.go b/x/cdp/keeper/keeper_bench_test.go index 462d3275..cd7bf70c 100644 --- a/x/cdp/keeper/keeper_bench_test.go +++ b/x/cdp/keeper/keeper_bench_test.go @@ -5,6 +5,7 @@ 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" diff --git a/x/cdp/keeper/querier_test.go b/x/cdp/keeper/querier_test.go index 171bbdb5..879ab5ac 100644 --- a/x/cdp/keeper/querier_test.go +++ b/x/cdp/keeper/querier_test.go @@ -7,9 +7,11 @@ import ( "testing" "time" + "github.com/stretchr/testify/suite" + 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" diff --git a/x/cdp/keeper/savings_test.go b/x/cdp/keeper/savings_test.go index 8d64889d..a72c5146 100644 --- a/x/cdp/keeper/savings_test.go +++ b/x/cdp/keeper/savings_test.go @@ -3,8 +3,10 @@ package keeper_test import ( "testing" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/suite" + + sdk "github.com/cosmos/cosmos-sdk/types" + abci "github.com/tendermint/tendermint/abci/types" tmtime "github.com/tendermint/tendermint/types/time" diff --git a/x/cdp/keeper/seize_test.go b/x/cdp/keeper/seize_test.go index 92fe3319..45b707b9 100644 --- a/x/cdp/keeper/seize_test.go +++ b/x/cdp/keeper/seize_test.go @@ -6,9 +6,11 @@ import ( "testing" "time" + "github.com/stretchr/testify/suite" + 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" diff --git a/x/cdp/module.go b/x/cdp/module.go index 9eb8ad3d..49db2add 100644 --- a/x/cdp/module.go +++ b/x/cdp/module.go @@ -12,6 +12,7 @@ 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/cdp/client/cli" diff --git a/x/cdp/simulation/decoder_test.go b/x/cdp/simulation/decoder_test.go index cbb78fcd..459d87d7 100644 --- a/x/cdp/simulation/decoder_test.go +++ b/x/cdp/simulation/decoder_test.go @@ -6,6 +6,7 @@ import ( "time" "github.com/stretchr/testify/require" + "github.com/tendermint/tendermint/libs/kv" "github.com/cosmos/cosmos-sdk/codec" diff --git a/x/cdp/simulation/utils_test.go b/x/cdp/simulation/utils_test.go index 216c057f..e8634022 100644 --- a/x/cdp/simulation/utils_test.go +++ b/x/cdp/simulation/utils_test.go @@ -3,9 +3,10 @@ package simulation_test import ( "testing" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/kava-labs/kava/x/cdp/simulation" ) diff --git a/x/cdp/types/keys_test.go b/x/cdp/types/keys_test.go index 935f6415..c016fa18 100644 --- a/x/cdp/types/keys_test.go +++ b/x/cdp/types/keys_test.go @@ -3,8 +3,10 @@ package types import ( "testing" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" + + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/tendermint/tendermint/crypto/ed25519" ) diff --git a/x/cdp/types/msg_test.go b/x/cdp/types/msg_test.go index ac6beebb..8fb7c50a 100644 --- a/x/cdp/types/msg_test.go +++ b/x/cdp/types/msg_test.go @@ -3,8 +3,9 @@ package types import ( "testing" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" + + sdk "github.com/cosmos/cosmos-sdk/types" ) var ( diff --git a/x/cdp/types/params.go b/x/cdp/types/params.go index 430ccdfe..02bf75cb 100644 --- a/x/cdp/types/params.go +++ b/x/cdp/types/params.go @@ -8,6 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/cosmos/cosmos-sdk/x/params" + tmtime "github.com/tendermint/tendermint/types/time" ) diff --git a/x/cdp/types/params_test.go b/x/cdp/types/params_test.go index ea2c1e72..5bba5871 100644 --- a/x/cdp/types/params_test.go +++ b/x/cdp/types/params_test.go @@ -5,9 +5,10 @@ import ( "testing" "time" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/suite" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/kava-labs/kava/x/cdp/types" ) diff --git a/x/cdp/types/utils_test.go b/x/cdp/types/utils_test.go index 9b8b41c0..48a6947e 100644 --- a/x/cdp/types/utils_test.go +++ b/x/cdp/types/utils_test.go @@ -3,9 +3,10 @@ package types import ( "testing" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + sdk "github.com/cosmos/cosmos-sdk/types" ) func TestSortableDecBytes(t *testing.T) { diff --git a/x/committee/abci.go b/x/committee/abci.go index 8e1c220e..d6ec639c 100644 --- a/x/committee/abci.go +++ b/x/committee/abci.go @@ -2,6 +2,7 @@ package committee import ( sdk "github.com/cosmos/cosmos-sdk/types" + abci "github.com/tendermint/tendermint/abci/types" ) diff --git a/x/committee/abci_test.go b/x/committee/abci_test.go index 8750822e..d112bb30 100644 --- a/x/committee/abci_test.go +++ b/x/committee/abci_test.go @@ -8,6 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/gov" + abci "github.com/tendermint/tendermint/abci/types" "github.com/kava-labs/kava/app" diff --git a/x/committee/client/cli/cli_test.go b/x/committee/client/cli/cli_test.go index 20b6c564..37e5d086 100644 --- a/x/committee/client/cli/cli_test.go +++ b/x/committee/client/cli/cli_test.go @@ -3,9 +3,10 @@ package cli_test import ( "testing" - "github.com/cosmos/cosmos-sdk/codec" "github.com/stretchr/testify/suite" + "github.com/cosmos/cosmos-sdk/codec" + "github.com/kava-labs/kava/app" "github.com/kava-labs/kava/x/committee/client/cli" ) diff --git a/x/committee/client/cli/tx.go b/x/committee/client/cli/tx.go index ea8fc273..d4575a47 100644 --- a/x/committee/client/cli/tx.go +++ b/x/committee/client/cli/tx.go @@ -19,6 +19,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/auth/client/utils" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" "github.com/cosmos/cosmos-sdk/x/params" + "github.com/tendermint/tendermint/crypto" "github.com/kava-labs/kava/x/committee/types" diff --git a/x/committee/genesis_test.go b/x/committee/genesis_test.go index c64664eb..5cf8f7de 100644 --- a/x/committee/genesis_test.go +++ b/x/committee/genesis_test.go @@ -4,6 +4,7 @@ import ( "testing" "github.com/stretchr/testify/suite" + abci "github.com/tendermint/tendermint/abci/types" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/committee/handler_test.go b/x/committee/handler_test.go index 7ae9d781..2b71239e 100644 --- a/x/committee/handler_test.go +++ b/x/committee/handler_test.go @@ -4,10 +4,12 @@ import ( "testing" "time" + "github.com/stretchr/testify/suite" + sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/distribution" "github.com/cosmos/cosmos-sdk/x/params" - "github.com/stretchr/testify/suite" + abci "github.com/tendermint/tendermint/abci/types" "github.com/kava-labs/kava/app" diff --git a/x/committee/keeper/keeper_test.go b/x/committee/keeper/keeper_test.go index 3001eec0..1d712e1c 100644 --- a/x/committee/keeper/keeper_test.go +++ b/x/committee/keeper/keeper_test.go @@ -8,6 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/gov" + abci "github.com/tendermint/tendermint/abci/types" "github.com/kava-labs/kava/app" diff --git a/x/committee/keeper/proposal_test.go b/x/committee/keeper/proposal_test.go index e8fddd5e..7f8be16b 100644 --- a/x/committee/keeper/proposal_test.go +++ b/x/committee/keeper/proposal_test.go @@ -8,6 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/gov" "github.com/cosmos/cosmos-sdk/x/params" + abci "github.com/tendermint/tendermint/abci/types" "github.com/kava-labs/kava/app" diff --git a/x/committee/keeper/querier.go b/x/committee/keeper/querier.go index 6e33c7c1..ca4ce994 100644 --- a/x/committee/keeper/querier.go +++ b/x/committee/keeper/querier.go @@ -4,6 +4,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + abci "github.com/tendermint/tendermint/abci/types" "github.com/kava-labs/kava/x/committee/types" diff --git a/x/committee/keeper/querier_test.go b/x/committee/keeper/querier_test.go index 2278fcc6..762bf605 100644 --- a/x/committee/keeper/querier_test.go +++ b/x/committee/keeper/querier_test.go @@ -10,6 +10,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/gov" + abci "github.com/tendermint/tendermint/abci/types" "github.com/kava-labs/kava/app" diff --git a/x/committee/module.go b/x/committee/module.go index 84f06265..857d8a1e 100644 --- a/x/committee/module.go +++ b/x/committee/module.go @@ -13,6 +13,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" "github.com/cosmos/cosmos-sdk/x/auth" sim "github.com/cosmos/cosmos-sdk/x/simulation" + abci "github.com/tendermint/tendermint/abci/types" "github.com/kava-labs/kava/x/committee/client/cli" diff --git a/x/committee/proposal_handler_test.go b/x/committee/proposal_handler_test.go index f0ef01ea..4fa97b26 100644 --- a/x/committee/proposal_handler_test.go +++ b/x/committee/proposal_handler_test.go @@ -4,10 +4,12 @@ import ( "testing" "time" + "github.com/stretchr/testify/suite" + "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/gov" - "github.com/stretchr/testify/suite" + abci "github.com/tendermint/tendermint/abci/types" "github.com/kava-labs/kava/app" diff --git a/x/committee/simulation/decoder.go b/x/committee/simulation/decoder.go index bcbba73f..954c1f3a 100644 --- a/x/committee/simulation/decoder.go +++ b/x/committee/simulation/decoder.go @@ -2,6 +2,7 @@ package simulation import ( "github.com/cosmos/cosmos-sdk/codec" + "github.com/tendermint/tendermint/libs/kv" ) diff --git a/x/committee/types/committee_test.go b/x/committee/types/committee_test.go index 54204292..8582b447 100644 --- a/x/committee/types/committee_test.go +++ b/x/committee/types/committee_test.go @@ -4,9 +4,10 @@ import ( "testing" "time" + "github.com/stretchr/testify/suite" + govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" - "github.com/stretchr/testify/suite" ) var _ PubProposal = UnregisteredPubProposal{} diff --git a/x/committee/types/genesis_test.go b/x/committee/types/genesis_test.go index d1ba83d7..3cfe64e4 100644 --- a/x/committee/types/genesis_test.go +++ b/x/committee/types/genesis_test.go @@ -8,6 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" + "github.com/tendermint/tendermint/crypto" ) diff --git a/x/committee/types/permissions_test.go b/x/committee/types/permissions_test.go index 8218985f..54baaa10 100644 --- a/x/committee/types/permissions_test.go +++ b/x/committee/types/permissions_test.go @@ -3,9 +3,10 @@ package types import ( "testing" + "github.com/stretchr/testify/suite" + govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" - "github.com/stretchr/testify/suite" ) type PermissionsTestSuite struct { diff --git a/x/incentive/client/cli/query.go b/x/incentive/client/cli/query.go index f36300b9..ea37bd97 100644 --- a/x/incentive/client/cli/query.go +++ b/x/incentive/client/cli/query.go @@ -4,12 +4,13 @@ import ( "fmt" "strings" + "github.com/spf13/cobra" + "github.com/cosmos/cosmos-sdk/client/context" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/version" - "github.com/spf13/cobra" "github.com/kava-labs/kava/x/incentive/types" ) diff --git a/x/incentive/client/cli/tx.go b/x/incentive/client/cli/tx.go index c17e1047..5e77d2f0 100644 --- a/x/incentive/client/cli/tx.go +++ b/x/incentive/client/cli/tx.go @@ -5,6 +5,8 @@ import ( "fmt" "strings" + "github.com/spf13/cobra" + "github.com/cosmos/cosmos-sdk/client/context" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/codec" @@ -12,7 +14,6 @@ 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/spf13/cobra" "github.com/kava-labs/kava/x/incentive/types" ) diff --git a/x/incentive/client/rest/query.go b/x/incentive/client/rest/query.go index 9f541b1e..3d1b1aed 100644 --- a/x/incentive/client/rest/query.go +++ b/x/incentive/client/rest/query.go @@ -4,10 +4,11 @@ import ( "fmt" "net/http" + "github.com/gorilla/mux" + "github.com/cosmos/cosmos-sdk/client/context" 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" ) diff --git a/x/incentive/client/rest/tx.go b/x/incentive/client/rest/tx.go index 254fbb36..34b2aa96 100644 --- a/x/incentive/client/rest/tx.go +++ b/x/incentive/client/rest/tx.go @@ -3,11 +3,12 @@ package rest import ( "net/http" + "github.com/gorilla/mux" + "github.com/cosmos/cosmos-sdk/client/context" sdk "github.com/cosmos/cosmos-sdk/types" "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" ) diff --git a/x/incentive/handler_test.go b/x/incentive/handler_test.go index a2d4c5f0..2e9e809a 100644 --- a/x/incentive/handler_test.go +++ b/x/incentive/handler_test.go @@ -4,8 +4,10 @@ import ( "testing" "time" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/suite" + + sdk "github.com/cosmos/cosmos-sdk/types" + abci "github.com/tendermint/tendermint/abci/types" tmtime "github.com/tendermint/tendermint/types/time" diff --git a/x/incentive/keeper/keeper_test.go b/x/incentive/keeper/keeper_test.go index de8e61e7..8da12fd6 100644 --- a/x/incentive/keeper/keeper_test.go +++ b/x/incentive/keeper/keeper_test.go @@ -4,10 +4,12 @@ import ( "testing" "time" + "github.com/stretchr/testify/suite" + 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/stretchr/testify/suite" + abci "github.com/tendermint/tendermint/abci/types" tmtime "github.com/tendermint/tendermint/types/time" diff --git a/x/incentive/keeper/payout_test.go b/x/incentive/keeper/payout_test.go index e7152d74..cfdfa652 100644 --- a/x/incentive/keeper/payout_test.go +++ b/x/incentive/keeper/payout_test.go @@ -7,6 +7,7 @@ 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" diff --git a/x/incentive/keeper/querier.go b/x/incentive/keeper/querier.go index d56d2432..428c8635 100644 --- a/x/incentive/keeper/querier.go +++ b/x/incentive/keeper/querier.go @@ -4,6 +4,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + abci "github.com/tendermint/tendermint/abci/types" "github.com/kava-labs/kava/x/incentive/types" diff --git a/x/incentive/keeper/rewards_test.go b/x/incentive/keeper/rewards_test.go index f62e5d7b..be2951a7 100644 --- a/x/incentive/keeper/rewards_test.go +++ b/x/incentive/keeper/rewards_test.go @@ -4,6 +4,7 @@ import ( "time" sdk "github.com/cosmos/cosmos-sdk/types" + abci "github.com/tendermint/tendermint/abci/types" tmtime "github.com/tendermint/tendermint/types/time" diff --git a/x/incentive/module.go b/x/incentive/module.go index b6b8bcc5..394e3a88 100644 --- a/x/incentive/module.go +++ b/x/incentive/module.go @@ -4,14 +4,16 @@ import ( "encoding/json" "math/rand" + "github.com/gorilla/mux" + "github.com/spf13/cobra" + "github.com/cosmos/cosmos-sdk/client/context" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" "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" diff --git a/x/incentive/simulation/decoder.go b/x/incentive/simulation/decoder.go index dda10310..9263de22 100644 --- a/x/incentive/simulation/decoder.go +++ b/x/incentive/simulation/decoder.go @@ -7,6 +7,7 @@ import ( "time" "github.com/cosmos/cosmos-sdk/codec" + "github.com/tendermint/tendermint/libs/kv" "github.com/kava-labs/kava/x/incentive/types" diff --git a/x/incentive/simulation/decoder_test.go b/x/incentive/simulation/decoder_test.go index 7eb08ebd..1759f5b3 100644 --- a/x/incentive/simulation/decoder_test.go +++ b/x/incentive/simulation/decoder_test.go @@ -5,9 +5,11 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/stretchr/testify/require" + "github.com/tendermint/tendermint/libs/kv" "github.com/kava-labs/kava/x/incentive/types" diff --git a/x/incentive/types/account_test.go b/x/incentive/types/account_test.go index 9bef19fe..5c1f6560 100644 --- a/x/incentive/types/account_test.go +++ b/x/incentive/types/account_test.go @@ -3,9 +3,10 @@ package types_test import ( "testing" + "github.com/stretchr/testify/suite" + sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/auth/vesting" - "github.com/stretchr/testify/suite" "github.com/kava-labs/kava/x/incentive/types" ) diff --git a/x/incentive/types/msg_test.go b/x/incentive/types/msg_test.go index d1456291..00eccee8 100644 --- a/x/incentive/types/msg_test.go +++ b/x/incentive/types/msg_test.go @@ -3,8 +3,10 @@ package types_test import ( "testing" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/suite" + + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/tendermint/tendermint/crypto" "github.com/kava-labs/kava/x/incentive/types" diff --git a/x/incentive/types/params.go b/x/incentive/types/params.go index 8348bb65..17ca6a20 100644 --- a/x/incentive/types/params.go +++ b/x/incentive/types/params.go @@ -7,6 +7,7 @@ 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" diff --git a/x/incentive/types/params_test.go b/x/incentive/types/params_test.go index 9c0baf68..97f3fbc7 100644 --- a/x/incentive/types/params_test.go +++ b/x/incentive/types/params_test.go @@ -5,9 +5,10 @@ import ( "testing" "time" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/suite" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/kava-labs/kava/x/incentive/types" ) diff --git a/x/kavadist/keeper/mint_test.go b/x/kavadist/keeper/mint_test.go index b7ceb6de..48539c61 100644 --- a/x/kavadist/keeper/mint_test.go +++ b/x/kavadist/keeper/mint_test.go @@ -4,8 +4,10 @@ import ( "testing" "time" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/suite" + + sdk "github.com/cosmos/cosmos-sdk/types" + abci "github.com/tendermint/tendermint/abci/types" tmtime "github.com/tendermint/tendermint/types/time" diff --git a/x/kavadist/module.go b/x/kavadist/module.go index e9dc22e4..e91dae17 100644 --- a/x/kavadist/module.go +++ b/x/kavadist/module.go @@ -12,6 +12,7 @@ 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" diff --git a/x/kavadist/simulation/utils_test.go b/x/kavadist/simulation/utils_test.go index 81a76c39..2521bb5f 100644 --- a/x/kavadist/simulation/utils_test.go +++ b/x/kavadist/simulation/utils_test.go @@ -3,8 +3,9 @@ package simulation import ( "testing" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" + + sdk "github.com/cosmos/cosmos-sdk/types" ) func TestApproxRoot(t *testing.T) { diff --git a/x/kavadist/types/params.go b/x/kavadist/types/params.go index 46a2906d..8fa015aa 100644 --- a/x/kavadist/types/params.go +++ b/x/kavadist/types/params.go @@ -6,6 +6,7 @@ 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" diff --git a/x/kavadist/types/params_test.go b/x/kavadist/types/params_test.go index e612fda3..ff3335bb 100644 --- a/x/kavadist/types/params_test.go +++ b/x/kavadist/types/params_test.go @@ -4,9 +4,10 @@ import ( "testing" "time" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/suite" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/kava-labs/kava/x/kavadist/types" ) diff --git a/x/pricefeed/client/cli/query.go b/x/pricefeed/client/cli/query.go index 3930bbf9..73ae9796 100644 --- a/x/pricefeed/client/cli/query.go +++ b/x/pricefeed/client/cli/query.go @@ -3,12 +3,13 @@ package cli import ( "fmt" + "github.com/spf13/cobra" + "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/context" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/spf13/cobra" "github.com/kava-labs/kava/x/pricefeed/types" ) diff --git a/x/pricefeed/client/cli/tx.go b/x/pricefeed/client/cli/tx.go index 726a8050..52e8414d 100644 --- a/x/pricefeed/client/cli/tx.go +++ b/x/pricefeed/client/cli/tx.go @@ -14,6 +14,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/auth" "github.com/cosmos/cosmos-sdk/x/auth/client/utils" + tmtime "github.com/tendermint/tendermint/types/time" "github.com/kava-labs/kava/x/pricefeed/types" diff --git a/x/pricefeed/client/rest/rest.go b/x/pricefeed/client/rest/rest.go index fa1f5cb7..12c4a863 100644 --- a/x/pricefeed/client/rest/rest.go +++ b/x/pricefeed/client/rest/rest.go @@ -1,9 +1,10 @@ package rest import ( + "github.com/gorilla/mux" + "github.com/cosmos/cosmos-sdk/client/context" "github.com/cosmos/cosmos-sdk/types/rest" - "github.com/gorilla/mux" ) const ( diff --git a/x/pricefeed/client/rest/tx.go b/x/pricefeed/client/rest/tx.go index 89a8df42..06c1cda5 100644 --- a/x/pricefeed/client/rest/tx.go +++ b/x/pricefeed/client/rest/tx.go @@ -5,11 +5,13 @@ import ( "net/http" "time" + "github.com/gorilla/mux" + "github.com/cosmos/cosmos-sdk/client/context" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/rest" "github.com/cosmos/cosmos-sdk/x/auth/client/utils" - "github.com/gorilla/mux" + tmtime "github.com/tendermint/tendermint/types/time" "github.com/kava-labs/kava/x/pricefeed/types" diff --git a/x/pricefeed/keeper/keeper_test.go b/x/pricefeed/keeper/keeper_test.go index 2288fa87..92e33635 100644 --- a/x/pricefeed/keeper/keeper_test.go +++ b/x/pricefeed/keeper/keeper_test.go @@ -4,8 +4,10 @@ import ( "testing" "time" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" + + sdk "github.com/cosmos/cosmos-sdk/types" + abci "github.com/tendermint/tendermint/abci/types" "github.com/kava-labs/kava/app" diff --git a/x/pricefeed/keeper/params_test.go b/x/pricefeed/keeper/params_test.go index c9849d39..3c293c74 100644 --- a/x/pricefeed/keeper/params_test.go +++ b/x/pricefeed/keeper/params_test.go @@ -3,8 +3,10 @@ package keeper_test import ( "testing" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/suite" + + sdk "github.com/cosmos/cosmos-sdk/types" + abci "github.com/tendermint/tendermint/abci/types" tmtime "github.com/tendermint/tendermint/types/time" diff --git a/x/pricefeed/module.go b/x/pricefeed/module.go index 3426a860..c2d9cd9c 100644 --- a/x/pricefeed/module.go +++ b/x/pricefeed/module.go @@ -13,6 +13,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" "github.com/cosmos/cosmos-sdk/x/auth" sim "github.com/cosmos/cosmos-sdk/x/simulation" + abci "github.com/tendermint/tendermint/abci/types" "github.com/kava-labs/kava/x/pricefeed/client/cli" diff --git a/x/pricefeed/simulation/decoder.go b/x/pricefeed/simulation/decoder.go index e40c1932..cb6b8343 100644 --- a/x/pricefeed/simulation/decoder.go +++ b/x/pricefeed/simulation/decoder.go @@ -5,6 +5,7 @@ import ( "fmt" "github.com/cosmos/cosmos-sdk/codec" + "github.com/tendermint/tendermint/libs/kv" "github.com/kava-labs/kava/x/pricefeed/types" diff --git a/x/pricefeed/simulation/decoder_test.go b/x/pricefeed/simulation/decoder_test.go index 33ef65a8..de524923 100644 --- a/x/pricefeed/simulation/decoder_test.go +++ b/x/pricefeed/simulation/decoder_test.go @@ -6,6 +6,7 @@ import ( "time" "github.com/stretchr/testify/require" + "github.com/tendermint/tendermint/libs/kv" "github.com/cosmos/cosmos-sdk/codec" diff --git a/x/pricefeed/types/msgs_test.go b/x/pricefeed/types/msgs_test.go index 74192420..c9d16fc8 100644 --- a/x/pricefeed/types/msgs_test.go +++ b/x/pricefeed/types/msgs_test.go @@ -3,8 +3,10 @@ package types import ( "testing" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" + + sdk "github.com/cosmos/cosmos-sdk/types" + tmtime "github.com/tendermint/tendermint/types/time" ) diff --git a/x/validator-vesting/abci.go b/x/validator-vesting/abci.go index 6b9c6d14..97a976e4 100644 --- a/x/validator-vesting/abci.go +++ b/x/validator-vesting/abci.go @@ -7,6 +7,7 @@ import ( tmtime "github.com/tendermint/tendermint/types/time" sdk "github.com/cosmos/cosmos-sdk/types" + abci "github.com/tendermint/tendermint/abci/types" "github.com/kava-labs/kava/x/validator-vesting/keeper" diff --git a/x/validator-vesting/abci_test.go b/x/validator-vesting/abci_test.go index 16b7e1ab..a423740a 100644 --- a/x/validator-vesting/abci_test.go +++ b/x/validator-vesting/abci_test.go @@ -4,8 +4,10 @@ import ( "testing" "time" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" + + sdk "github.com/cosmos/cosmos-sdk/types" + abci "github.com/tendermint/tendermint/abci/types" tmtime "github.com/tendermint/tendermint/types/time" diff --git a/x/validator-vesting/client/rest/query.go b/x/validator-vesting/client/rest/query.go index f132ed35..0a9d6704 100644 --- a/x/validator-vesting/client/rest/query.go +++ b/x/validator-vesting/client/rest/query.go @@ -5,9 +5,10 @@ import ( "fmt" "net/http" + "github.com/gorilla/mux" + "github.com/cosmos/cosmos-sdk/client/context" "github.com/cosmos/cosmos-sdk/types/rest" - "github.com/gorilla/mux" "github.com/kava-labs/kava/x/validator-vesting/types" ) diff --git a/x/validator-vesting/keeper/keeper.go b/x/validator-vesting/keeper/keeper.go index 1bda605a..933d2adc 100644 --- a/x/validator-vesting/keeper/keeper.go +++ b/x/validator-vesting/keeper/keeper.go @@ -7,6 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" stakingexported "github.com/cosmos/cosmos-sdk/x/staking/exported" + "github.com/tendermint/tendermint/libs/log" "github.com/kava-labs/kava/x/validator-vesting/types" diff --git a/x/validator-vesting/keeper/keeper_test.go b/x/validator-vesting/keeper/keeper_test.go index 393ffa8d..4f15b003 100644 --- a/x/validator-vesting/keeper/keeper_test.go +++ b/x/validator-vesting/keeper/keeper_test.go @@ -6,6 +6,7 @@ import ( "time" "github.com/stretchr/testify/require" + tmtime "github.com/tendermint/tendermint/types/time" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/validator-vesting/keeper/test_common.go b/x/validator-vesting/keeper/test_common.go index a9cc1e9b..e3f45882 100644 --- a/x/validator-vesting/keeper/test_common.go +++ b/x/validator-vesting/keeper/test_common.go @@ -9,12 +9,13 @@ import ( "github.com/stretchr/testify/require" + dbm "github.com/tendermint/tm-db" + abci "github.com/tendermint/tendermint/abci/types" "github.com/tendermint/tendermint/crypto" "github.com/tendermint/tendermint/crypto/ed25519" "github.com/tendermint/tendermint/libs/log" tmtime "github.com/tendermint/tendermint/types/time" - dbm "github.com/tendermint/tm-db" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/store" diff --git a/x/validator-vesting/module.go b/x/validator-vesting/module.go index c4a3e704..70ed1636 100644 --- a/x/validator-vesting/module.go +++ b/x/validator-vesting/module.go @@ -6,6 +6,7 @@ import ( "github.com/gorilla/mux" "github.com/spf13/cobra" + abci "github.com/tendermint/tendermint/abci/types" "github.com/cosmos/cosmos-sdk/client/context" diff --git a/x/validator-vesting/simulation/decoder.go b/x/validator-vesting/simulation/decoder.go index d0533eb9..9cddbb29 100644 --- a/x/validator-vesting/simulation/decoder.go +++ b/x/validator-vesting/simulation/decoder.go @@ -7,6 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/tendermint/tendermint/libs/kv" "github.com/kava-labs/kava/x/validator-vesting/types" diff --git a/x/validator-vesting/simulation/decoder_test.go b/x/validator-vesting/simulation/decoder_test.go index 4451e1b5..e07bdac1 100644 --- a/x/validator-vesting/simulation/decoder_test.go +++ b/x/validator-vesting/simulation/decoder_test.go @@ -5,10 +5,12 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/auth" - "github.com/stretchr/testify/require" + "github.com/tendermint/tendermint/crypto/ed25519" "github.com/tendermint/tendermint/libs/kv" diff --git a/x/validator-vesting/types/validator_vesting_account.go b/x/validator-vesting/types/validator_vesting_account.go index a1180e88..297e1082 100644 --- a/x/validator-vesting/types/validator_vesting_account.go +++ b/x/validator-vesting/types/validator_vesting_account.go @@ -12,6 +12,7 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" vestexported "github.com/cosmos/cosmos-sdk/x/auth/vesting/exported" vestingtypes "github.com/cosmos/cosmos-sdk/x/auth/vesting/types" + "github.com/tendermint/tendermint/crypto" ) diff --git a/x/validator-vesting/types/validator_vesting_account_test.go b/x/validator-vesting/types/validator_vesting_account_test.go index 4abad811..a2562e3b 100644 --- a/x/validator-vesting/types/validator_vesting_account_test.go +++ b/x/validator-vesting/types/validator_vesting_account_test.go @@ -6,6 +6,7 @@ import ( "time" "github.com/stretchr/testify/require" + tmtime "github.com/tendermint/tendermint/types/time" sdk "github.com/cosmos/cosmos-sdk/types"