From a0f9cc76271bff1c80388575bf305f994c3896f7 Mon Sep 17 00:00:00 2001 From: Marko Date: Thu, 2 Jul 2020 15:08:44 +0200 Subject: [PATCH] vesting: remove alias.go (#6579) --- simapp/cmd/simd/genaccounts.go | 2 +- std/codec.go | 2 +- x/auth/vesting/alias.go | 29 ----------------------------- x/bank/keeper/keeper_test.go | 2 +- 4 files changed, 3 insertions(+), 32 deletions(-) delete mode 100644 x/auth/vesting/alias.go diff --git a/simapp/cmd/simd/genaccounts.go b/simapp/cmd/simd/genaccounts.go index 8042f95913..be51bfdb34 100644 --- a/simapp/cmd/simd/genaccounts.go +++ b/simapp/cmd/simd/genaccounts.go @@ -17,7 +17,7 @@ import ( "github.com/cosmos/cosmos-sdk/server" sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - authvesting "github.com/cosmos/cosmos-sdk/x/auth/vesting" + authvesting "github.com/cosmos/cosmos-sdk/x/auth/vesting/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" "github.com/cosmos/cosmos-sdk/x/genutil" genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types" diff --git a/std/codec.go b/std/codec.go index 80f6072a5f..09686dc00d 100644 --- a/std/codec.go +++ b/std/codec.go @@ -6,7 +6,7 @@ import ( cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/cosmos/cosmos-sdk/x/auth/vesting" + vesting "github.com/cosmos/cosmos-sdk/x/auth/vesting/types" ) // ---------------------------------------------------------------------------- diff --git a/x/auth/vesting/alias.go b/x/auth/vesting/alias.go deleted file mode 100644 index 256f61265b..0000000000 --- a/x/auth/vesting/alias.go +++ /dev/null @@ -1,29 +0,0 @@ -package vesting - -// DONTCOVER -// nolint - -import ( - "github.com/cosmos/cosmos-sdk/x/auth/vesting/types" -) - -var ( - RegisterCodec = types.RegisterCodec - RegisterInterfaces = types.RegisterInterfaces - NewBaseVestingAccount = types.NewBaseVestingAccount - NewContinuousVestingAccountRaw = types.NewContinuousVestingAccountRaw - NewContinuousVestingAccount = types.NewContinuousVestingAccount - NewPeriodicVestingAccountRaw = types.NewPeriodicVestingAccountRaw - NewPeriodicVestingAccount = types.NewPeriodicVestingAccount - NewDelayedVestingAccountRaw = types.NewDelayedVestingAccountRaw - NewDelayedVestingAccount = types.NewDelayedVestingAccount -) - -type ( - BaseVestingAccount = types.BaseVestingAccount - ContinuousVestingAccount = types.ContinuousVestingAccount - PeriodicVestingAccount = types.PeriodicVestingAccount - DelayedVestingAccount = types.DelayedVestingAccount - Period = types.Period - Periods = types.Periods -) diff --git a/x/bank/keeper/keeper_test.go b/x/bank/keeper/keeper_test.go index f8805216d2..0f5b0de0a7 100644 --- a/x/bank/keeper/keeper_test.go +++ b/x/bank/keeper/keeper_test.go @@ -13,7 +13,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - "github.com/cosmos/cosmos-sdk/x/auth/vesting" + vesting "github.com/cosmos/cosmos-sdk/x/auth/vesting/types" "github.com/cosmos/cosmos-sdk/x/bank/keeper" "github.com/cosmos/cosmos-sdk/x/bank/types" )