From 8df61e7967b8c2e7b0c3f65386d9d606910d6de3 Mon Sep 17 00:00:00 2001 From: Federico Kunze Date: Tue, 7 Apr 2020 10:27:46 -0400 Subject: [PATCH 1/4] cleanup ibc-alpha --- go.mod | 2 -- go.sum | 4 ++-- sim_state-4.json | 0 x/auth/client/cli/query.go | 2 +- x/bank/alias.go | 2 +- 5 files changed, 4 insertions(+), 6 deletions(-) delete mode 100644 sim_state-4.json diff --git a/go.mod b/go.mod index 0703c260ff00..94b3d1391dc4 100644 --- a/go.mod +++ b/go.mod @@ -37,6 +37,4 @@ require ( replace github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.2-alpha.regen.1 -replace github.com/keybase/go-keychain => github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 - go 1.14 diff --git a/go.sum b/go.sum index fef49b591eaa..f5755bcfdd78 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,5 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 h1:/vQbFIOMbk2FiG/kXiLl8BRyzTWDw7gX/Hz7Dd5eDMs= -github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4/go.mod h1:hN7oaIRCjzsZ2dE+yG5k+rsdt3qcwykqK6HVGcKwsw4= github.com/99designs/keyring v1.1.4 h1:x0g0zQ9bQKgNsLo0XSXAy1H8Q1RG/td+5OXJt+Ci8b8= github.com/99designs/keyring v1.1.4/go.mod h1:657DQuMrBZRtuL/voxVyiyb6zpMehlm5vLB9Qwrv904= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= @@ -228,6 +226,8 @@ github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/u github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= +github.com/keybase/go-keychain v0.0.0-20190712205309-48d3d31d256d h1:Z+RDyXzjKE0i2sTjZ/b1uxiGtPhFy34Ou/Tk0qwN0kM= +github.com/keybase/go-keychain v0.0.0-20190712205309-48d3d31d256d/go.mod h1:JJNrCn9otv/2QP4D7SMJBgaleKpOf66PnW6F5WGNRIc= github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4= diff --git a/sim_state-4.json b/sim_state-4.json deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/x/auth/client/cli/query.go b/x/auth/client/cli/query.go index 11bf50ab389f..1d7e60639aa9 100644 --- a/x/auth/client/cli/query.go +++ b/x/auth/client/cli/query.go @@ -99,7 +99,7 @@ func GetAccountCmd(cdc *codec.Codec) *cobra.Command { }, } - return cmd + return flags.GetCommands(cmd)[0] } // QueryTxsByEventsCmd returns a command to search through transactions by events. diff --git a/x/bank/alias.go b/x/bank/alias.go index d28cf6c1d4cd..9811c9e001ee 100644 --- a/x/bank/alias.go +++ b/x/bank/alias.go @@ -39,6 +39,7 @@ var ( DefaultGenesisState = types.DefaultGenesisState ValidateGenesis = types.ValidateGenesis SanitizeGenesisBalances = types.SanitizeGenesisBalances + GetGenesisStateFromAppState = types.GetGenesisStateFromAppState NewMsgSend = types.NewMsgSend NewMsgMultiSend = types.NewMsgMultiSend NewInput = types.NewInput @@ -51,7 +52,6 @@ var ( ParamStoreKeySendEnabled = types.ParamStoreKeySendEnabled BalancesPrefix = types.BalancesPrefix AddressFromBalancesStore = types.AddressFromBalancesStore - GetGenesisStateFromAppState = types.GetGenesisStateFromAppState ) type ( From b9308677a0f5e51ac56e35e3d9bcf60296c68b7e Mon Sep 17 00:00:00 2001 From: Federico Kunze Date: Tue, 7 Apr 2020 11:26:58 -0400 Subject: [PATCH 2/4] remove HasKeyTable() --- x/auth/keeper/keeper.go | 6 ------ x/bank/keeper/keeper.go | 6 ------ x/crisis/keeper/keeper.go | 6 ------ x/distribution/keeper/keeper.go | 5 ----- x/mint/keeper/keeper.go | 5 ----- x/slashing/keeper/keeper.go | 5 ----- x/slashing/types/expected_keepers.go | 1 - x/staking/keeper/keeper.go | 10 ---------- 8 files changed, 44 deletions(-) diff --git a/x/auth/keeper/keeper.go b/x/auth/keeper/keeper.go index 3a0c7d5a921c..67acb53cec0f 100644 --- a/x/auth/keeper/keeper.go +++ b/x/auth/keeper/keeper.go @@ -30,12 +30,6 @@ type AccountKeeper struct { func NewAccountKeeper( cdc types.Codec, key sdk.StoreKey, paramstore paramtypes.Subspace, proto func() exported.Account, ) AccountKeeper { - - // set KeyTable if it has not already been set - if !paramstore.HasKeyTable() { - paramstore = paramstore.WithKeyTable(types.ParamKeyTable()) - } - return AccountKeeper{ key: key, proto: proto, diff --git a/x/bank/keeper/keeper.go b/x/bank/keeper/keeper.go index 423f6a0bf44a..9e77f8c04f2a 100644 --- a/x/bank/keeper/keeper.go +++ b/x/bank/keeper/keeper.go @@ -37,12 +37,6 @@ type BaseKeeper struct { func NewBaseKeeper( cdc codec.Marshaler, storeKey sdk.StoreKey, ak types.AccountKeeper, paramSpace paramtypes.Subspace, blacklistedAddrs map[string]bool, ) BaseKeeper { - - // set KeyTable if it has not already been set - if !paramSpace.HasKeyTable() { - paramSpace = paramSpace.WithKeyTable(types.ParamKeyTable()) - } - return BaseKeeper{ BaseSendKeeper: NewBaseSendKeeper(cdc, storeKey, ak, paramSpace, blacklistedAddrs), ak: ak, diff --git a/x/crisis/keeper/keeper.go b/x/crisis/keeper/keeper.go index 86136981ddfa..8542482c6b84 100644 --- a/x/crisis/keeper/keeper.go +++ b/x/crisis/keeper/keeper.go @@ -27,12 +27,6 @@ func NewKeeper( paramSpace paramtypes.Subspace, invCheckPeriod uint, supplyKeeper types.SupplyKeeper, feeCollectorName string, ) Keeper { - - // set KeyTable if it has not already been set - if !paramSpace.HasKeyTable() { - paramSpace = paramSpace.WithKeyTable(types.ParamKeyTable()) - } - return Keeper{ routes: make([]types.InvarRoute, 0), paramSpace: paramSpace, diff --git a/x/distribution/keeper/keeper.go b/x/distribution/keeper/keeper.go index e1aeed7cad60..b451dc3fca9b 100644 --- a/x/distribution/keeper/keeper.go +++ b/x/distribution/keeper/keeper.go @@ -38,11 +38,6 @@ func NewKeeper( panic(fmt.Sprintf("%s module account has not been set", types.ModuleName)) } - // set KeyTable if it has not already been set - if !paramSpace.HasKeyTable() { - paramSpace = paramSpace.WithKeyTable(types.ParamKeyTable()) - } - return Keeper{ storeKey: key, cdc: cdc, diff --git a/x/mint/keeper/keeper.go b/x/mint/keeper/keeper.go index 116b989a6692..e448cb2edf45 100644 --- a/x/mint/keeper/keeper.go +++ b/x/mint/keeper/keeper.go @@ -32,11 +32,6 @@ func NewKeeper( panic("the mint module account has not been set") } - // set KeyTable if it has not already been set - if !paramSpace.HasKeyTable() { - paramSpace = paramSpace.WithKeyTable(types.ParamKeyTable()) - } - return Keeper{ cdc: cdc, storeKey: key, diff --git a/x/slashing/keeper/keeper.go b/x/slashing/keeper/keeper.go index e7f486ac32be..66f040a3b60b 100644 --- a/x/slashing/keeper/keeper.go +++ b/x/slashing/keeper/keeper.go @@ -23,11 +23,6 @@ type Keeper struct { // NewKeeper creates a slashing keeper func NewKeeper(cdc codec.Marshaler, key sdk.StoreKey, sk types.StakingKeeper, paramspace types.ParamSubspace) Keeper { - // set KeyTable if it has not already been set - if !paramspace.HasKeyTable() { - paramspace = paramspace.WithKeyTable(types.ParamKeyTable()) - } - return Keeper{ storeKey: key, cdc: cdc, diff --git a/x/slashing/types/expected_keepers.go b/x/slashing/types/expected_keepers.go index 50e71cb614e5..4a9dd4f7f2d6 100644 --- a/x/slashing/types/expected_keepers.go +++ b/x/slashing/types/expected_keepers.go @@ -26,7 +26,6 @@ type BankKeeper interface { // ParamSubspace defines the expected Subspace interfacace type ParamSubspace interface { - HasKeyTable() bool WithKeyTable(table paramtypes.KeyTable) paramtypes.Subspace Get(ctx sdk.Context, key []byte, ptr interface{}) GetParamSet(ctx sdk.Context, ps paramtypes.ParamSet) diff --git a/x/staking/keeper/keeper.go b/x/staking/keeper/keeper.go index 8dbf6edd4c91..72c5dae16a7d 100644 --- a/x/staking/keeper/keeper.go +++ b/x/staking/keeper/keeper.go @@ -36,11 +36,6 @@ type Keeper struct { func NewKeeper( cdc codec.Marshaler, key sdk.StoreKey, bk types.BankKeeper, sk types.SupplyKeeper, ps paramtypes.Subspace, ) Keeper { - - if !ps.HasKeyTable() { - ps = ps.WithKeyTable(ParamKeyTable()) - } - // ensure bonded and not bonded module accounts are set if addr := sk.GetModuleAddress(types.BondedPoolName); addr == nil { panic(fmt.Sprintf("%s module account has not been set", types.BondedPoolName)) @@ -50,11 +45,6 @@ func NewKeeper( panic(fmt.Sprintf("%s module account has not been set", types.NotBondedPoolName)) } - // set KeyTable if it has not already been set - if !ps.HasKeyTable() { - ps = ps.WithKeyTable(ParamKeyTable()) - } - return Keeper{ storeKey: key, cdc: cdc, From 5fa00e580525ecf121ebf14dcda2d6ba18e5cabd Mon Sep 17 00:00:00 2001 From: Federico Kunze Date: Tue, 7 Apr 2020 11:29:24 -0400 Subject: [PATCH 3/4] add preexisting checks --- x/distribution/keeper/keeper.go | 5 +++++ x/staking/keeper/keeper.go | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/x/distribution/keeper/keeper.go b/x/distribution/keeper/keeper.go index b451dc3fca9b..e1aeed7cad60 100644 --- a/x/distribution/keeper/keeper.go +++ b/x/distribution/keeper/keeper.go @@ -38,6 +38,11 @@ func NewKeeper( panic(fmt.Sprintf("%s module account has not been set", types.ModuleName)) } + // set KeyTable if it has not already been set + if !paramSpace.HasKeyTable() { + paramSpace = paramSpace.WithKeyTable(types.ParamKeyTable()) + } + return Keeper{ storeKey: key, cdc: cdc, diff --git a/x/staking/keeper/keeper.go b/x/staking/keeper/keeper.go index 72c5dae16a7d..c4f19286597e 100644 --- a/x/staking/keeper/keeper.go +++ b/x/staking/keeper/keeper.go @@ -36,6 +36,12 @@ type Keeper struct { func NewKeeper( cdc codec.Marshaler, key sdk.StoreKey, bk types.BankKeeper, sk types.SupplyKeeper, ps paramtypes.Subspace, ) Keeper { + + // set KeyTable if it has not already been set + if !ps.HasKeyTable() { + ps = ps.WithKeyTable(ParamKeyTable()) + } + // ensure bonded and not bonded module accounts are set if addr := sk.GetModuleAddress(types.BondedPoolName); addr == nil { panic(fmt.Sprintf("%s module account has not been set", types.BondedPoolName)) From eec578029fb2d8f70c54ed2adab6fed3be0c2e0d Mon Sep 17 00:00:00 2001 From: Federico Kunze Date: Tue, 7 Apr 2020 11:43:45 -0400 Subject: [PATCH 4/4] undo remove checks --- x/auth/keeper/keeper.go | 6 ++++++ x/bank/keeper/keeper.go | 6 ++++++ x/crisis/keeper/keeper.go | 6 ++++++ x/mint/keeper/keeper.go | 5 +++++ x/slashing/keeper/keeper.go | 5 +++++ x/slashing/types/expected_keepers.go | 1 + 6 files changed, 29 insertions(+) diff --git a/x/auth/keeper/keeper.go b/x/auth/keeper/keeper.go index 67acb53cec0f..3a0c7d5a921c 100644 --- a/x/auth/keeper/keeper.go +++ b/x/auth/keeper/keeper.go @@ -30,6 +30,12 @@ type AccountKeeper struct { func NewAccountKeeper( cdc types.Codec, key sdk.StoreKey, paramstore paramtypes.Subspace, proto func() exported.Account, ) AccountKeeper { + + // set KeyTable if it has not already been set + if !paramstore.HasKeyTable() { + paramstore = paramstore.WithKeyTable(types.ParamKeyTable()) + } + return AccountKeeper{ key: key, proto: proto, diff --git a/x/bank/keeper/keeper.go b/x/bank/keeper/keeper.go index 9e77f8c04f2a..423f6a0bf44a 100644 --- a/x/bank/keeper/keeper.go +++ b/x/bank/keeper/keeper.go @@ -37,6 +37,12 @@ type BaseKeeper struct { func NewBaseKeeper( cdc codec.Marshaler, storeKey sdk.StoreKey, ak types.AccountKeeper, paramSpace paramtypes.Subspace, blacklistedAddrs map[string]bool, ) BaseKeeper { + + // set KeyTable if it has not already been set + if !paramSpace.HasKeyTable() { + paramSpace = paramSpace.WithKeyTable(types.ParamKeyTable()) + } + return BaseKeeper{ BaseSendKeeper: NewBaseSendKeeper(cdc, storeKey, ak, paramSpace, blacklistedAddrs), ak: ak, diff --git a/x/crisis/keeper/keeper.go b/x/crisis/keeper/keeper.go index 8542482c6b84..86136981ddfa 100644 --- a/x/crisis/keeper/keeper.go +++ b/x/crisis/keeper/keeper.go @@ -27,6 +27,12 @@ func NewKeeper( paramSpace paramtypes.Subspace, invCheckPeriod uint, supplyKeeper types.SupplyKeeper, feeCollectorName string, ) Keeper { + + // set KeyTable if it has not already been set + if !paramSpace.HasKeyTable() { + paramSpace = paramSpace.WithKeyTable(types.ParamKeyTable()) + } + return Keeper{ routes: make([]types.InvarRoute, 0), paramSpace: paramSpace, diff --git a/x/mint/keeper/keeper.go b/x/mint/keeper/keeper.go index e448cb2edf45..116b989a6692 100644 --- a/x/mint/keeper/keeper.go +++ b/x/mint/keeper/keeper.go @@ -32,6 +32,11 @@ func NewKeeper( panic("the mint module account has not been set") } + // set KeyTable if it has not already been set + if !paramSpace.HasKeyTable() { + paramSpace = paramSpace.WithKeyTable(types.ParamKeyTable()) + } + return Keeper{ cdc: cdc, storeKey: key, diff --git a/x/slashing/keeper/keeper.go b/x/slashing/keeper/keeper.go index 66f040a3b60b..e7f486ac32be 100644 --- a/x/slashing/keeper/keeper.go +++ b/x/slashing/keeper/keeper.go @@ -23,6 +23,11 @@ type Keeper struct { // NewKeeper creates a slashing keeper func NewKeeper(cdc codec.Marshaler, key sdk.StoreKey, sk types.StakingKeeper, paramspace types.ParamSubspace) Keeper { + // set KeyTable if it has not already been set + if !paramspace.HasKeyTable() { + paramspace = paramspace.WithKeyTable(types.ParamKeyTable()) + } + return Keeper{ storeKey: key, cdc: cdc, diff --git a/x/slashing/types/expected_keepers.go b/x/slashing/types/expected_keepers.go index 4a9dd4f7f2d6..50e71cb614e5 100644 --- a/x/slashing/types/expected_keepers.go +++ b/x/slashing/types/expected_keepers.go @@ -26,6 +26,7 @@ type BankKeeper interface { // ParamSubspace defines the expected Subspace interfacace type ParamSubspace interface { + HasKeyTable() bool WithKeyTable(table paramtypes.KeyTable) paramtypes.Subspace Get(ctx sdk.Context, key []byte, ptr interface{}) GetParamSet(ctx sdk.Context, ps paramtypes.ParamSet)