From 4e3dfdf70736fb8fb395466ab0eb3371c6b3c963 Mon Sep 17 00:00:00 2001 From: Federico Kunze Date: Sat, 4 Apr 2020 20:26:15 -0300 Subject: [PATCH] x/validator-vesting: remove internal pkg --- x/validator-vesting/abci.go | 2 +- x/validator-vesting/abci_test.go | 4 ++-- x/validator-vesting/alias.go | 8 ++++---- x/validator-vesting/client/cli/query.go | 2 +- x/validator-vesting/client/rest/query.go | 2 +- x/validator-vesting/genesis.go | 2 +- x/validator-vesting/{internal => }/keeper/keeper.go | 2 +- x/validator-vesting/{internal => }/keeper/keeper_test.go | 2 +- x/validator-vesting/{internal => }/keeper/querier.go | 2 +- x/validator-vesting/{internal => }/keeper/test_common.go | 2 +- x/validator-vesting/module.go | 2 +- x/validator-vesting/simulation/decoder.go | 2 +- x/validator-vesting/simulation/genesis.go | 2 +- x/validator-vesting/test_common.go | 4 ++-- x/validator-vesting/{internal => }/types/codec.go | 0 .../{internal => }/types/expected_keepers.go | 0 x/validator-vesting/{internal => }/types/genesis.go | 0 x/validator-vesting/{internal => }/types/key.go | 0 x/validator-vesting/{internal => }/types/querier.go | 0 x/validator-vesting/{internal => }/types/test_common.go | 0 .../{internal => }/types/validator_vesting_account.go | 0 .../types/validator_vesting_account_test.go | 0 22 files changed, 19 insertions(+), 19 deletions(-) rename x/validator-vesting/{internal => }/keeper/keeper.go (99%) rename x/validator-vesting/{internal => }/keeper/keeper_test.go (99%) rename x/validator-vesting/{internal => }/keeper/querier.go (97%) rename x/validator-vesting/{internal => }/keeper/test_common.go (99%) rename x/validator-vesting/{internal => }/types/codec.go (100%) rename x/validator-vesting/{internal => }/types/expected_keepers.go (100%) rename x/validator-vesting/{internal => }/types/genesis.go (100%) rename x/validator-vesting/{internal => }/types/key.go (100%) rename x/validator-vesting/{internal => }/types/querier.go (100%) rename x/validator-vesting/{internal => }/types/test_common.go (100%) rename x/validator-vesting/{internal => }/types/validator_vesting_account.go (100%) rename x/validator-vesting/{internal => }/types/validator_vesting_account_test.go (100%) diff --git a/x/validator-vesting/abci.go b/x/validator-vesting/abci.go index 43a4f0b8..bd896d56 100644 --- a/x/validator-vesting/abci.go +++ b/x/validator-vesting/abci.go @@ -7,7 +7,7 @@ import ( tmtime "github.com/tendermint/tendermint/types/time" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/kava-labs/kava/x/validator-vesting/internal/keeper" + "github.com/kava-labs/kava/x/validator-vesting/keeper" abci "github.com/tendermint/tendermint/abci/types" ) diff --git a/x/validator-vesting/abci_test.go b/x/validator-vesting/abci_test.go index b2e65667..dcac8266 100644 --- a/x/validator-vesting/abci_test.go +++ b/x/validator-vesting/abci_test.go @@ -11,8 +11,8 @@ import ( "github.com/cosmos/cosmos-sdk/x/staking" stakingexported "github.com/cosmos/cosmos-sdk/x/staking/exported" - "github.com/kava-labs/kava/x/validator-vesting/internal/keeper" - "github.com/kava-labs/kava/x/validator-vesting/internal/types" + "github.com/kava-labs/kava/x/validator-vesting/keeper" + "github.com/kava-labs/kava/x/validator-vesting/types" ) func TestBeginBlockerZeroHeight(t *testing.T) { diff --git a/x/validator-vesting/alias.go b/x/validator-vesting/alias.go index 9246d614..5ddc76e1 100644 --- a/x/validator-vesting/alias.go +++ b/x/validator-vesting/alias.go @@ -1,13 +1,13 @@ // nolint // autogenerated code using github.com/rigelrozanski/multitool // aliases generated for the following subdirectories: -// ALIASGEN: github.com/kava-labs/kava/x/validator-vesting/internal/keeper -// ALIASGEN: github.com/kava-labs/kava/x/validator-vesting/internal/types +// ALIASGEN: github.com/kava-labs/kava/x/validator-vesting/keeper +// ALIASGEN: github.com/kava-labs/kava/x/validator-vesting/types package validatorvesting import ( - "github.com/kava-labs/kava/x/validator-vesting/internal/keeper" - "github.com/kava-labs/kava/x/validator-vesting/internal/types" + "github.com/kava-labs/kava/x/validator-vesting/keeper" + "github.com/kava-labs/kava/x/validator-vesting/types" ) const ( diff --git a/x/validator-vesting/client/cli/query.go b/x/validator-vesting/client/cli/query.go index 5b13bff7..ce00168f 100644 --- a/x/validator-vesting/client/cli/query.go +++ b/x/validator-vesting/client/cli/query.go @@ -3,7 +3,7 @@ package cli import ( "fmt" - "github.com/kava-labs/kava/x/validator-vesting/internal/types" + "github.com/kava-labs/kava/x/validator-vesting/types" "github.com/spf13/cobra" "github.com/cosmos/cosmos-sdk/client" diff --git a/x/validator-vesting/client/rest/query.go b/x/validator-vesting/client/rest/query.go index 3dbf8a3e..ebe1de2e 100644 --- a/x/validator-vesting/client/rest/query.go +++ b/x/validator-vesting/client/rest/query.go @@ -8,7 +8,7 @@ import ( "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/internal/types" + "github.com/kava-labs/kava/x/validator-vesting/types" ) // define routes that get registered by the main application diff --git a/x/validator-vesting/genesis.go b/x/validator-vesting/genesis.go index d3e463c6..e987b00c 100644 --- a/x/validator-vesting/genesis.go +++ b/x/validator-vesting/genesis.go @@ -2,7 +2,7 @@ package validatorvesting import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/kava-labs/kava/x/validator-vesting/internal/types" + "github.com/kava-labs/kava/x/validator-vesting/types" ) // InitGenesis stores the account address of each ValidatorVestingAccount in the validator vesting keeper, for faster lookup. diff --git a/x/validator-vesting/internal/keeper/keeper.go b/x/validator-vesting/keeper/keeper.go similarity index 99% rename from x/validator-vesting/internal/keeper/keeper.go rename to x/validator-vesting/keeper/keeper.go index bff59ee4..54662879 100644 --- a/x/validator-vesting/internal/keeper/keeper.go +++ b/x/validator-vesting/keeper/keeper.go @@ -7,7 +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/kava-labs/kava/x/validator-vesting/internal/types" + "github.com/kava-labs/kava/x/validator-vesting/types" "github.com/tendermint/tendermint/libs/log" ) diff --git a/x/validator-vesting/internal/keeper/keeper_test.go b/x/validator-vesting/keeper/keeper_test.go similarity index 99% rename from x/validator-vesting/internal/keeper/keeper_test.go rename to x/validator-vesting/keeper/keeper_test.go index cedf77d3..51d940ed 100644 --- a/x/validator-vesting/internal/keeper/keeper_test.go +++ b/x/validator-vesting/keeper/keeper_test.go @@ -11,7 +11,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/staking" stakingexported "github.com/cosmos/cosmos-sdk/x/staking/exported" - "github.com/kava-labs/kava/x/validator-vesting/internal/types" + "github.com/kava-labs/kava/x/validator-vesting/types" ) func TestGetSetValidatorVestingAccounts(t *testing.T) { diff --git a/x/validator-vesting/internal/keeper/querier.go b/x/validator-vesting/keeper/querier.go similarity index 97% rename from x/validator-vesting/internal/keeper/querier.go rename to x/validator-vesting/keeper/querier.go index dafc5f5b..32c7a11e 100644 --- a/x/validator-vesting/internal/keeper/querier.go +++ b/x/validator-vesting/keeper/querier.go @@ -4,7 +4,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" authexported "github.com/cosmos/cosmos-sdk/x/auth/exported" "github.com/cosmos/cosmos-sdk/x/auth/vesting" - "github.com/kava-labs/kava/x/validator-vesting/internal/types" + "github.com/kava-labs/kava/x/validator-vesting/types" abci "github.com/tendermint/tendermint/abci/types" ) diff --git a/x/validator-vesting/internal/keeper/test_common.go b/x/validator-vesting/keeper/test_common.go similarity index 99% rename from x/validator-vesting/internal/keeper/test_common.go rename to x/validator-vesting/keeper/test_common.go index 8c630329..36ba430e 100644 --- a/x/validator-vesting/internal/keeper/test_common.go +++ b/x/validator-vesting/keeper/test_common.go @@ -25,7 +25,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/params" "github.com/cosmos/cosmos-sdk/x/staking" "github.com/cosmos/cosmos-sdk/x/supply" - "github.com/kava-labs/kava/x/validator-vesting/internal/types" + "github.com/kava-labs/kava/x/validator-vesting/types" ) //nolint: deadcode unused diff --git a/x/validator-vesting/module.go b/x/validator-vesting/module.go index 16a081e4..903e8b8a 100644 --- a/x/validator-vesting/module.go +++ b/x/validator-vesting/module.go @@ -15,8 +15,8 @@ import ( sim "github.com/cosmos/cosmos-sdk/x/simulation" "github.com/kava-labs/kava/x/validator-vesting/client/cli" "github.com/kava-labs/kava/x/validator-vesting/client/rest" - "github.com/kava-labs/kava/x/validator-vesting/internal/types" "github.com/kava-labs/kava/x/validator-vesting/simulation" + "github.com/kava-labs/kava/x/validator-vesting/types" ) var ( diff --git a/x/validator-vesting/simulation/decoder.go b/x/validator-vesting/simulation/decoder.go index f6c052f5..c1428358 100644 --- a/x/validator-vesting/simulation/decoder.go +++ b/x/validator-vesting/simulation/decoder.go @@ -9,7 +9,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/x/auth/exported" - "github.com/kava-labs/kava/x/validator-vesting/internal/types" + "github.com/kava-labs/kava/x/validator-vesting/types" ) // DecodeStore unmarshals the KVPair's Value to the corresponding auth type diff --git a/x/validator-vesting/simulation/genesis.go b/x/validator-vesting/simulation/genesis.go index cccdc358..c77bb9a3 100644 --- a/x/validator-vesting/simulation/genesis.go +++ b/x/validator-vesting/simulation/genesis.go @@ -11,7 +11,7 @@ import ( vestexported "github.com/cosmos/cosmos-sdk/x/auth/vesting/exported" vestingtypes "github.com/cosmos/cosmos-sdk/x/auth/vesting/types" "github.com/cosmos/cosmos-sdk/x/simulation" - "github.com/kava-labs/kava/x/validator-vesting/internal/types" + "github.com/kava-labs/kava/x/validator-vesting/types" ) // RandomizedGenState generates a random GenesisState for validator-vesting diff --git a/x/validator-vesting/test_common.go b/x/validator-vesting/test_common.go index 909ee0bb..0bc8c141 100644 --- a/x/validator-vesting/test_common.go +++ b/x/validator-vesting/test_common.go @@ -18,8 +18,8 @@ import ( "github.com/cosmos/cosmos-sdk/x/staking" "github.com/cosmos/cosmos-sdk/x/supply" supplyexported "github.com/cosmos/cosmos-sdk/x/supply/exported" - "github.com/kava-labs/kava/x/validator-vesting/internal/keeper" - "github.com/kava-labs/kava/x/validator-vesting/internal/types" + "github.com/kava-labs/kava/x/validator-vesting/keeper" + "github.com/kava-labs/kava/x/validator-vesting/types" ) var ( diff --git a/x/validator-vesting/internal/types/codec.go b/x/validator-vesting/types/codec.go similarity index 100% rename from x/validator-vesting/internal/types/codec.go rename to x/validator-vesting/types/codec.go diff --git a/x/validator-vesting/internal/types/expected_keepers.go b/x/validator-vesting/types/expected_keepers.go similarity index 100% rename from x/validator-vesting/internal/types/expected_keepers.go rename to x/validator-vesting/types/expected_keepers.go diff --git a/x/validator-vesting/internal/types/genesis.go b/x/validator-vesting/types/genesis.go similarity index 100% rename from x/validator-vesting/internal/types/genesis.go rename to x/validator-vesting/types/genesis.go diff --git a/x/validator-vesting/internal/types/key.go b/x/validator-vesting/types/key.go similarity index 100% rename from x/validator-vesting/internal/types/key.go rename to x/validator-vesting/types/key.go diff --git a/x/validator-vesting/internal/types/querier.go b/x/validator-vesting/types/querier.go similarity index 100% rename from x/validator-vesting/internal/types/querier.go rename to x/validator-vesting/types/querier.go diff --git a/x/validator-vesting/internal/types/test_common.go b/x/validator-vesting/types/test_common.go similarity index 100% rename from x/validator-vesting/internal/types/test_common.go rename to x/validator-vesting/types/test_common.go diff --git a/x/validator-vesting/internal/types/validator_vesting_account.go b/x/validator-vesting/types/validator_vesting_account.go similarity index 100% rename from x/validator-vesting/internal/types/validator_vesting_account.go rename to x/validator-vesting/types/validator_vesting_account.go diff --git a/x/validator-vesting/internal/types/validator_vesting_account_test.go b/x/validator-vesting/types/validator_vesting_account_test.go similarity index 100% rename from x/validator-vesting/internal/types/validator_vesting_account_test.go rename to x/validator-vesting/types/validator_vesting_account_test.go