From f6405500b06e263745ec1b2750d3432493bcdfb9 Mon Sep 17 00:00:00 2001 From: faddat Date: Thu, 2 Jun 2022 18:31:37 +0000 Subject: [PATCH 1/7] use ecosystem convention for keeper names in app.go --- app/app.go | 350 ++++++++++----------- app/app_test.go | 2 +- app/export.go | 48 +-- app/sim_test.go | 2 +- app/test_access.go | 16 +- app/test_helpers.go | 22 +- x/wasm/genesis_test.go | 2 +- x/wasm/keeper/genesis.go | 4 +- x/wasm/keeper/handler_plugin.go | 14 +- x/wasm/keeper/ibc.go | 6 +- x/wasm/keeper/keeper.go | 28 +- x/wasm/keeper/keeper_test.go | 36 +-- x/wasm/keeper/proposal_integration_test.go | 84 ++--- x/wasm/keeper/query_plugins.go | 6 +- x/wasm/keeper/query_plugins_test.go | 8 +- x/wasm/keeper/reflect_test.go | 44 +-- x/wasm/keeper/staking_test.go | 106 +++---- x/wasm/keeper/submsg_test.go | 14 +- x/wasm/keeper/test_common.go | 100 +++--- x/wasm/module.go | 10 +- x/wasm/module_test.go | 20 +- x/wasm/relay_test.go | 8 +- 22 files changed, 465 insertions(+), 465 deletions(-) diff --git a/app/app.go b/app/app.go index 300ef7b150..370a0698d5 100644 --- a/app/app.go +++ b/app/app.go @@ -243,33 +243,33 @@ type WasmApp struct { memKeys map[string]*sdk.MemoryStoreKey // keepers - accountKeeper authkeeper.AccountKeeper - bankKeeper bankkeeper.Keeper - capabilityKeeper *capabilitykeeper.Keeper - stakingKeeper stakingkeeper.Keeper - slashingKeeper slashingkeeper.Keeper - mintKeeper mintkeeper.Keeper - distrKeeper distrkeeper.Keeper - govKeeper govkeeper.Keeper - crisisKeeper crisiskeeper.Keeper - upgradeKeeper upgradekeeper.Keeper - paramsKeeper paramskeeper.Keeper - evidenceKeeper evidencekeeper.Keeper - ibcKeeper *ibckeeper.Keeper // IBC Keeper must be a pointer in the app, so we can SetRouter on it correctly - icaControllerKeeper icacontrollerkeeper.Keeper - icaHostKeeper icahostkeeper.Keeper - interTxKeeper intertxkeeper.Keeper - transferKeeper ibctransferkeeper.Keeper - feeGrantKeeper feegrantkeeper.Keeper - authzKeeper authzkeeper.Keeper - wasmKeeper wasm.Keeper - - scopedIBCKeeper capabilitykeeper.ScopedKeeper - scopedICAHostKeeper capabilitykeeper.ScopedKeeper - scopedICAControllerKeeper capabilitykeeper.ScopedKeeper - scopedInterTxKeeper capabilitykeeper.ScopedKeeper - scopedTransferKeeper capabilitykeeper.ScopedKeeper - scopedWasmKeeper capabilitykeeper.ScopedKeeper + AccountKeeper authkeeper.AccountKeeper + BankKeeper bankkeeper.Keeper + CapabilityKeeper *capabilitykeeper.Keeper + StakingKeeper stakingkeeper.Keeper + SlashingKeeper slashingkeeper.Keeper + MintKeeper mintkeeper.Keeper + DistrKeeper distrkeeper.Keeper + GovKeeper govkeeper.Keeper + CrisisKeeper crisiskeeper.Keeper + UpgradeKeeper upgradekeeper.Keeper + ParamsKeeper paramskeeper.Keeper + EvidenceKeeper evidencekeeper.Keeper + IBCKeeper *ibckeeper.Keeper // IBC Keeper must be a pointer in the app, so we can SetRouter on it correctly + ICAControllerKeeper icacontrollerkeeper.Keeper + ICAHostKeeper icahostkeeper.Keeper + InterTxKeeper intertxkeeper.Keeper + TransferKeeper ibctransferkeeper.Keeper + FeeGrantKeeper feegrantkeeper.Keeper + AuthzKeeper authzkeeper.Keeper + WasmKeeper wasm.Keeper + + ScopedIBCKeeper capabilitykeeper.ScopedKeeper + ScopedICAHostKeeper capabilitykeeper.ScopedKeeper + ScopedICAControllerKeeper capabilitykeeper.ScopedKeeper + ScopedInterTxKeeper capabilitykeeper.ScopedKeeper + ScopedTransferKeeper capabilitykeeper.ScopedKeeper + ScopedWasmKeeper capabilitykeeper.ScopedKeeper // the module manager mm *module.Manager @@ -324,7 +324,7 @@ func NewWasmApp( memKeys: memKeys, } - app.paramsKeeper = initParamsKeeper( + app.ParamsKeeper = initParamsKeeper( appCodec, legacyAmino, keys[paramstypes.StoreKey], @@ -332,86 +332,86 @@ func NewWasmApp( ) // set the BaseApp's parameter store - bApp.SetParamStore(app.paramsKeeper.Subspace(baseapp.Paramspace).WithKeyTable(paramskeeper.ConsensusParamsKeyTable())) + bApp.SetParamStore(app.ParamsKeeper.Subspace(baseapp.Paramspace).WithKeyTable(paramskeeper.ConsensusParamsKeyTable())) // add capability keeper and ScopeToModule for ibc module - app.capabilityKeeper = capabilitykeeper.NewKeeper( + app.CapabilityKeeper = capabilitykeeper.NewKeeper( appCodec, keys[capabilitytypes.StoreKey], memKeys[capabilitytypes.MemStoreKey], ) - scopedIBCKeeper := app.capabilityKeeper.ScopeToModule(ibchost.ModuleName) - scopedICAHostKeeper := app.capabilityKeeper.ScopeToModule(icahosttypes.SubModuleName) - scopedICAControllerKeeper := app.capabilityKeeper.ScopeToModule(icacontrollertypes.SubModuleName) - scopedInterTxKeeper := app.capabilityKeeper.ScopeToModule(intertxtypes.ModuleName) - scopedTransferKeeper := app.capabilityKeeper.ScopeToModule(ibctransfertypes.ModuleName) - scopedWasmKeeper := app.capabilityKeeper.ScopeToModule(wasm.ModuleName) - app.capabilityKeeper.Seal() + scopedIBCKeeper := app.CapabilityKeeper.ScopeToModule(ibchost.ModuleName) + scopedICAHostKeeper := app.CapabilityKeeper.ScopeToModule(icahosttypes.SubModuleName) + scopedICAControllerKeeper := app.CapabilityKeeper.ScopeToModule(icacontrollertypes.SubModuleName) + scopedInterTxKeeper := app.CapabilityKeeper.ScopeToModule(intertxtypes.ModuleName) + scopedTransferKeeper := app.CapabilityKeeper.ScopeToModule(ibctransfertypes.ModuleName) + scopedWasmKeeper := app.CapabilityKeeper.ScopeToModule(wasm.ModuleName) + app.CapabilityKeeper.Seal() // add keepers - app.accountKeeper = authkeeper.NewAccountKeeper( + app.AccountKeeper = authkeeper.NewAccountKeeper( appCodec, keys[authtypes.StoreKey], app.getSubspace(authtypes.ModuleName), authtypes.ProtoBaseAccount, maccPerms, ) - app.bankKeeper = bankkeeper.NewBaseKeeper( + app.BankKeeper = bankkeeper.NewBaseKeeper( appCodec, keys[banktypes.StoreKey], - app.accountKeeper, + app.AccountKeeper, app.getSubspace(banktypes.ModuleName), app.ModuleAccountAddrs(), ) - app.authzKeeper = authzkeeper.NewKeeper( + app.AuthzKeeper = authzkeeper.NewKeeper( keys[authzkeeper.StoreKey], appCodec, app.BaseApp.MsgServiceRouter(), ) - app.feeGrantKeeper = feegrantkeeper.NewKeeper( + app.FeeGrantKeeper = feegrantkeeper.NewKeeper( appCodec, keys[feegrant.StoreKey], - app.accountKeeper, + app.AccountKeeper, ) - stakingKeeper := stakingkeeper.NewKeeper( + StakingKeeper := stakingkeeper.NewKeeper( appCodec, keys[stakingtypes.StoreKey], - app.accountKeeper, - app.bankKeeper, + app.AccountKeeper, + app.BankKeeper, app.getSubspace(stakingtypes.ModuleName), ) - app.mintKeeper = mintkeeper.NewKeeper( + app.MintKeeper = mintkeeper.NewKeeper( appCodec, keys[minttypes.StoreKey], app.getSubspace(minttypes.ModuleName), - &stakingKeeper, - app.accountKeeper, - app.bankKeeper, + &StakingKeeper, + app.AccountKeeper, + app.BankKeeper, authtypes.FeeCollectorName, ) - app.distrKeeper = distrkeeper.NewKeeper( + app.DistrKeeper = distrkeeper.NewKeeper( appCodec, keys[distrtypes.StoreKey], app.getSubspace(distrtypes.ModuleName), - app.accountKeeper, - app.bankKeeper, - &stakingKeeper, + app.AccountKeeper, + app.BankKeeper, + &StakingKeeper, authtypes.FeeCollectorName, app.ModuleAccountAddrs(), ) - app.slashingKeeper = slashingkeeper.NewKeeper( + app.SlashingKeeper = slashingkeeper.NewKeeper( appCodec, keys[slashingtypes.StoreKey], - &stakingKeeper, + &StakingKeeper, app.getSubspace(slashingtypes.ModuleName), ) - app.crisisKeeper = crisiskeeper.NewKeeper( + app.CrisisKeeper = crisiskeeper.NewKeeper( app.getSubspace(crisistypes.ModuleName), invCheckPeriod, - app.bankKeeper, + app.BankKeeper, authtypes.FeeCollectorName, ) - app.upgradeKeeper = upgradekeeper.NewKeeper( + app.UpgradeKeeper = upgradekeeper.NewKeeper( skipUpgradeHeights, keys[upgradetypes.StoreKey], appCodec, @@ -420,17 +420,17 @@ func NewWasmApp( ) // register the staking hooks - // NOTE: stakingKeeper above is passed by reference, so that it will contain these hooks - app.stakingKeeper = *stakingKeeper.SetHooks( - stakingtypes.NewMultiStakingHooks(app.distrKeeper.Hooks(), app.slashingKeeper.Hooks()), + // NOTE: StakingKeeper above is passed by reference, so that it will contain these hooks + app.StakingKeeper = *StakingKeeper.SetHooks( + stakingtypes.NewMultiStakingHooks(app.DistrKeeper.Hooks(), app.SlashingKeeper.Hooks()), ) - app.ibcKeeper = ibckeeper.NewKeeper( + app.IBCKeeper = ibckeeper.NewKeeper( appCodec, keys[ibchost.StoreKey], app.getSubspace(ibchost.ModuleName), - app.stakingKeeper, - app.upgradeKeeper, + app.StakingKeeper, + app.UpgradeKeeper, scopedIBCKeeper, ) @@ -438,66 +438,66 @@ func NewWasmApp( govRouter := govtypes.NewRouter() govRouter. AddRoute(govtypes.RouterKey, govtypes.ProposalHandler). - AddRoute(paramproposal.RouterKey, params.NewParamChangeProposalHandler(app.paramsKeeper)). - AddRoute(distrtypes.RouterKey, distr.NewCommunityPoolSpendProposalHandler(app.distrKeeper)). - AddRoute(upgradetypes.RouterKey, upgrade.NewSoftwareUpgradeProposalHandler(app.upgradeKeeper)). - AddRoute(ibcclienttypes.RouterKey, ibcclient.NewClientProposalHandler(app.ibcKeeper.ClientKeeper)) + AddRoute(paramproposal.RouterKey, params.NewParamChangeProposalHandler(app.ParamsKeeper)). + AddRoute(distrtypes.RouterKey, distr.NewCommunityPoolSpendProposalHandler(app.DistrKeeper)). + AddRoute(upgradetypes.RouterKey, upgrade.NewSoftwareUpgradeProposalHandler(app.UpgradeKeeper)). + AddRoute(ibcclienttypes.RouterKey, ibcclient.NewClientProposalHandler(app.IBCKeeper.ClientKeeper)) // Create Transfer Keepers - app.transferKeeper = ibctransferkeeper.NewKeeper( + app.TransferKeeper = ibctransferkeeper.NewKeeper( appCodec, keys[ibctransfertypes.StoreKey], app.getSubspace(ibctransfertypes.ModuleName), - app.ibcKeeper.ChannelKeeper, - app.ibcKeeper.ChannelKeeper, - &app.ibcKeeper.PortKeeper, - app.accountKeeper, - app.bankKeeper, + app.IBCKeeper.ChannelKeeper, + app.IBCKeeper.ChannelKeeper, + &app.IBCKeeper.PortKeeper, + app.AccountKeeper, + app.BankKeeper, scopedTransferKeeper, ) - transferModule := transfer.NewAppModule(app.transferKeeper) - transferIBCModule := transfer.NewIBCModule(app.transferKeeper) + transferModule := transfer.NewAppModule(app.TransferKeeper) + transferIBCModule := transfer.NewIBCModule(app.TransferKeeper) - app.icaHostKeeper = icahostkeeper.NewKeeper( + app.ICAHostKeeper = icahostkeeper.NewKeeper( appCodec, keys[icahosttypes.StoreKey], app.getSubspace(icahosttypes.SubModuleName), - app.ibcKeeper.ChannelKeeper, - &app.ibcKeeper.PortKeeper, - app.accountKeeper, + app.IBCKeeper.ChannelKeeper, + &app.IBCKeeper.PortKeeper, + app.AccountKeeper, scopedICAHostKeeper, app.MsgServiceRouter(), ) - app.icaControllerKeeper = icacontrollerkeeper.NewKeeper( + app.ICAControllerKeeper = icacontrollerkeeper.NewKeeper( appCodec, keys[icacontrollertypes.StoreKey], app.getSubspace(icacontrollertypes.SubModuleName), - app.ibcKeeper.ChannelKeeper, // may be replaced with middleware such as ics29 fee - app.ibcKeeper.ChannelKeeper, - &app.ibcKeeper.PortKeeper, + app.IBCKeeper.ChannelKeeper, // may be replaced with middleware such as ics29 fee + app.IBCKeeper.ChannelKeeper, + &app.IBCKeeper.PortKeeper, scopedICAControllerKeeper, app.MsgServiceRouter(), ) - icaModule := ica.NewAppModule(&app.icaControllerKeeper, &app.icaHostKeeper) - icaHostIBCModule := icahost.NewIBCModule(app.icaHostKeeper) + icaModule := ica.NewAppModule(&app.ICAControllerKeeper, &app.ICAHostKeeper) + icaHostIBCModule := icahost.NewIBCModule(app.ICAHostKeeper) // For wasmd we use the demo controller from https://github.com/cosmos/interchain-accounts but see notes below - app.interTxKeeper = intertxkeeper.NewKeeper(appCodec, keys[intertxtypes.StoreKey], app.icaControllerKeeper, scopedInterTxKeeper) + app.InterTxKeeper = intertxkeeper.NewKeeper(appCodec, keys[intertxtypes.StoreKey], app.ICAControllerKeeper, scopedInterTxKeeper) // Note: please do your research before using this in production app, this is a demo and not an officially // supported IBC team implementation. Do your own research before using it. - interTxModule := intertx.NewAppModule(appCodec, app.interTxKeeper) - interTxIBCModule := intertx.NewIBCModule(app.interTxKeeper) + interTxModule := intertx.NewAppModule(appCodec, app.InterTxKeeper) + interTxIBCModule := intertx.NewIBCModule(app.InterTxKeeper) // You will likely want to swap out the second argument with your own reviewed and maintained ica auth module - icaControllerIBCModule := icacontroller.NewIBCModule(app.icaControllerKeeper, interTxIBCModule) + icaControllerIBCModule := icacontroller.NewIBCModule(app.ICAControllerKeeper, interTxIBCModule) // create evidence keeper with router - evidenceKeeper := evidencekeeper.NewKeeper( + EvidenceKeeper := evidencekeeper.NewKeeper( appCodec, keys[evidencetypes.StoreKey], - &app.stakingKeeper, - app.slashingKeeper, + &app.StakingKeeper, + app.SlashingKeeper, ) - app.evidenceKeeper = *evidenceKeeper + app.EvidenceKeeper = *EvidenceKeeper wasmDir := filepath.Join(homePath, "wasm") wasmConfig, err := wasm.ReadWasmConfig(appOpts) @@ -508,18 +508,18 @@ func NewWasmApp( // The last arguments can contain custom message handlers, and custom query handlers, // if we want to allow any custom callbacks supportedFeatures := "iterator,staking,stargate" - app.wasmKeeper = wasm.NewKeeper( + app.WasmKeeper = wasm.NewKeeper( appCodec, keys[wasm.StoreKey], app.getSubspace(wasm.ModuleName), - app.accountKeeper, - app.bankKeeper, - app.stakingKeeper, - app.distrKeeper, - app.ibcKeeper.ChannelKeeper, - &app.ibcKeeper.PortKeeper, + app.AccountKeeper, + app.BankKeeper, + app.StakingKeeper, + app.DistrKeeper, + app.IBCKeeper.ChannelKeeper, + &app.IBCKeeper.PortKeeper, scopedWasmKeeper, - app.transferKeeper, + app.TransferKeeper, app.MsgServiceRouter(), app.GRPCQueryRouter(), wasmDir, @@ -533,23 +533,23 @@ func NewWasmApp( // The gov proposal types can be individually enabled if len(enabledProposals) != 0 { - govRouter.AddRoute(wasm.RouterKey, wasm.NewWasmProposalHandler(app.wasmKeeper, enabledProposals)) + govRouter.AddRoute(wasm.RouterKey, wasm.NewWasmProposalHandler(app.WasmKeeper, enabledProposals)) } ibcRouter. - AddRoute(wasm.ModuleName, wasm.NewIBCHandler(app.wasmKeeper, app.ibcKeeper.ChannelKeeper)). + AddRoute(wasm.ModuleName, wasm.NewIBCHandler(app.WasmKeeper, app.IBCKeeper.ChannelKeeper)). AddRoute(ibctransfertypes.ModuleName, transferIBCModule). AddRoute(icacontrollertypes.SubModuleName, icaControllerIBCModule). AddRoute(icahosttypes.SubModuleName, icaHostIBCModule). AddRoute(intertxtypes.ModuleName, icaControllerIBCModule) - app.ibcKeeper.SetRouter(ibcRouter) + app.IBCKeeper.SetRouter(ibcRouter) - app.govKeeper = govkeeper.NewKeeper( + app.GovKeeper = govkeeper.NewKeeper( appCodec, keys[govtypes.StoreKey], app.getSubspace(govtypes.ModuleName), - app.accountKeeper, - app.bankKeeper, - &stakingKeeper, + app.AccountKeeper, + app.BankKeeper, + &StakingKeeper, govRouter, ) /**** Module Options ****/ @@ -562,31 +562,31 @@ func NewWasmApp( // must be passed by reference here. app.mm = module.NewManager( genutil.NewAppModule( - app.accountKeeper, - app.stakingKeeper, + app.AccountKeeper, + app.StakingKeeper, app.BaseApp.DeliverTx, encodingConfig.TxConfig, ), - auth.NewAppModule(appCodec, app.accountKeeper, nil), - vesting.NewAppModule(app.accountKeeper, app.bankKeeper), - bank.NewAppModule(appCodec, app.bankKeeper, app.accountKeeper), - capability.NewAppModule(appCodec, *app.capabilityKeeper), - gov.NewAppModule(appCodec, app.govKeeper, app.accountKeeper, app.bankKeeper), - mint.NewAppModule(appCodec, app.mintKeeper, app.accountKeeper), - slashing.NewAppModule(appCodec, app.slashingKeeper, app.accountKeeper, app.bankKeeper, app.stakingKeeper), - distr.NewAppModule(appCodec, app.distrKeeper, app.accountKeeper, app.bankKeeper, app.stakingKeeper), - staking.NewAppModule(appCodec, app.stakingKeeper, app.accountKeeper, app.bankKeeper), - upgrade.NewAppModule(app.upgradeKeeper), - wasm.NewAppModule(appCodec, &app.wasmKeeper, app.stakingKeeper, app.accountKeeper, app.bankKeeper), - evidence.NewAppModule(app.evidenceKeeper), - feegrantmodule.NewAppModule(appCodec, app.accountKeeper, app.bankKeeper, app.feeGrantKeeper, app.interfaceRegistry), - authzmodule.NewAppModule(appCodec, app.authzKeeper, app.accountKeeper, app.bankKeeper, app.interfaceRegistry), - ibc.NewAppModule(app.ibcKeeper), - params.NewAppModule(app.paramsKeeper), + auth.NewAppModule(appCodec, app.AccountKeeper, nil), + vesting.NewAppModule(app.AccountKeeper, app.BankKeeper), + bank.NewAppModule(appCodec, app.BankKeeper, app.AccountKeeper), + capability.NewAppModule(appCodec, *app.CapabilityKeeper), + gov.NewAppModule(appCodec, app.GovKeeper, app.AccountKeeper, app.BankKeeper), + mint.NewAppModule(appCodec, app.MintKeeper, app.AccountKeeper), + slashing.NewAppModule(appCodec, app.SlashingKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper), + distr.NewAppModule(appCodec, app.DistrKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper), + staking.NewAppModule(appCodec, app.StakingKeeper, app.AccountKeeper, app.BankKeeper), + upgrade.NewAppModule(app.UpgradeKeeper), + wasm.NewAppModule(appCodec, &app.WasmKeeper, app.StakingKeeper, app.AccountKeeper, app.BankKeeper), + evidence.NewAppModule(app.EvidenceKeeper), + feegrantmodule.NewAppModule(appCodec, app.AccountKeeper, app.BankKeeper, app.FeeGrantKeeper, app.interfaceRegistry), + authzmodule.NewAppModule(appCodec, app.AuthzKeeper, app.AccountKeeper, app.BankKeeper, app.interfaceRegistry), + ibc.NewAppModule(app.IBCKeeper), + params.NewAppModule(app.ParamsKeeper), transferModule, icaModule, interTxModule, - crisis.NewAppModule(&app.crisisKeeper, skipGenesisInvariants), // always be last to make sure that it checks for all invariants and not only part of them + crisis.NewAppModule(&app.CrisisKeeper, skipGenesisInvariants), // always be last to make sure that it checks for all invariants and not only part of them ) // During begin block slashing happens after distr.BeginBlocker so that @@ -679,7 +679,7 @@ func NewWasmApp( // Uncomment if you want to set a custom migration order here. // app.mm.SetOrderMigrations(custom order) - app.mm.RegisterInvariants(&app.crisisKeeper) + app.mm.RegisterInvariants(&app.CrisisKeeper) app.mm.RegisterRoutes(app.Router(), app.QueryRouter(), encodingConfig.Amino) app.configurator = module.NewConfigurator(app.appCodec, app.MsgServiceRouter(), app.GRPCQueryRouter()) @@ -690,20 +690,20 @@ func NewWasmApp( // NOTE: this is not required apps that don't use the simulator for fuzz testing // transactions app.sm = module.NewSimulationManager( - auth.NewAppModule(appCodec, app.accountKeeper, authsims.RandomGenesisAccounts), - bank.NewAppModule(appCodec, app.bankKeeper, app.accountKeeper), - capability.NewAppModule(appCodec, *app.capabilityKeeper), - feegrantmodule.NewAppModule(appCodec, app.accountKeeper, app.bankKeeper, app.feeGrantKeeper, app.interfaceRegistry), - authzmodule.NewAppModule(appCodec, app.authzKeeper, app.accountKeeper, app.bankKeeper, app.interfaceRegistry), - gov.NewAppModule(appCodec, app.govKeeper, app.accountKeeper, app.bankKeeper), - mint.NewAppModule(appCodec, app.mintKeeper, app.accountKeeper), - staking.NewAppModule(appCodec, app.stakingKeeper, app.accountKeeper, app.bankKeeper), - distr.NewAppModule(appCodec, app.distrKeeper, app.accountKeeper, app.bankKeeper, app.stakingKeeper), - slashing.NewAppModule(appCodec, app.slashingKeeper, app.accountKeeper, app.bankKeeper, app.stakingKeeper), - params.NewAppModule(app.paramsKeeper), - evidence.NewAppModule(app.evidenceKeeper), - wasm.NewAppModule(appCodec, &app.wasmKeeper, app.stakingKeeper, app.accountKeeper, app.bankKeeper), - ibc.NewAppModule(app.ibcKeeper), + auth.NewAppModule(appCodec, app.AccountKeeper, authsims.RandomGenesisAccounts), + bank.NewAppModule(appCodec, app.BankKeeper, app.AccountKeeper), + capability.NewAppModule(appCodec, *app.CapabilityKeeper), + feegrantmodule.NewAppModule(appCodec, app.AccountKeeper, app.BankKeeper, app.FeeGrantKeeper, app.interfaceRegistry), + authzmodule.NewAppModule(appCodec, app.AuthzKeeper, app.AccountKeeper, app.BankKeeper, app.interfaceRegistry), + gov.NewAppModule(appCodec, app.GovKeeper, app.AccountKeeper, app.BankKeeper), + mint.NewAppModule(appCodec, app.MintKeeper, app.AccountKeeper), + staking.NewAppModule(appCodec, app.StakingKeeper, app.AccountKeeper, app.BankKeeper), + distr.NewAppModule(appCodec, app.DistrKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper), + slashing.NewAppModule(appCodec, app.SlashingKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper), + params.NewAppModule(app.ParamsKeeper), + evidence.NewAppModule(app.EvidenceKeeper), + wasm.NewAppModule(appCodec, &app.WasmKeeper, app.StakingKeeper, app.AccountKeeper, app.BankKeeper), + ibc.NewAppModule(app.IBCKeeper), transferModule, ) @@ -716,13 +716,13 @@ func NewWasmApp( anteHandler, err := NewAnteHandler( HandlerOptions{ HandlerOptions: ante.HandlerOptions{ - AccountKeeper: app.accountKeeper, - BankKeeper: app.bankKeeper, - FeegrantKeeper: app.feeGrantKeeper, + AccountKeeper: app.AccountKeeper, + BankKeeper: app.BankKeeper, + FeegrantKeeper: app.FeeGrantKeeper, SignModeHandler: encodingConfig.TxConfig.SignModeHandler(), SigGasConsumer: ante.DefaultSigVerificationGasConsumer, }, - IBCKeeper: app.ibcKeeper, + IBCKeeper: app.IBCKeeper, WasmConfig: &wasmConfig, TXCounterStoreKey: keys[wasm.StoreKey], }, @@ -741,19 +741,19 @@ func NewWasmApp( // see cmd/wasmd/root.go: 206 - 214 approx if manager := app.SnapshotManager(); manager != nil { err := manager.RegisterExtensions( - wasmkeeper.NewWasmSnapshotter(app.CommitMultiStore(), &app.wasmKeeper), + wasmkeeper.NewWasmSnapshotter(app.CommitMultiStore(), &app.WasmKeeper), ) if err != nil { panic(fmt.Errorf("failed to register snapshot extension: %s", err)) } } - app.scopedIBCKeeper = scopedIBCKeeper - app.scopedTransferKeeper = scopedTransferKeeper - app.scopedWasmKeeper = scopedWasmKeeper - app.scopedICAHostKeeper = scopedICAHostKeeper - app.scopedICAControllerKeeper = scopedICAControllerKeeper - app.scopedInterTxKeeper = scopedInterTxKeeper + app.ScopedIBCKeeper = scopedIBCKeeper + app.ScopedTransferKeeper = scopedTransferKeeper + app.ScopedWasmKeeper = scopedWasmKeeper + app.ScopedICAHostKeeper = scopedICAHostKeeper + app.ScopedICAControllerKeeper = scopedICAControllerKeeper + app.ScopedInterTxKeeper = scopedInterTxKeeper if loadLatest { if err := app.LoadLatestVersion(); err != nil { @@ -762,7 +762,7 @@ func NewWasmApp( ctx := app.BaseApp.NewUncachedContext(true, tmproto.Header{}) // Initialize pinned codes in wasmvm as they are not persisted there - if err := app.wasmKeeper.InitializePinnedCodes(ctx); err != nil { + if err := app.WasmKeeper.InitializePinnedCodes(ctx); err != nil { tmos.Exit(fmt.Sprintf("failed initialize pinned codes %s", err)) } } @@ -790,7 +790,7 @@ func (app *WasmApp) InitChainer(ctx sdk.Context, req abci.RequestInitChain) abci panic(err) } - app.upgradeKeeper.SetModuleVersionMap(ctx, app.mm.GetVersionMap()) + app.UpgradeKeeper.SetModuleVersionMap(ctx, app.mm.GetVersionMap()) return app.mm.InitGenesis(ctx, app.appCodec, genesisState) } @@ -822,7 +822,7 @@ func (app *WasmApp) LegacyAmino() *codec.LegacyAmino { //nolint:staticcheck // // NOTE: This is solely to be used for testing purposes. func (app *WasmApp) getSubspace(moduleName string) paramstypes.Subspace { - subspace, _ := app.paramsKeeper.GetSubspace(moduleName) + subspace, _ := app.ParamsKeeper.GetSubspace(moduleName) return subspace } @@ -889,21 +889,21 @@ func GetMaccPerms() map[string][]string { // initParamsKeeper init params keeper and its subspaces func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino, key, tkey sdk.StoreKey) paramskeeper.Keeper { - paramsKeeper := paramskeeper.NewKeeper(appCodec, legacyAmino, key, tkey) - - paramsKeeper.Subspace(authtypes.ModuleName) - paramsKeeper.Subspace(banktypes.ModuleName) - paramsKeeper.Subspace(stakingtypes.ModuleName) - paramsKeeper.Subspace(minttypes.ModuleName) - paramsKeeper.Subspace(distrtypes.ModuleName) - paramsKeeper.Subspace(slashingtypes.ModuleName) - paramsKeeper.Subspace(govtypes.ModuleName).WithKeyTable(govtypes.ParamKeyTable()) - paramsKeeper.Subspace(crisistypes.ModuleName) - paramsKeeper.Subspace(ibctransfertypes.ModuleName) - paramsKeeper.Subspace(ibchost.ModuleName) - paramsKeeper.Subspace(icahosttypes.SubModuleName) - paramsKeeper.Subspace(icacontrollertypes.SubModuleName) - paramsKeeper.Subspace(wasm.ModuleName) - - return paramsKeeper + ParamsKeeper := paramskeeper.NewKeeper(appCodec, legacyAmino, key, tkey) + + ParamsKeeper.Subspace(authtypes.ModuleName) + ParamsKeeper.Subspace(banktypes.ModuleName) + ParamsKeeper.Subspace(stakingtypes.ModuleName) + ParamsKeeper.Subspace(minttypes.ModuleName) + ParamsKeeper.Subspace(distrtypes.ModuleName) + ParamsKeeper.Subspace(slashingtypes.ModuleName) + ParamsKeeper.Subspace(govtypes.ModuleName).WithKeyTable(govtypes.ParamKeyTable()) + ParamsKeeper.Subspace(crisistypes.ModuleName) + ParamsKeeper.Subspace(ibctransfertypes.ModuleName) + ParamsKeeper.Subspace(ibchost.ModuleName) + ParamsKeeper.Subspace(icahosttypes.SubModuleName) + ParamsKeeper.Subspace(icacontrollertypes.SubModuleName) + ParamsKeeper.Subspace(wasm.ModuleName) + + return ParamsKeeper } diff --git a/app/app_test.go b/app/app_test.go index a3bd66ab6f..9a5ec80f88 100644 --- a/app/app_test.go +++ b/app/app_test.go @@ -47,7 +47,7 @@ func TestBlockedAddrs(t *testing.T) { for acc := range maccPerms { t.Run(acc, func(t *testing.T) { - require.True(t, gapp.bankKeeper.BlockedAddr(gapp.accountKeeper.GetModuleAddress(acc)), + require.True(t, gapp.BankKeeper.BlockedAddr(gapp.AccountKeeper.GetModuleAddress(acc)), "ensure that blocked addresses are properly set in bank keeper", ) }) diff --git a/app/export.go b/app/export.go index 4740592806..65c0866dfa 100644 --- a/app/export.go +++ b/app/export.go @@ -35,7 +35,7 @@ func (app *WasmApp) ExportAppStateAndValidators( return servertypes.ExportedApp{}, err } - validators, err := staking.WriteValidators(ctx, app.stakingKeeper) + validators, err := staking.WriteValidators(ctx, app.StakingKeeper) return servertypes.ExportedApp{ AppState: appState, Validators: validators, @@ -66,18 +66,18 @@ func (app *WasmApp) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs [ } /* Just to be safe, assert the invariants on current state. */ - app.crisisKeeper.AssertInvariants(ctx) + app.CrisisKeeper.AssertInvariants(ctx) /* Handle fee distribution state. */ // withdraw all validator commission - app.stakingKeeper.IterateValidators(ctx, func(_ int64, val stakingtypes.ValidatorI) (stop bool) { - _, _ = app.distrKeeper.WithdrawValidatorCommission(ctx, val.GetOperator()) //nolint:errcheck + app.StakingKeeper.IterateValidators(ctx, func(_ int64, val stakingtypes.ValidatorI) (stop bool) { + _, _ = app.DistrKeeper.WithdrawValidatorCommission(ctx, val.GetOperator()) //nolint:errcheck return false }) // withdraw all delegator rewards - dels := app.stakingKeeper.GetAllDelegations(ctx) + dels := app.StakingKeeper.GetAllDelegations(ctx) for _, delegation := range dels { valAddr, err := sdk.ValAddressFromBech32(delegation.ValidatorAddress) if err != nil { @@ -88,28 +88,28 @@ func (app *WasmApp) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs [ if err != nil { panic(err) } - _, _ = app.distrKeeper.WithdrawDelegationRewards(ctx, delAddr, valAddr) //nolint:errcheck + _, _ = app.DistrKeeper.WithdrawDelegationRewards(ctx, delAddr, valAddr) //nolint:errcheck } // clear validator slash events - app.distrKeeper.DeleteAllValidatorSlashEvents(ctx) + app.DistrKeeper.DeleteAllValidatorSlashEvents(ctx) // clear validator historical rewards - app.distrKeeper.DeleteAllValidatorHistoricalRewards(ctx) + app.DistrKeeper.DeleteAllValidatorHistoricalRewards(ctx) // set context height to zero height := ctx.BlockHeight() ctx = ctx.WithBlockHeight(0) // reinitialize all validators - app.stakingKeeper.IterateValidators(ctx, func(_ int64, val stakingtypes.ValidatorI) (stop bool) { + app.StakingKeeper.IterateValidators(ctx, func(_ int64, val stakingtypes.ValidatorI) (stop bool) { // donate any unwithdrawn outstanding reward fraction tokens to the community pool - scraps := app.distrKeeper.GetValidatorOutstandingRewardsCoins(ctx, val.GetOperator()) - feePool := app.distrKeeper.GetFeePool(ctx) + scraps := app.DistrKeeper.GetValidatorOutstandingRewardsCoins(ctx, val.GetOperator()) + feePool := app.DistrKeeper.GetFeePool(ctx) feePool.CommunityPool = feePool.CommunityPool.Add(scraps...) - app.distrKeeper.SetFeePool(ctx, feePool) + app.DistrKeeper.SetFeePool(ctx, feePool) - app.distrKeeper.Hooks().AfterValidatorCreated(ctx, val.GetOperator()) + app.DistrKeeper.Hooks().AfterValidatorCreated(ctx, val.GetOperator()) return false }) @@ -123,8 +123,8 @@ func (app *WasmApp) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs [ if err != nil { panic(err) } - app.distrKeeper.Hooks().BeforeDelegationCreated(ctx, delAddr, valAddr) - app.distrKeeper.Hooks().AfterDelegationModified(ctx, delAddr, valAddr) + app.DistrKeeper.Hooks().BeforeDelegationCreated(ctx, delAddr, valAddr) + app.DistrKeeper.Hooks().AfterDelegationModified(ctx, delAddr, valAddr) } // reset context height @@ -133,20 +133,20 @@ func (app *WasmApp) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs [ /* Handle staking state. */ // iterate through redelegations, reset creation height - app.stakingKeeper.IterateRedelegations(ctx, func(_ int64, red stakingtypes.Redelegation) (stop bool) { + app.StakingKeeper.IterateRedelegations(ctx, func(_ int64, red stakingtypes.Redelegation) (stop bool) { for i := range red.Entries { red.Entries[i].CreationHeight = 0 } - app.stakingKeeper.SetRedelegation(ctx, red) + app.StakingKeeper.SetRedelegation(ctx, red) return false }) // iterate through unbonding delegations, reset creation height - app.stakingKeeper.IterateUnbondingDelegations(ctx, func(_ int64, ubd stakingtypes.UnbondingDelegation) (stop bool) { + app.StakingKeeper.IterateUnbondingDelegations(ctx, func(_ int64, ubd stakingtypes.UnbondingDelegation) (stop bool) { for i := range ubd.Entries { ubd.Entries[i].CreationHeight = 0 } - app.stakingKeeper.SetUnbondingDelegation(ctx, ubd) + app.StakingKeeper.SetUnbondingDelegation(ctx, ubd) return false }) @@ -158,7 +158,7 @@ func (app *WasmApp) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs [ for ; iter.Valid(); iter.Next() { addr := sdk.ValAddress(iter.Key()[1:]) - validator, found := app.stakingKeeper.GetValidator(ctx, addr) + validator, found := app.StakingKeeper.GetValidator(ctx, addr) if !found { panic("expected validator, not found") } @@ -168,13 +168,13 @@ func (app *WasmApp) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs [ validator.Jailed = true } - app.stakingKeeper.SetValidator(ctx, validator) + app.StakingKeeper.SetValidator(ctx, validator) counter++ } iter.Close() - _, err := app.stakingKeeper.ApplyAndReturnValidatorSetUpdates(ctx) + _, err := app.StakingKeeper.ApplyAndReturnValidatorSetUpdates(ctx) if err != nil { log.Fatal(err) } @@ -182,11 +182,11 @@ func (app *WasmApp) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs [ /* Handle slashing state. */ // reset start height on signing infos - app.slashingKeeper.IterateValidatorSigningInfos( + app.SlashingKeeper.IterateValidatorSigningInfos( ctx, func(addr sdk.ConsAddress, info slashingtypes.ValidatorSigningInfo) (stop bool) { info.StartHeight = 0 - app.slashingKeeper.SetValidatorSigningInfo(ctx, addr, info) + app.SlashingKeeper.SetValidatorSigningInfo(ctx, addr, info) return false }, ) diff --git a/app/sim_test.go b/app/sim_test.go index d64488de40..41f729099e 100644 --- a/app/sim_test.go +++ b/app/sim_test.go @@ -213,7 +213,7 @@ func TestAppImportExport(t *testing.T) { normalizeContractInfo := func(ctx sdk.Context, app *WasmApp) { var index uint64 - app.wasmKeeper.IterateContractInfo(ctx, func(address sdk.AccAddress, info wasmtypes.ContractInfo) bool { + app.WasmKeeper.IterateContractInfo(ctx, func(address sdk.AccAddress, info wasmtypes.ContractInfo) bool { created := &wasmtypes.AbsoluteTxPosition{ BlockHeight: uint64(0), TxIndex: index, diff --git a/app/test_access.go b/app/test_access.go index 6dadec1e0c..a3c3400aba 100644 --- a/app/test_access.go +++ b/app/test_access.go @@ -28,11 +28,11 @@ func NewTestSupport(t testing.TB, app *WasmApp) *TestSupport { } func (s TestSupport) IBCKeeper() *ibckeeper.Keeper { - return s.app.ibcKeeper + return s.app.IBCKeeper } func (s TestSupport) WasmKeeper() wasm.Keeper { - return s.app.wasmKeeper + return s.app.WasmKeeper } func (s TestSupport) AppCodec() codec.Codec { @@ -40,27 +40,27 @@ func (s TestSupport) AppCodec() codec.Codec { } func (s TestSupport) ScopedWasmIBCKeeper() capabilitykeeper.ScopedKeeper { - return s.app.scopedWasmKeeper + return s.app.ScopedWasmKeeper } func (s TestSupport) ScopeIBCKeeper() capabilitykeeper.ScopedKeeper { - return s.app.scopedIBCKeeper + return s.app.ScopedIBCKeeper } func (s TestSupport) ScopedTransferKeeper() capabilitykeeper.ScopedKeeper { - return s.app.scopedTransferKeeper + return s.app.ScopedTransferKeeper } func (s TestSupport) StakingKeeper() stakingkeeper.Keeper { - return s.app.stakingKeeper + return s.app.StakingKeeper } func (s TestSupport) BankKeeper() bankkeeper.Keeper { - return s.app.bankKeeper + return s.app.BankKeeper } func (s TestSupport) TransferKeeper() ibctransferkeeper.Keeper { - return s.app.transferKeeper + return s.app.TransferKeeper } func (s TestSupport) GetBaseApp() *baseapp.BaseApp { diff --git a/app/test_helpers.go b/app/test_helpers.go index 11e72135b3..39c27ed1ca 100644 --- a/app/test_helpers.go +++ b/app/test_helpers.go @@ -201,7 +201,7 @@ func createIncrementalAccounts(accNum int) []sdk.AccAddress { // AddTestAddrsFromPubKeys adds the addresses into the WasmApp providing only the public keys. func AddTestAddrsFromPubKeys(app *WasmApp, ctx sdk.Context, pubKeys []cryptotypes.PubKey, accAmt sdk.Int) { - initCoins := sdk.NewCoins(sdk.NewCoin(app.stakingKeeper.BondDenom(ctx), accAmt)) + initCoins := sdk.NewCoins(sdk.NewCoin(app.StakingKeeper.BondDenom(ctx), accAmt)) for _, pk := range pubKeys { initAccountWithCoins(app, ctx, sdk.AccAddress(pk.Address()), initCoins) @@ -223,7 +223,7 @@ func AddTestAddrsIncremental(app *WasmApp, ctx sdk.Context, accNum int, accAmt s func addTestAddrs(app *WasmApp, ctx sdk.Context, accNum int, accAmt sdk.Int, strategy GenerateAccountStrategy) []sdk.AccAddress { testAddrs := strategy(accNum) - initCoins := sdk.NewCoins(sdk.NewCoin(app.stakingKeeper.BondDenom(ctx), accAmt)) + initCoins := sdk.NewCoins(sdk.NewCoin(app.StakingKeeper.BondDenom(ctx), accAmt)) // fill all the addresses with some coins, set the loose pool tokens simultaneously for _, addr := range testAddrs { @@ -234,12 +234,12 @@ func addTestAddrs(app *WasmApp, ctx sdk.Context, accNum int, accAmt sdk.Int, str } func initAccountWithCoins(app *WasmApp, ctx sdk.Context, addr sdk.AccAddress, coins sdk.Coins) { - err := app.bankKeeper.MintCoins(ctx, minttypes.ModuleName, coins) + err := app.BankKeeper.MintCoins(ctx, minttypes.ModuleName, coins) if err != nil { panic(err) } - err = app.bankKeeper.SendCoinsFromModuleToAccount(ctx, minttypes.ModuleName, addr, coins) + err = app.BankKeeper.SendCoinsFromModuleToAccount(ctx, minttypes.ModuleName, addr, coins) if err != nil { panic(err) } @@ -280,7 +280,7 @@ func TestAddr(addr string, bech string) (sdk.AccAddress, error) { // CheckBalance checks the balance of an account. func CheckBalance(t *testing.T, app *WasmApp, addr sdk.AccAddress, balances sdk.Coins) { ctxCheck := app.BaseApp.NewContext(true, tmproto.Header{}) - require.True(t, balances.IsEqual(app.bankKeeper.GetAllBalances(ctxCheck, addr))) + require.True(t, balances.IsEqual(app.BankKeeper.GetAllBalances(ctxCheck, addr))) } const DefaultGas = 1200000 @@ -447,12 +447,12 @@ func (ao EmptyBaseAppOptions) Get(o string) interface{} { // // Instead of using the mint module account, which has the // permission of minting, create a "faucet" account. (@fdymylja) -func FundAccount(bankKeeper bankkeeper.Keeper, ctx sdk.Context, addr sdk.AccAddress, amounts sdk.Coins) error { - if err := bankKeeper.MintCoins(ctx, minttypes.ModuleName, amounts); err != nil { +func FundAccount(BankKeeper bankkeeper.Keeper, ctx sdk.Context, addr sdk.AccAddress, amounts sdk.Coins) error { + if err := BankKeeper.MintCoins(ctx, minttypes.ModuleName, amounts); err != nil { return err } - return bankKeeper.SendCoinsFromModuleToAccount(ctx, minttypes.ModuleName, addr, amounts) + return BankKeeper.SendCoinsFromModuleToAccount(ctx, minttypes.ModuleName, addr, amounts) } // FundModuleAccount is a utility function that funds a module account by @@ -461,10 +461,10 @@ func FundAccount(bankKeeper bankkeeper.Keeper, ctx sdk.Context, addr sdk.AccAddr // // Instead of using the mint module account, which has the // permission of minting, create a "faucet" account. (@fdymylja) -func FundModuleAccount(bankKeeper bankkeeper.Keeper, ctx sdk.Context, recipientMod string, amounts sdk.Coins) error { - if err := bankKeeper.MintCoins(ctx, minttypes.ModuleName, amounts); err != nil { +func FundModuleAccount(BankKeeper bankkeeper.Keeper, ctx sdk.Context, recipientMod string, amounts sdk.Coins) error { + if err := BankKeeper.MintCoins(ctx, minttypes.ModuleName, amounts); err != nil { return err } - return bankKeeper.SendCoinsFromModuleToModule(ctx, minttypes.ModuleName, recipientMod, amounts) + return BankKeeper.SendCoinsFromModuleToModule(ctx, minttypes.ModuleName, recipientMod, amounts) } diff --git a/x/wasm/genesis_test.go b/x/wasm/genesis_test.go index ea97c97f07..f9e9f640ba 100644 --- a/x/wasm/genesis_test.go +++ b/x/wasm/genesis_test.go @@ -79,7 +79,7 @@ func TestInitGenesis(t *testing.T) { q2 := newData.module.LegacyQuerierHandler(nil) // initialize new app with genstate - InitGenesis(newData.ctx, &newData.keeper, *genState, newData.stakingKeeper, newData.module.Route().Handler()) + InitGenesis(newData.ctx, &newData.keeper, *genState, newData.StakingKeeper, newData.module.Route().Handler()) // run same checks again on newdata, to make sure it was reinitialized correctly assertCodeList(t, q2, newData.ctx, 1) diff --git a/x/wasm/keeper/genesis.go b/x/wasm/keeper/genesis.go index 7fa5280b9e..ac45b9a19e 100644 --- a/x/wasm/keeper/genesis.go +++ b/x/wasm/keeper/genesis.go @@ -16,7 +16,7 @@ type ValidatorSetSource interface { // InitGenesis sets supply information for genesis. // // CONTRACT: all types of accounts must have been already initialized/created -func InitGenesis(ctx sdk.Context, keeper *Keeper, data types.GenesisState, stakingKeeper ValidatorSetSource, msgHandler sdk.Handler) ([]abci.ValidatorUpdate, error) { +func InitGenesis(ctx sdk.Context, keeper *Keeper, data types.GenesisState, StakingKeeper ValidatorSetSource, msgHandler sdk.Handler) ([]abci.ValidatorUpdate, error) { contractKeeper := NewGovPermissionKeeper(keeper) keeper.SetParams(ctx, data.Params) var maxCodeID uint64 @@ -78,7 +78,7 @@ func InitGenesis(ctx sdk.Context, keeper *Keeper, data types.GenesisState, staki return nil, sdkerrors.Wrap(err, "genesis") } } - return stakingKeeper.ApplyAndReturnValidatorSetUpdates(ctx) + return StakingKeeper.ApplyAndReturnValidatorSetUpdates(ctx) } // ExportGenesis returns a GenesisState for a given context and keeper. diff --git a/x/wasm/keeper/handler_plugin.go b/x/wasm/keeper/handler_plugin.go index c138e5ed00..9e2b16309d 100644 --- a/x/wasm/keeper/handler_plugin.go +++ b/x/wasm/keeper/handler_plugin.go @@ -35,8 +35,8 @@ type SDKMessageHandler struct { func NewDefaultMessageHandler( router MessageRouter, channelKeeper types.ChannelKeeper, - capabilityKeeper types.CapabilityKeeper, - bankKeeper types.Burner, + CapabilityKeeper types.CapabilityKeeper, + BankKeeper types.Burner, unpacker codectypes.AnyUnpacker, portSource types.ICS20TransferPortSource, customEncoders ...*MessageEncoders, @@ -47,8 +47,8 @@ func NewDefaultMessageHandler( } return NewMessageHandlerChain( NewSDKMessageHandler(router, encoders), - NewIBCRawPacketHandler(channelKeeper, capabilityKeeper), - NewBurnCoinMessageHandler(bankKeeper), + NewIBCRawPacketHandler(channelKeeper, CapabilityKeeper), + NewBurnCoinMessageHandler(BankKeeper), ) } @@ -143,11 +143,11 @@ func (m MessageHandlerChain) DispatchMsg(ctx sdk.Context, contractAddr sdk.AccAd // IBCRawPacketHandler handels IBC.SendPacket messages which are published to an IBC channel. type IBCRawPacketHandler struct { channelKeeper types.ChannelKeeper - capabilityKeeper types.CapabilityKeeper + CapabilityKeeper types.CapabilityKeeper } func NewIBCRawPacketHandler(chk types.ChannelKeeper, cak types.CapabilityKeeper) IBCRawPacketHandler { - return IBCRawPacketHandler{channelKeeper: chk, capabilityKeeper: cak} + return IBCRawPacketHandler{channelKeeper: chk, CapabilityKeeper: cak} } // DispatchMsg publishes a raw IBC packet onto the channel. @@ -174,7 +174,7 @@ func (h IBCRawPacketHandler) DispatchMsg(ctx sdk.Context, _ sdk.AccAddress, cont if !ok { return nil, nil, sdkerrors.Wrap(channeltypes.ErrInvalidChannel, "not found") } - channelCap, ok := h.capabilityKeeper.GetCapability(ctx, host.ChannelCapabilityPath(contractIBCPortID, contractIBCChannelID)) + channelCap, ok := h.CapabilityKeeper.GetCapability(ctx, host.ChannelCapabilityPath(contractIBCPortID, contractIBCChannelID)) if !ok { return nil, nil, sdkerrors.Wrap(channeltypes.ErrChannelCapabilityNotFound, "module does not own channel capability") } diff --git a/x/wasm/keeper/ibc.go b/x/wasm/keeper/ibc.go index f6f928df62..eb71ec9f8e 100644 --- a/x/wasm/keeper/ibc.go +++ b/x/wasm/keeper/ibc.go @@ -25,7 +25,7 @@ func (k Keeper) bindIbcPort(ctx sdk.Context, portID string) error { // (lack of permissions or someone else has it) func (k Keeper) ensureIbcPort(ctx sdk.Context, contractAddr sdk.AccAddress) (string, error) { portID := PortIDForContract(contractAddr) - if _, ok := k.capabilityKeeper.GetCapability(ctx, host.PortPath(portID)); ok { + if _, ok := k.CapabilityKeeper.GetCapability(ctx, host.PortPath(portID)); ok { return portID, nil } return portID, k.bindIbcPort(ctx, portID) @@ -46,11 +46,11 @@ func ContractFromPortID(portID string) (sdk.AccAddress, error) { // AuthenticateCapability wraps the scopedKeeper's AuthenticateCapability function func (k Keeper) AuthenticateCapability(ctx sdk.Context, cap *capabilitytypes.Capability, name string) bool { - return k.capabilityKeeper.AuthenticateCapability(ctx, cap, name) + return k.CapabilityKeeper.AuthenticateCapability(ctx, cap, name) } // ClaimCapability allows the transfer module to claim a capability // that IBC module passes to it func (k Keeper) ClaimCapability(ctx sdk.Context, cap *capabilitytypes.Capability, name string) error { - return k.capabilityKeeper.ClaimCapability(ctx, cap, name) + return k.CapabilityKeeper.ClaimCapability(ctx, cap, name) } diff --git a/x/wasm/keeper/keeper.go b/x/wasm/keeper/keeper.go index 3fdcbec483..3dc25acb3e 100644 --- a/x/wasm/keeper/keeper.go +++ b/x/wasm/keeper/keeper.go @@ -70,10 +70,10 @@ type WasmVMResponseHandler interface { type Keeper struct { storeKey sdk.StoreKey cdc codec.Codec - accountKeeper types.AccountKeeper + AccountKeeper types.AccountKeeper bank CoinTransferrer portKeeper types.PortKeeper - capabilityKeeper types.CapabilityKeeper + CapabilityKeeper types.CapabilityKeeper wasmVM types.WasmerEngine wasmVMQueryHandler WasmVMQueryHandler wasmVMResponseHandler WasmVMResponseHandler @@ -91,13 +91,13 @@ func NewKeeper( cdc codec.Codec, storeKey sdk.StoreKey, paramSpace paramtypes.Subspace, - accountKeeper types.AccountKeeper, - bankKeeper types.BankKeeper, - stakingKeeper types.StakingKeeper, + AccountKeeper types.AccountKeeper, + BankKeeper types.BankKeeper, + StakingKeeper types.StakingKeeper, distKeeper types.DistributionKeeper, channelKeeper types.ChannelKeeper, portKeeper types.PortKeeper, - capabilityKeeper types.CapabilityKeeper, + CapabilityKeeper types.CapabilityKeeper, portSource types.ICS20TransferPortSource, router MessageRouter, queryRouter GRPCQueryRouter, @@ -119,17 +119,17 @@ func NewKeeper( storeKey: storeKey, cdc: cdc, wasmVM: wasmer, - accountKeeper: accountKeeper, - bank: NewBankCoinTransferrer(bankKeeper), + AccountKeeper: AccountKeeper, + bank: NewBankCoinTransferrer(BankKeeper), portKeeper: portKeeper, - capabilityKeeper: capabilityKeeper, - messenger: NewDefaultMessageHandler(router, channelKeeper, capabilityKeeper, bankKeeper, cdc, portSource), + CapabilityKeeper: CapabilityKeeper, + messenger: NewDefaultMessageHandler(router, channelKeeper, CapabilityKeeper, BankKeeper, cdc, portSource), queryGasLimit: wasmConfig.SmartQueryGasLimit, paramSpace: paramSpace, gasRegister: NewDefaultWasmGasRegister(), maxQueryStackSize: types.DefaultMaxQueryStackSize, } - keeper.wasmVMQueryHandler = DefaultQueryPlugins(bankKeeper, stakingKeeper, distKeeper, channelKeeper, queryRouter, keeper) + keeper.wasmVMQueryHandler = DefaultQueryPlugins(BankKeeper, StakingKeeper, distKeeper, channelKeeper, queryRouter, keeper) for _, o := range opts { o.apply(keeper) } @@ -246,7 +246,7 @@ func (k Keeper) instantiate(ctx sdk.Context, codeID uint64, creator, admin sdk.A // create contract address contractAddress := k.generateContractAddress(ctx, codeID) - existingAcct := k.accountKeeper.GetAccount(ctx, contractAddress) + existingAcct := k.AccountKeeper.GetAccount(ctx, contractAddress) if existingAcct != nil { return nil, nil, sdkerrors.Wrap(types.ErrAccountExists, existingAcct.GetAddress().String()) } @@ -259,8 +259,8 @@ func (k Keeper) instantiate(ctx sdk.Context, codeID uint64, creator, admin sdk.A } else { // create an empty account (so we don't have issues later) // TODO: can we remove this? - contractAccount := k.accountKeeper.NewAccountWithAddress(ctx, contractAddress) - k.accountKeeper.SetAccount(ctx, contractAccount) + contractAccount := k.AccountKeeper.NewAccountWithAddress(ctx, contractAddress) + k.AccountKeeper.SetAccount(ctx, contractAccount) } // get contact info diff --git a/x/wasm/keeper/keeper_test.go b/x/wasm/keeper/keeper_test.go index bb20a39267..2cf206ebdf 100644 --- a/x/wasm/keeper/keeper_test.go +++ b/x/wasm/keeper/keeper_test.go @@ -122,12 +122,12 @@ func TestCreateStoresInstantiatePermission(t *testing.T) { for msg, spec := range specs { t.Run(msg, func(t *testing.T) { ctx, keepers := CreateTestInput(t, false, SupportedFeatures) - accKeeper, keeper, bankKeeper := keepers.AccountKeeper, keepers.ContractKeeper, keepers.BankKeeper + accKeeper, keeper, BankKeeper := keepers.AccountKeeper, keepers.ContractKeeper, keepers.BankKeeper keepers.WasmKeeper.SetParams(ctx, types.Params{ CodeUploadAccess: types.AllowEverybody, InstantiateDefaultPermission: spec.srcPermission, }) - fundAccounts(t, ctx, accKeeper, bankKeeper, myAddr, deposit) + fundAccounts(t, ctx, accKeeper, BankKeeper, myAddr, deposit) codeID, err := keeper.Create(ctx, myAddr, hackatomWasm, nil) require.NoError(t, err) @@ -452,10 +452,10 @@ func TestInstantiateWithDeposit(t *testing.T) { for msg, spec := range specs { t.Run(msg, func(t *testing.T) { ctx, keepers := CreateTestInput(t, false, SupportedFeatures) - accKeeper, bankKeeper, keeper := keepers.AccountKeeper, keepers.BankKeeper, keepers.ContractKeeper + accKeeper, BankKeeper, keeper := keepers.AccountKeeper, keepers.BankKeeper, keepers.ContractKeeper if spec.fundAddr { - fundAccounts(t, ctx, accKeeper, bankKeeper, spec.srcActor, sdk.NewCoins(sdk.NewInt64Coin("denom", 200))) + fundAccounts(t, ctx, accKeeper, BankKeeper, spec.srcActor, sdk.NewCoins(sdk.NewInt64Coin("denom", 200))) } contractID, err := keeper.Create(ctx, spec.srcActor, hackatomWasm, nil) require.NoError(t, err) @@ -468,7 +468,7 @@ func TestInstantiateWithDeposit(t *testing.T) { return } require.NoError(t, err) - balances := bankKeeper.GetAllBalances(ctx, addr) + balances := BankKeeper.GetAllBalances(ctx, addr) assert.Equal(t, deposit, balances) }) } @@ -519,8 +519,8 @@ func TestInstantiateWithPermissions(t *testing.T) { for msg, spec := range specs { t.Run(msg, func(t *testing.T) { ctx, keepers := CreateTestInput(t, false, SupportedFeatures) - accKeeper, bankKeeper, keeper := keepers.AccountKeeper, keepers.BankKeeper, keepers.ContractKeeper - fundAccounts(t, ctx, accKeeper, bankKeeper, spec.srcActor, deposit) + accKeeper, BankKeeper, keeper := keepers.AccountKeeper, keepers.BankKeeper, keepers.ContractKeeper + fundAccounts(t, ctx, accKeeper, BankKeeper, spec.srcActor, deposit) contractID, err := keeper.Create(ctx, myAddr, hackatomWasm, &spec.srcPermission) require.NoError(t, err) @@ -566,7 +566,7 @@ func TestInstantiateWithContractDataResponse(t *testing.T) { func TestExecute(t *testing.T) { ctx, keepers := CreateTestInput(t, false, SupportedFeatures) - accKeeper, keeper, bankKeeper := keepers.AccountKeeper, keepers.ContractKeeper, keepers.BankKeeper + accKeeper, keeper, BankKeeper := keepers.AccountKeeper, keepers.ContractKeeper, keepers.BankKeeper deposit := sdk.NewCoins(sdk.NewInt64Coin("denom", 100000)) topUp := sdk.NewCoins(sdk.NewInt64Coin("denom", 5000)) @@ -596,12 +596,12 @@ func TestExecute(t *testing.T) { creatorAcct := accKeeper.GetAccount(ctx, creator) require.NotNil(t, creatorAcct) // we started at 2*deposit, should have spent one above - assert.Equal(t, deposit, bankKeeper.GetAllBalances(ctx, creatorAcct.GetAddress())) + assert.Equal(t, deposit, BankKeeper.GetAllBalances(ctx, creatorAcct.GetAddress())) // ensure contract has updated balance contractAcct := accKeeper.GetAccount(ctx, addr) require.NotNil(t, contractAcct) - assert.Equal(t, deposit, bankKeeper.GetAllBalances(ctx, contractAcct.GetAddress())) + assert.Equal(t, deposit, BankKeeper.GetAllBalances(ctx, contractAcct.GetAddress())) // unauthorized - trialCtx so we don't change state trialCtx := ctx.WithMultiStore(ctx.MultiStore().CacheWrap().(sdk.MultiStore)) @@ -628,13 +628,13 @@ func TestExecute(t *testing.T) { // ensure bob now exists and got both payments released bobAcct = accKeeper.GetAccount(ctx, bob) require.NotNil(t, bobAcct) - balance := bankKeeper.GetAllBalances(ctx, bobAcct.GetAddress()) + balance := BankKeeper.GetAllBalances(ctx, bobAcct.GetAddress()) assert.Equal(t, deposit.Add(topUp...), balance) // ensure contract has updated balance contractAcct = accKeeper.GetAccount(ctx, addr) require.NotNil(t, contractAcct) - assert.Equal(t, sdk.Coins{}, bankKeeper.GetAllBalances(ctx, contractAcct.GetAddress())) + assert.Equal(t, sdk.Coins{}, BankKeeper.GetAllBalances(ctx, contractAcct.GetAddress())) // and events emitted require.Len(t, em.Events(), 9) @@ -703,12 +703,12 @@ func TestExecuteWithDeposit(t *testing.T) { for msg, spec := range specs { t.Run(msg, func(t *testing.T) { ctx, keepers := CreateTestInput(t, false, SupportedFeatures) - accKeeper, bankKeeper, keeper := keepers.AccountKeeper, keepers.BankKeeper, keepers.ContractKeeper + accKeeper, BankKeeper, keeper := keepers.AccountKeeper, keepers.BankKeeper, keepers.ContractKeeper if spec.newBankParams != nil { - bankKeeper.SetParams(ctx, *spec.newBankParams) + BankKeeper.SetParams(ctx, *spec.newBankParams) } if spec.fundAddr { - fundAccounts(t, ctx, accKeeper, bankKeeper, spec.srcActor, sdk.NewCoins(sdk.NewInt64Coin("denom", 200))) + fundAccounts(t, ctx, accKeeper, BankKeeper, spec.srcActor, sdk.NewCoins(sdk.NewInt64Coin("denom", 200))) } codeID, err := keeper.Create(ctx, spec.srcActor, hackatomWasm, nil) require.NoError(t, err) @@ -729,7 +729,7 @@ func TestExecuteWithDeposit(t *testing.T) { return } require.NoError(t, err) - balances := bankKeeper.GetAllBalances(ctx, spec.beneficiary) + balances := BankKeeper.GetAllBalances(ctx, spec.beneficiary) assert.Equal(t, deposit, balances) }) } @@ -1248,7 +1248,7 @@ type stealFundsMsg struct { func TestSudo(t *testing.T) { ctx, keepers := CreateTestInput(t, false, SupportedFeatures) - accKeeper, keeper, bankKeeper := keepers.AccountKeeper, keepers.ContractKeeper, keepers.BankKeeper + accKeeper, keeper, BankKeeper := keepers.AccountKeeper, keepers.ContractKeeper, keepers.BankKeeper deposit := sdk.NewCoins(sdk.NewInt64Coin("denom", 100000)) creator := keepers.Faucet.NewFundedAccount(ctx, deposit.Add(deposit...)...) @@ -1295,7 +1295,7 @@ func TestSudo(t *testing.T) { // ensure community now exists and got paid comAcct = accKeeper.GetAccount(ctx, community) require.NotNil(t, comAcct) - balance := bankKeeper.GetBalance(ctx, comAcct.GetAddress(), "denom") + balance := BankKeeper.GetBalance(ctx, comAcct.GetAddress(), "denom") assert.Equal(t, sdk.NewInt64Coin("denom", 76543), balance) // and events emitted require.Len(t, em.Events(), 4, prettyEvents(t, em.Events())) diff --git a/x/wasm/keeper/proposal_integration_test.go b/x/wasm/keeper/proposal_integration_test.go index 3d5097b501..3b2d1807b0 100644 --- a/x/wasm/keeper/proposal_integration_test.go +++ b/x/wasm/keeper/proposal_integration_test.go @@ -25,7 +25,7 @@ import ( func TestStoreCodeProposal(t *testing.T) { ctx, keepers := CreateTestInput(t, false, "staking") - govKeeper, wasmKeeper := keepers.GovKeeper, keepers.WasmKeeper + GovKeeper, wasmKeeper := keepers.GovKeeper, keepers.WasmKeeper wasmKeeper.SetParams(ctx, types.Params{ CodeUploadAccess: types.AllowNobody, InstantiateDefaultPermission: types.AccessTypeNobody, @@ -41,11 +41,11 @@ func TestStoreCodeProposal(t *testing.T) { }) // when stored - storedProposal, err := govKeeper.SubmitProposal(ctx, src) + storedProposal, err := GovKeeper.SubmitProposal(ctx, src) require.NoError(t, err) // and proposal execute - handler := govKeeper.Router().GetRoute(storedProposal.ProposalRoute()) + handler := GovKeeper.Router().GetRoute(storedProposal.ProposalRoute()) err = handler(ctx, storedProposal.GetContent()) require.NoError(t, err) @@ -62,7 +62,7 @@ func TestStoreCodeProposal(t *testing.T) { func TestInstantiateProposal(t *testing.T) { ctx, keepers := CreateTestInput(t, false, "staking") - govKeeper, wasmKeeper := keepers.GovKeeper, keepers.WasmKeeper + GovKeeper, wasmKeeper := keepers.GovKeeper, keepers.WasmKeeper wasmKeeper.SetParams(ctx, types.Params{ CodeUploadAccess: types.AllowNobody, InstantiateDefaultPermission: types.AccessTypeNobody, @@ -89,11 +89,11 @@ func TestInstantiateProposal(t *testing.T) { em := sdk.NewEventManager() // when stored - storedProposal, err := govKeeper.SubmitProposal(ctx, src) + storedProposal, err := GovKeeper.SubmitProposal(ctx, src) require.NoError(t, err) // and proposal execute - handler := govKeeper.Router().GetRoute(storedProposal.ProposalRoute()) + handler := GovKeeper.Router().GetRoute(storedProposal.ProposalRoute()) err = handler(ctx.WithEventManager(em), storedProposal.GetContent()) require.NoError(t, err) @@ -125,7 +125,7 @@ func TestInstantiateProposal(t *testing.T) { func TestInstantiateProposal_NoAdmin(t *testing.T) { ctx, keepers := CreateTestInput(t, false, "staking") - govKeeper, wasmKeeper := keepers.GovKeeper, keepers.WasmKeeper + GovKeeper, wasmKeeper := keepers.GovKeeper, keepers.WasmKeeper wasmKeeper.SetParams(ctx, types.Params{ CodeUploadAccess: types.AllowNobody, InstantiateDefaultPermission: types.AccessTypeNobody, @@ -148,7 +148,7 @@ func TestInstantiateProposal_NoAdmin(t *testing.T) { p.Admin = "invalid" p.Label = "testing" }) - _, err = govKeeper.SubmitProposal(ctx, src) + _, err = GovKeeper.SubmitProposal(ctx, src) require.Error(t, err) // test with no admin @@ -161,11 +161,11 @@ func TestInstantiateProposal_NoAdmin(t *testing.T) { em := sdk.NewEventManager() // when stored - storedProposal, err := govKeeper.SubmitProposal(ctx, src) + storedProposal, err := GovKeeper.SubmitProposal(ctx, src) require.NoError(t, err) // and proposal execute - handler := govKeeper.Router().GetRoute(storedProposal.ProposalRoute()) + handler := GovKeeper.Router().GetRoute(storedProposal.ProposalRoute()) err = handler(ctx.WithEventManager(em), storedProposal.GetContent()) require.NoError(t, err) @@ -197,7 +197,7 @@ func TestInstantiateProposal_NoAdmin(t *testing.T) { func TestMigrateProposal(t *testing.T) { ctx, keepers := CreateTestInput(t, false, "staking") - govKeeper, wasmKeeper := keepers.GovKeeper, keepers.WasmKeeper + GovKeeper, wasmKeeper := keepers.GovKeeper, keepers.WasmKeeper wasmKeeper.SetParams(ctx, types.Params{ CodeUploadAccess: types.AllowNobody, InstantiateDefaultPermission: types.AccessTypeNobody, @@ -242,11 +242,11 @@ func TestMigrateProposal(t *testing.T) { em := sdk.NewEventManager() // when stored - storedProposal, err := govKeeper.SubmitProposal(ctx, &src) + storedProposal, err := GovKeeper.SubmitProposal(ctx, &src) require.NoError(t, err) // and proposal execute - handler := govKeeper.Router().GetRoute(storedProposal.ProposalRoute()) + handler := GovKeeper.Router().GetRoute(storedProposal.ProposalRoute()) err = handler(ctx.WithEventManager(em), storedProposal.GetContent()) require.NoError(t, err) @@ -278,13 +278,13 @@ func TestMigrateProposal(t *testing.T) { func TestExecuteProposal(t *testing.T) { ctx, keepers := CreateTestInput(t, false, "staking") - govKeeper, bankKeeper := keepers.GovKeeper, keepers.BankKeeper + GovKeeper, BankKeeper := keepers.GovKeeper, keepers.BankKeeper exampleContract := InstantiateHackatomExampleContract(t, ctx, keepers) contractAddr := exampleContract.Contract // check balance - bal := bankKeeper.GetBalance(ctx, contractAddr, "denom") + bal := BankKeeper.GetBalance(ctx, contractAddr, "denom") require.Equal(t, bal.Amount, sdk.NewInt(100)) releaseMsg := struct { @@ -305,10 +305,10 @@ func TestExecuteProposal(t *testing.T) { em := sdk.NewEventManager() // fails on store - this doesn't have permission - storedProposal, err := govKeeper.SubmitProposal(ctx, &badSrc) + storedProposal, err := GovKeeper.SubmitProposal(ctx, &badSrc) require.Error(t, err) // balance should not change - bal = bankKeeper.GetBalance(ctx, contractAddr, "denom") + bal = BankKeeper.GetBalance(ctx, contractAddr, "denom") require.Equal(t, bal.Amount, sdk.NewInt(100)) // try again with the proper run-as @@ -323,31 +323,31 @@ func TestExecuteProposal(t *testing.T) { em = sdk.NewEventManager() // when stored - storedProposal, err = govKeeper.SubmitProposal(ctx, &src) + storedProposal, err = GovKeeper.SubmitProposal(ctx, &src) require.NoError(t, err) // and proposal execute - handler := govKeeper.Router().GetRoute(storedProposal.ProposalRoute()) + handler := GovKeeper.Router().GetRoute(storedProposal.ProposalRoute()) err = handler(ctx.WithEventManager(em), storedProposal.GetContent()) require.NoError(t, err) // balance should be empty (proper release) - bal = bankKeeper.GetBalance(ctx, contractAddr, "denom") + bal = BankKeeper.GetBalance(ctx, contractAddr, "denom") require.Equal(t, bal.Amount, sdk.NewInt(0)) } func TestSudoProposal(t *testing.T) { ctx, keepers := CreateTestInput(t, false, "staking") - govKeeper, bankKeeper := keepers.GovKeeper, keepers.BankKeeper + GovKeeper, BankKeeper := keepers.GovKeeper, keepers.BankKeeper exampleContract := InstantiateHackatomExampleContract(t, ctx, keepers) contractAddr := exampleContract.Contract _, _, anyAddr := keyPubAddr() // check balance - bal := bankKeeper.GetBalance(ctx, contractAddr, "denom") + bal := BankKeeper.GetBalance(ctx, contractAddr, "denom") require.Equal(t, bal.Amount, sdk.NewInt(100)) - bal = bankKeeper.GetBalance(ctx, anyAddr, "denom") + bal = BankKeeper.GetBalance(ctx, anyAddr, "denom") require.Equal(t, bal.Amount, sdk.NewInt(0)) type StealMsg struct { @@ -374,18 +374,18 @@ func TestSudoProposal(t *testing.T) { em := sdk.NewEventManager() // when stored - storedProposal, err := govKeeper.SubmitProposal(ctx, &src) + storedProposal, err := GovKeeper.SubmitProposal(ctx, &src) require.NoError(t, err) // and proposal execute - handler := govKeeper.Router().GetRoute(storedProposal.ProposalRoute()) + handler := GovKeeper.Router().GetRoute(storedProposal.ProposalRoute()) err = handler(ctx.WithEventManager(em), storedProposal.GetContent()) require.NoError(t, err) // balance should be empty (and verifier richer) - bal = bankKeeper.GetBalance(ctx, contractAddr, "denom") + bal = BankKeeper.GetBalance(ctx, contractAddr, "denom") require.Equal(t, bal.Amount, sdk.NewInt(25)) - bal = bankKeeper.GetBalance(ctx, anyAddr, "denom") + bal = BankKeeper.GetBalance(ctx, anyAddr, "denom") require.Equal(t, bal.Amount, sdk.NewInt(75)) } @@ -448,7 +448,7 @@ func TestAdminProposals(t *testing.T) { for msg, spec := range specs { t.Run(msg, func(t *testing.T) { ctx, keepers := CreateTestInput(t, false, "staking") - govKeeper, wasmKeeper := keepers.GovKeeper, keepers.WasmKeeper + GovKeeper, wasmKeeper := keepers.GovKeeper, keepers.WasmKeeper wasmKeeper.SetParams(ctx, types.Params{ CodeUploadAccess: types.AllowNobody, InstantiateDefaultPermission: types.AccessTypeNobody, @@ -459,11 +459,11 @@ func TestAdminProposals(t *testing.T) { require.NoError(t, wasmKeeper.importContract(ctx, contractAddr, &spec.state, []types.Model{})) // when stored - storedProposal, err := govKeeper.SubmitProposal(ctx, spec.srcProposal) + storedProposal, err := GovKeeper.SubmitProposal(ctx, spec.srcProposal) require.NoError(t, err) // and execute proposal - handler := govKeeper.Router().GetRoute(storedProposal.ProposalRoute()) + handler := GovKeeper.Router().GetRoute(storedProposal.ProposalRoute()) err = handler(ctx, storedProposal.GetContent()) require.NoError(t, err) @@ -477,7 +477,7 @@ func TestAdminProposals(t *testing.T) { func TestUpdateParamsProposal(t *testing.T) { ctx, keepers := CreateTestInput(t, false, "staking") - govKeeper, wasmKeeper := keepers.GovKeeper, keepers.WasmKeeper + GovKeeper, wasmKeeper := keepers.GovKeeper, keepers.WasmKeeper var ( legacyAmino = keepers.EncodingConfig.Amino @@ -556,11 +556,11 @@ func TestUpdateParamsProposal(t *testing.T) { Changes: jsonProposal.Changes.ToParamChanges(), } // when stored - storedProposal, err := govKeeper.SubmitProposal(ctx, &proposal) + storedProposal, err := GovKeeper.SubmitProposal(ctx, &proposal) require.NoError(t, err) // and proposal execute - handler := govKeeper.Router().GetRoute(storedProposal.ProposalRoute()) + handler := GovKeeper.Router().GetRoute(storedProposal.ProposalRoute()) err = handler(ctx, storedProposal.GetContent()) require.NoError(t, err) @@ -574,7 +574,7 @@ func TestUpdateParamsProposal(t *testing.T) { func TestPinCodesProposal(t *testing.T) { ctx, keepers := CreateTestInput(t, false, "staking") - govKeeper, wasmKeeper := keepers.GovKeeper, keepers.WasmKeeper + GovKeeper, wasmKeeper := keepers.GovKeeper, keepers.WasmKeeper mock := wasmtesting.MockWasmer{ CreateFn: wasmtesting.NoOpCreateFn, @@ -639,7 +639,7 @@ func TestPinCodesProposal(t *testing.T) { } // when stored - storedProposal, gotErr := govKeeper.SubmitProposal(ctx, &proposal) + storedProposal, gotErr := GovKeeper.SubmitProposal(ctx, &proposal) if spec.expErr { require.Error(t, gotErr) return @@ -647,7 +647,7 @@ func TestPinCodesProposal(t *testing.T) { require.NoError(t, gotErr) // and proposal execute - handler := govKeeper.Router().GetRoute(storedProposal.ProposalRoute()) + handler := GovKeeper.Router().GetRoute(storedProposal.ProposalRoute()) gotErr = handler(ctx, storedProposal.GetContent()) require.NoError(t, gotErr) @@ -662,7 +662,7 @@ func TestPinCodesProposal(t *testing.T) { func TestUnpinCodesProposal(t *testing.T) { ctx, keepers := CreateTestInput(t, false, "staking") - govKeeper, wasmKeeper := keepers.GovKeeper, keepers.WasmKeeper + GovKeeper, wasmKeeper := keepers.GovKeeper, keepers.WasmKeeper mock := wasmtesting.MockWasmer{ CreateFn: wasmtesting.NoOpCreateFn, @@ -727,7 +727,7 @@ func TestUnpinCodesProposal(t *testing.T) { } // when stored - storedProposal, gotErr := govKeeper.SubmitProposal(ctx, &proposal) + storedProposal, gotErr := GovKeeper.SubmitProposal(ctx, &proposal) if spec.expErr { require.Error(t, gotErr) return @@ -735,7 +735,7 @@ func TestUnpinCodesProposal(t *testing.T) { require.NoError(t, gotErr) // and proposal execute - handler := govKeeper.Router().GetRoute(storedProposal.ProposalRoute()) + handler := GovKeeper.Router().GetRoute(storedProposal.ProposalRoute()) gotErr = handler(ctx, storedProposal.GetContent()) require.NoError(t, gotErr) @@ -750,7 +750,7 @@ func TestUnpinCodesProposal(t *testing.T) { func TestUpdateInstantiateConfigProposal(t *testing.T) { ctx, keepers := CreateTestInput(t, false, "staking") - govKeeper, wasmKeeper := keepers.GovKeeper, keepers.WasmKeeper + GovKeeper, wasmKeeper := keepers.GovKeeper, keepers.WasmKeeper mock := wasmtesting.MockWasmer{ CreateFn: wasmtesting.NoOpCreateFn, @@ -821,7 +821,7 @@ func TestUpdateInstantiateConfigProposal(t *testing.T) { } // when stored - storedProposal, gotErr := govKeeper.SubmitProposal(ctx, &proposal) + storedProposal, gotErr := GovKeeper.SubmitProposal(ctx, &proposal) if spec.expErr { require.Error(t, gotErr) return @@ -829,7 +829,7 @@ func TestUpdateInstantiateConfigProposal(t *testing.T) { require.NoError(t, gotErr) // and proposal execute - handler := govKeeper.Router().GetRoute(storedProposal.ProposalRoute()) + handler := GovKeeper.Router().GetRoute(storedProposal.ProposalRoute()) gotErr = handler(ctx, storedProposal.GetContent()) require.NoError(t, gotErr) diff --git a/x/wasm/keeper/query_plugins.go b/x/wasm/keeper/query_plugins.go index b0e095b12c..6301412767 100644 --- a/x/wasm/keeper/query_plugins.go +++ b/x/wasm/keeper/query_plugins.go @@ -162,14 +162,14 @@ func (e QueryPlugins) HandleQuery(ctx sdk.Context, caller sdk.AccAddress, reques return nil, wasmvmtypes.Unknown{} } -func BankQuerier(bankKeeper types.BankViewKeeper) func(ctx sdk.Context, request *wasmvmtypes.BankQuery) ([]byte, error) { +func BankQuerier(BankKeeper types.BankViewKeeper) func(ctx sdk.Context, request *wasmvmtypes.BankQuery) ([]byte, error) { return func(ctx sdk.Context, request *wasmvmtypes.BankQuery) ([]byte, error) { if request.AllBalances != nil { addr, err := sdk.AccAddressFromBech32(request.AllBalances.Address) if err != nil { return nil, sdkerrors.Wrap(sdkerrors.ErrInvalidAddress, request.AllBalances.Address) } - coins := bankKeeper.GetAllBalances(ctx, addr) + coins := BankKeeper.GetAllBalances(ctx, addr) res := wasmvmtypes.AllBalancesResponse{ Amount: ConvertSdkCoinsToWasmCoins(coins), } @@ -180,7 +180,7 @@ func BankQuerier(bankKeeper types.BankViewKeeper) func(ctx sdk.Context, request if err != nil { return nil, sdkerrors.Wrap(sdkerrors.ErrInvalidAddress, request.Balance.Address) } - coin := bankKeeper.GetBalance(ctx, addr, request.Balance.Denom) + coin := BankKeeper.GetBalance(ctx, addr, request.Balance.Denom) res := wasmvmtypes.BalanceResponse{ Amount: wasmvmtypes.Coin{ Denom: coin.Denom, diff --git a/x/wasm/keeper/query_plugins_test.go b/x/wasm/keeper/query_plugins_test.go index c58932d67e..c62e03c5db 100644 --- a/x/wasm/keeper/query_plugins_test.go +++ b/x/wasm/keeper/query_plugins_test.go @@ -319,7 +319,7 @@ func TestIBCQuerier(t *testing.T) { } func TestBankQuerierBalance(t *testing.T) { - mock := bankKeeperMock{GetBalanceFn: func(ctx sdk.Context, addr sdk.AccAddress, denom string) sdk.Coin { + mock := BankKeeperMock{GetBalanceFn: func(ctx sdk.Context, addr sdk.AccAddress, denom string) sdk.Coin { return sdk.NewCoin(denom, sdk.NewInt(1)) }} @@ -510,19 +510,19 @@ func (m mockWasmQueryKeeper) IsPinnedCode(ctx sdk.Context, codeID uint64) bool { return m.IsPinnedCodeFn(ctx, codeID) } -type bankKeeperMock struct { +type BankKeeperMock struct { GetBalanceFn func(ctx sdk.Context, addr sdk.AccAddress, denom string) sdk.Coin GetAllBalancesFn func(ctx sdk.Context, addr sdk.AccAddress) sdk.Coins } -func (m bankKeeperMock) GetBalance(ctx sdk.Context, addr sdk.AccAddress, denom string) sdk.Coin { +func (m BankKeeperMock) GetBalance(ctx sdk.Context, addr sdk.AccAddress, denom string) sdk.Coin { if m.GetBalanceFn == nil { panic("not expected to be called") } return m.GetBalanceFn(ctx, addr, denom) } -func (m bankKeeperMock) GetAllBalances(ctx sdk.Context, addr sdk.AccAddress) sdk.Coins { +func (m BankKeeperMock) GetAllBalances(ctx sdk.Context, addr sdk.AccAddress) sdk.Coins { if m.GetAllBalancesFn == nil { panic("not expected to be called") } diff --git a/x/wasm/keeper/reflect_test.go b/x/wasm/keeper/reflect_test.go index 2f89a265c4..ed3d6eb7fe 100644 --- a/x/wasm/keeper/reflect_test.go +++ b/x/wasm/keeper/reflect_test.go @@ -40,7 +40,7 @@ const ReflectFeatures = "staking,mask,stargate" func TestReflectContractSend(t *testing.T) { cdc := MakeEncodingConfig(t).Marshaler ctx, keepers := CreateTestInput(t, false, ReflectFeatures, WithMessageEncoders(reflectEncoders(cdc))) - accKeeper, keeper, bankKeeper := keepers.AccountKeeper, keepers.ContractKeeper, keepers.BankKeeper + accKeeper, keeper, BankKeeper := keepers.AccountKeeper, keepers.ContractKeeper, keepers.BankKeeper deposit := sdk.NewCoins(sdk.NewInt64Coin("denom", 100000)) creator := keepers.Faucet.NewFundedAccount(ctx, deposit...) @@ -77,10 +77,10 @@ func TestReflectContractSend(t *testing.T) { require.NotEmpty(t, escrowAddr) // let's make sure all balances make sense - checkAccount(t, ctx, accKeeper, bankKeeper, creator, sdk.NewCoins(sdk.NewInt64Coin("denom", 35000))) // 100k - 40k - 25k - checkAccount(t, ctx, accKeeper, bankKeeper, reflectAddr, reflectStart) - checkAccount(t, ctx, accKeeper, bankKeeper, escrowAddr, escrowStart) - checkAccount(t, ctx, accKeeper, bankKeeper, bob, nil) + checkAccount(t, ctx, accKeeper, BankKeeper, creator, sdk.NewCoins(sdk.NewInt64Coin("denom", 35000))) // 100k - 40k - 25k + checkAccount(t, ctx, accKeeper, BankKeeper, reflectAddr, reflectStart) + checkAccount(t, ctx, accKeeper, BankKeeper, escrowAddr, escrowStart) + checkAccount(t, ctx, accKeeper, BankKeeper, bob, nil) // now for the trick.... we reflect a message through the reflect to call the escrow // we also send an additional 14k tokens there. @@ -110,16 +110,16 @@ func TestReflectContractSend(t *testing.T) { require.NoError(t, err) // did this work??? - checkAccount(t, ctx, accKeeper, bankKeeper, creator, sdk.NewCoins(sdk.NewInt64Coin("denom", 35000))) // same as before - checkAccount(t, ctx, accKeeper, bankKeeper, reflectAddr, sdk.NewCoins(sdk.NewInt64Coin("denom", 26000))) // 40k - 14k (from send) - checkAccount(t, ctx, accKeeper, bankKeeper, escrowAddr, sdk.Coins{}) // emptied reserved - checkAccount(t, ctx, accKeeper, bankKeeper, bob, sdk.NewCoins(sdk.NewInt64Coin("denom", 39000))) // all escrow of 25k + 14k + checkAccount(t, ctx, accKeeper, BankKeeper, creator, sdk.NewCoins(sdk.NewInt64Coin("denom", 35000))) // same as before + checkAccount(t, ctx, accKeeper, BankKeeper, reflectAddr, sdk.NewCoins(sdk.NewInt64Coin("denom", 26000))) // 40k - 14k (from send) + checkAccount(t, ctx, accKeeper, BankKeeper, escrowAddr, sdk.Coins{}) // emptied reserved + checkAccount(t, ctx, accKeeper, BankKeeper, bob, sdk.NewCoins(sdk.NewInt64Coin("denom", 39000))) // all escrow of 25k + 14k } func TestReflectCustomMsg(t *testing.T) { cdc := MakeEncodingConfig(t).Marshaler ctx, keepers := CreateTestInput(t, false, ReflectFeatures, WithMessageEncoders(reflectEncoders(cdc)), WithQueryPlugins(reflectPlugins())) - accKeeper, keeper, bankKeeper := keepers.AccountKeeper, keepers.ContractKeeper, keepers.BankKeeper + accKeeper, keeper, BankKeeper := keepers.AccountKeeper, keepers.ContractKeeper, keepers.BankKeeper deposit := sdk.NewCoins(sdk.NewInt64Coin("denom", 100000)) creator := keepers.Faucet.NewFundedAccount(ctx, deposit...) @@ -149,9 +149,9 @@ func TestReflectCustomMsg(t *testing.T) { require.NoError(t, err) // check some account values - checkAccount(t, ctx, accKeeper, bankKeeper, contractAddr, contractStart) - checkAccount(t, ctx, accKeeper, bankKeeper, bob, deposit) - checkAccount(t, ctx, accKeeper, bankKeeper, fred, nil) + checkAccount(t, ctx, accKeeper, BankKeeper, contractAddr, contractStart) + checkAccount(t, ctx, accKeeper, BankKeeper, bob, deposit) + checkAccount(t, ctx, accKeeper, BankKeeper, fred, nil) // bob can send contract's tokens to fred (using SendMsg) msgs := []wasmvmtypes.CosmosMsg{{ @@ -176,10 +176,10 @@ func TestReflectCustomMsg(t *testing.T) { require.NoError(t, err) // fred got coins - checkAccount(t, ctx, accKeeper, bankKeeper, fred, sdk.NewCoins(sdk.NewInt64Coin("denom", 15000))) + checkAccount(t, ctx, accKeeper, BankKeeper, fred, sdk.NewCoins(sdk.NewInt64Coin("denom", 15000))) // contract lost them - checkAccount(t, ctx, accKeeper, bankKeeper, contractAddr, sdk.NewCoins(sdk.NewInt64Coin("denom", 25000))) - checkAccount(t, ctx, accKeeper, bankKeeper, bob, deposit) + checkAccount(t, ctx, accKeeper, BankKeeper, contractAddr, sdk.NewCoins(sdk.NewInt64Coin("denom", 25000))) + checkAccount(t, ctx, accKeeper, BankKeeper, bob, deposit) // construct an opaque message var sdkSendMsg sdk.Msg = &banktypes.MsgSend{ @@ -201,10 +201,10 @@ func TestReflectCustomMsg(t *testing.T) { require.NoError(t, err) // fred got more coins - checkAccount(t, ctx, accKeeper, bankKeeper, fred, sdk.NewCoins(sdk.NewInt64Coin("denom", 38000))) + checkAccount(t, ctx, accKeeper, BankKeeper, fred, sdk.NewCoins(sdk.NewInt64Coin("denom", 38000))) // contract lost them - checkAccount(t, ctx, accKeeper, bankKeeper, contractAddr, sdk.NewCoins(sdk.NewInt64Coin("denom", 2000))) - checkAccount(t, ctx, accKeeper, bankKeeper, bob, deposit) + checkAccount(t, ctx, accKeeper, BankKeeper, contractAddr, sdk.NewCoins(sdk.NewInt64Coin("denom", 2000))) + checkAccount(t, ctx, accKeeper, BankKeeper, bob, deposit) } func TestMaskReflectCustomQuery(t *testing.T) { @@ -491,7 +491,7 @@ func TestWasmRawQueryWithNil(t *testing.T) { require.Equal(t, []byte{}, reflectRawRes.Data) } -func checkAccount(t *testing.T, ctx sdk.Context, accKeeper authkeeper.AccountKeeper, bankKeeper bankkeeper.Keeper, addr sdk.AccAddress, expected sdk.Coins) { +func checkAccount(t *testing.T, ctx sdk.Context, accKeeper authkeeper.AccountKeeper, BankKeeper bankkeeper.Keeper, addr sdk.AccAddress, expected sdk.Coins) { acct := accKeeper.GetAccount(ctx, addr) if expected == nil { assert.Nil(t, acct) @@ -499,9 +499,9 @@ func checkAccount(t *testing.T, ctx sdk.Context, accKeeper authkeeper.AccountKee assert.NotNil(t, acct) if expected.Empty() { // there is confusion between nil and empty slice... let's just treat them the same - assert.True(t, bankKeeper.GetAllBalances(ctx, acct.GetAddress()).Empty()) + assert.True(t, BankKeeper.GetAllBalances(ctx, acct.GetAddress()).Empty()) } else { - assert.Equal(t, bankKeeper.GetAllBalances(ctx, acct.GetAddress()), expected) + assert.Equal(t, BankKeeper.GetAllBalances(ctx, acct.GetAddress()), expected) } } } diff --git a/x/wasm/keeper/staking_test.go b/x/wasm/keeper/staking_test.go index b6d719f135..ac883fdd30 100644 --- a/x/wasm/keeper/staking_test.go +++ b/x/wasm/keeper/staking_test.go @@ -94,11 +94,11 @@ type InvestmentResponse struct { func TestInitializeStaking(t *testing.T) { ctx, k := CreateTestInput(t, false, SupportedFeatures) - accKeeper, stakingKeeper, keeper, bankKeeper := k.AccountKeeper, k.StakingKeeper, k.ContractKeeper, k.BankKeeper + accKeeper, StakingKeeper, keeper, BankKeeper := k.AccountKeeper, k.StakingKeeper, k.ContractKeeper, k.BankKeeper - valAddr := addValidator(t, ctx, stakingKeeper, k.Faucet, sdk.NewInt64Coin("stake", 1234567)) - ctx = nextBlock(ctx, stakingKeeper) - v, found := stakingKeeper.GetValidator(ctx, valAddr) + valAddr := addValidator(t, ctx, StakingKeeper, k.Faucet, sdk.NewInt64Coin("stake", 1234567)) + ctx = nextBlock(ctx, StakingKeeper) + v, found := StakingKeeper.GetValidator(ctx, valAddr) assert.True(t, found) assert.Equal(t, v.GetDelegatorShares(), sdk.NewDec(1234567)) @@ -129,7 +129,7 @@ func TestInitializeStaking(t *testing.T) { require.NotEmpty(t, stakingAddr) // nothing spent here - checkAccount(t, ctx, accKeeper, bankKeeper, creator, deposit) + checkAccount(t, ctx, accKeeper, BankKeeper, creator, deposit) // try to register with a validator not on the list and it fails _, _, bob := keyPubAddr() @@ -148,7 +148,7 @@ func TestInitializeStaking(t *testing.T) { require.Error(t, err) // no changes to bonding shares - val, _ := stakingKeeper.GetValidator(ctx, valAddr) + val, _ := StakingKeeper.GetValidator(ctx, valAddr) assert.Equal(t, val.GetDelegatorShares(), sdk.NewDec(1234567)) } @@ -159,20 +159,20 @@ type initInfo struct { ctx sdk.Context accKeeper authkeeper.AccountKeeper - stakingKeeper stakingkeeper.Keeper + StakingKeeper stakingkeeper.Keeper distKeeper distributionkeeper.Keeper wasmKeeper Keeper contractKeeper wasmtypes.ContractOpsKeeper - bankKeeper bankkeeper.Keeper + BankKeeper bankkeeper.Keeper faucet *TestFaucet } func initializeStaking(t *testing.T) initInfo { ctx, k := CreateTestInput(t, false, SupportedFeatures) - accKeeper, stakingKeeper, keeper, bankKeeper := k.AccountKeeper, k.StakingKeeper, k.WasmKeeper, k.BankKeeper + accKeeper, StakingKeeper, keeper, BankKeeper := k.AccountKeeper, k.StakingKeeper, k.WasmKeeper, k.BankKeeper - valAddr := addValidator(t, ctx, stakingKeeper, k.Faucet, sdk.NewInt64Coin("stake", 1000000)) - ctx = nextBlock(ctx, stakingKeeper) + valAddr := addValidator(t, ctx, StakingKeeper, k.Faucet, sdk.NewInt64Coin("stake", 1000000)) + ctx = nextBlock(ctx, StakingKeeper) // set some baseline - this seems to be needed k.DistKeeper.SetValidatorHistoricalRewards(ctx, valAddr, 0, distributiontypes.ValidatorHistoricalRewards{ @@ -180,7 +180,7 @@ func initializeStaking(t *testing.T) initInfo { ReferenceCount: 1, }) - v, found := stakingKeeper.GetValidator(ctx, valAddr) + v, found := StakingKeeper.GetValidator(ctx, valAddr) assert.True(t, found) assert.Equal(t, v.GetDelegatorShares(), sdk.NewDec(1000000)) assert.Equal(t, v.Status, stakingtypes.Bonded) @@ -217,10 +217,10 @@ func initializeStaking(t *testing.T) initInfo { contractAddr: stakingAddr, ctx: ctx, accKeeper: accKeeper, - stakingKeeper: stakingKeeper, + StakingKeeper: StakingKeeper, wasmKeeper: *keeper, distKeeper: k.DistKeeper, - bankKeeper: bankKeeper, + BankKeeper: BankKeeper, contractKeeper: k.ContractKeeper, faucet: k.Faucet, } @@ -229,10 +229,10 @@ func initializeStaking(t *testing.T) initInfo { func TestBonding(t *testing.T) { initInfo := initializeStaking(t) ctx, valAddr, contractAddr := initInfo.ctx, initInfo.valAddr, initInfo.contractAddr - keeper, stakingKeeper, accKeeper, bankKeeper := initInfo.wasmKeeper, initInfo.stakingKeeper, initInfo.accKeeper, initInfo.bankKeeper + keeper, StakingKeeper, accKeeper, BankKeeper := initInfo.wasmKeeper, initInfo.StakingKeeper, initInfo.accKeeper, initInfo.BankKeeper // initial checks of bonding state - val, found := stakingKeeper.GetValidator(ctx, valAddr) + val, found := StakingKeeper.GetValidator(ctx, valAddr) require.True(t, found) initPower := val.GetDelegatorShares() @@ -255,16 +255,16 @@ func TestBonding(t *testing.T) { require.NoError(t, err) // check some account values - the money is on neither account (cuz it is bonded) - checkAccount(t, ctx, accKeeper, bankKeeper, contractAddr, sdk.Coins{}) - checkAccount(t, ctx, accKeeper, bankKeeper, bob, funds) + checkAccount(t, ctx, accKeeper, BankKeeper, contractAddr, sdk.Coins{}) + checkAccount(t, ctx, accKeeper, BankKeeper, bob, funds) // make sure the proper number of tokens have been bonded - val, _ = stakingKeeper.GetValidator(ctx, valAddr) + val, _ = StakingKeeper.GetValidator(ctx, valAddr) finalPower := val.GetDelegatorShares() assert.Equal(t, sdk.NewInt(80000), finalPower.Sub(initPower).TruncateInt()) // check the delegation itself - d, found := stakingKeeper.GetDelegation(ctx, contractAddr, valAddr) + d, found := StakingKeeper.GetDelegation(ctx, contractAddr, valAddr) require.True(t, found) assert.Equal(t, d.Shares, sdk.MustNewDecFromStr("80000")) @@ -277,10 +277,10 @@ func TestBonding(t *testing.T) { func TestUnbonding(t *testing.T) { initInfo := initializeStaking(t) ctx, valAddr, contractAddr := initInfo.ctx, initInfo.valAddr, initInfo.contractAddr - keeper, stakingKeeper, accKeeper, bankKeeper := initInfo.wasmKeeper, initInfo.stakingKeeper, initInfo.accKeeper, initInfo.bankKeeper + keeper, StakingKeeper, accKeeper, BankKeeper := initInfo.wasmKeeper, initInfo.StakingKeeper, initInfo.accKeeper, initInfo.BankKeeper // initial checks of bonding state - val, found := stakingKeeper.GetValidator(ctx, valAddr) + val, found := StakingKeeper.GetValidator(ctx, valAddr) require.True(t, found) initPower := val.GetDelegatorShares() @@ -298,7 +298,7 @@ func TestUnbonding(t *testing.T) { require.NoError(t, err) // update height a bit - ctx = nextBlock(ctx, stakingKeeper) + ctx = nextBlock(ctx, StakingKeeper) // now unbond 30k - note that 3k (10%) goes to the owner as a tax, 27k unbonded and available as claims unbond := StakingHandleMsg{ @@ -313,21 +313,21 @@ func TestUnbonding(t *testing.T) { // check some account values - the money is on neither account (cuz it is bonded) // Note: why is this immediate? just test setup? - checkAccount(t, ctx, accKeeper, bankKeeper, contractAddr, sdk.Coins{}) - checkAccount(t, ctx, accKeeper, bankKeeper, bob, funds) + checkAccount(t, ctx, accKeeper, BankKeeper, contractAddr, sdk.Coins{}) + checkAccount(t, ctx, accKeeper, BankKeeper, bob, funds) // make sure the proper number of tokens have been bonded (80k - 27k = 53k) - val, _ = stakingKeeper.GetValidator(ctx, valAddr) + val, _ = StakingKeeper.GetValidator(ctx, valAddr) finalPower := val.GetDelegatorShares() assert.Equal(t, sdk.NewInt(53000), finalPower.Sub(initPower).TruncateInt(), finalPower.String()) // check the delegation itself - d, found := stakingKeeper.GetDelegation(ctx, contractAddr, valAddr) + d, found := StakingKeeper.GetDelegation(ctx, contractAddr, valAddr) require.True(t, found) assert.Equal(t, d.Shares, sdk.MustNewDecFromStr("53000")) // check there is unbonding in progress - un, found := stakingKeeper.GetUnbondingDelegation(ctx, contractAddr, valAddr) + un, found := StakingKeeper.GetUnbondingDelegation(ctx, contractAddr, valAddr) require.True(t, found) require.Equal(t, 1, len(un.Entries)) assert.Equal(t, "27000", un.Entries[0].Balance.String()) @@ -342,11 +342,11 @@ func TestUnbonding(t *testing.T) { func TestReinvest(t *testing.T) { initInfo := initializeStaking(t) ctx, valAddr, contractAddr := initInfo.ctx, initInfo.valAddr, initInfo.contractAddr - keeper, stakingKeeper, accKeeper, bankKeeper := initInfo.wasmKeeper, initInfo.stakingKeeper, initInfo.accKeeper, initInfo.bankKeeper + keeper, StakingKeeper, accKeeper, BankKeeper := initInfo.wasmKeeper, initInfo.StakingKeeper, initInfo.accKeeper, initInfo.BankKeeper distKeeper := initInfo.distKeeper // initial checks of bonding state - val, found := stakingKeeper.GetValidator(ctx, valAddr) + val, found := StakingKeeper.GetValidator(ctx, valAddr) require.True(t, found) initPower := val.GetDelegatorShares() assert.Equal(t, val.Tokens, sdk.NewInt(1000000), "%s", val.Tokens) @@ -367,9 +367,9 @@ func TestReinvest(t *testing.T) { require.NoError(t, err) // update height a bit to solidify the delegation - ctx = nextBlock(ctx, stakingKeeper) + ctx = nextBlock(ctx, StakingKeeper) // we get 1/6, our share should be 40k minus 10% commission = 36k - setValidatorRewards(ctx, stakingKeeper, distKeeper, valAddr, "240000") + setValidatorRewards(ctx, StakingKeeper, distKeeper, valAddr, "240000") // this should withdraw our outstanding 36k of rewards and reinvest them in the same delegation reinvest := StakingHandleMsg{ @@ -382,22 +382,22 @@ func TestReinvest(t *testing.T) { // check some account values - the money is on neither account (cuz it is bonded) // Note: why is this immediate? just test setup? - checkAccount(t, ctx, accKeeper, bankKeeper, contractAddr, sdk.Coins{}) - checkAccount(t, ctx, accKeeper, bankKeeper, bob, funds) + checkAccount(t, ctx, accKeeper, BankKeeper, contractAddr, sdk.Coins{}) + checkAccount(t, ctx, accKeeper, BankKeeper, bob, funds) // check the delegation itself - d, found := stakingKeeper.GetDelegation(ctx, contractAddr, valAddr) + d, found := StakingKeeper.GetDelegation(ctx, contractAddr, valAddr) require.True(t, found) // we started with 200k and added 36k assert.Equal(t, d.Shares, sdk.MustNewDecFromStr("236000")) // make sure the proper number of tokens have been bonded (80k + 40k = 120k) - val, _ = stakingKeeper.GetValidator(ctx, valAddr) + val, _ = StakingKeeper.GetValidator(ctx, valAddr) finalPower := val.GetDelegatorShares() assert.Equal(t, sdk.NewInt(236000), finalPower.Sub(initPower).TruncateInt(), finalPower.String()) // check there is no unbonding in progress - un, found := stakingKeeper.GetUnbondingDelegation(ctx, contractAddr, valAddr) + un, found := StakingKeeper.GetUnbondingDelegation(ctx, contractAddr, valAddr) assert.False(t, found, "%#v", un) // check we have the desired balance @@ -411,11 +411,11 @@ func TestQueryStakingInfo(t *testing.T) { // STEP 1: take a lot of setup from TestReinvest so we have non-zero info initInfo := initializeStaking(t) ctx, valAddr, contractAddr := initInfo.ctx, initInfo.valAddr, initInfo.contractAddr - keeper, stakingKeeper := initInfo.wasmKeeper, initInfo.stakingKeeper + keeper, StakingKeeper := initInfo.wasmKeeper, initInfo.StakingKeeper distKeeper := initInfo.distKeeper // initial checks of bonding state - val, found := stakingKeeper.GetValidator(ctx, valAddr) + val, found := StakingKeeper.GetValidator(ctx, valAddr) require.True(t, found) assert.Equal(t, sdk.NewInt(1000000), val.Tokens) @@ -435,9 +435,9 @@ func TestQueryStakingInfo(t *testing.T) { require.NoError(t, err) // update height a bit to solidify the delegation - ctx = nextBlock(ctx, stakingKeeper) + ctx = nextBlock(ctx, StakingKeeper) // we get 1/6, our share should be 40k minus 10% commission = 36k - setValidatorRewards(ctx, stakingKeeper, distKeeper, valAddr, "240000") + setValidatorRewards(ctx, StakingKeeper, distKeeper, valAddr, "240000") // see what the current rewards are origReward := distKeeper.GetValidatorCurrentRewards(ctx, valAddr) @@ -588,11 +588,11 @@ func TestQueryStakingPlugin(t *testing.T) { // STEP 1: take a lot of setup from TestReinvest so we have non-zero info initInfo := initializeStaking(t) ctx, valAddr, contractAddr := initInfo.ctx, initInfo.valAddr, initInfo.contractAddr - stakingKeeper := initInfo.stakingKeeper + StakingKeeper := initInfo.StakingKeeper distKeeper := initInfo.distKeeper // initial checks of bonding state - val, found := stakingKeeper.GetValidator(ctx, valAddr) + val, found := StakingKeeper.GetValidator(ctx, valAddr) require.True(t, found) assert.Equal(t, sdk.NewInt(1000000), val.Tokens) @@ -612,9 +612,9 @@ func TestQueryStakingPlugin(t *testing.T) { require.NoError(t, err) // update height a bit to solidify the delegation - ctx = nextBlock(ctx, stakingKeeper) + ctx = nextBlock(ctx, StakingKeeper) // we get 1/6, our share should be 40k minus 10% commission = 36k - setValidatorRewards(ctx, stakingKeeper, distKeeper, valAddr, "240000") + setValidatorRewards(ctx, StakingKeeper, distKeeper, valAddr, "240000") // see what the current rewards are origReward := distKeeper.GetValidatorCurrentRewards(ctx, valAddr) @@ -626,7 +626,7 @@ func TestQueryStakingPlugin(t *testing.T) { Validator: valAddr.String(), }, } - raw, err := StakingQuerier(stakingKeeper, distKeeper)(ctx, &query) + raw, err := StakingQuerier(StakingKeeper, distKeeper)(ctx, &query) require.NoError(t, err) var res wasmvmtypes.DelegationResponse mustParse(t, raw, &res) @@ -651,7 +651,7 @@ func TestQueryStakingPlugin(t *testing.T) { } // adds a few validators and returns a list of validators that are registered -func addValidator(t *testing.T, ctx sdk.Context, stakingKeeper stakingkeeper.Keeper, faucet *TestFaucet, value sdk.Coin) sdk.ValAddress { +func addValidator(t *testing.T, ctx sdk.Context, StakingKeeper stakingkeeper.Keeper, faucet *TestFaucet, value sdk.Coin) sdk.ValAddress { owner := faucet.NewFundedAccount(ctx, value) privKey := secp256k1.GenPrivKey() @@ -676,7 +676,7 @@ func addValidator(t *testing.T, ctx sdk.Context, stakingKeeper stakingkeeper.Kee Value: value, } - h := staking.NewHandler(stakingKeeper) + h := staking.NewHandler(StakingKeeper) _, err = h(ctx, &msg) require.NoError(t, err) return addr @@ -684,16 +684,16 @@ func addValidator(t *testing.T, ctx sdk.Context, stakingKeeper stakingkeeper.Kee // this will commit the current set, update the block height and set historic info // basically, letting two blocks pass -func nextBlock(ctx sdk.Context, stakingKeeper stakingkeeper.Keeper) sdk.Context { - staking.EndBlocker(ctx, stakingKeeper) +func nextBlock(ctx sdk.Context, StakingKeeper stakingkeeper.Keeper) sdk.Context { + staking.EndBlocker(ctx, StakingKeeper) ctx = ctx.WithBlockHeight(ctx.BlockHeight() + 1) - staking.BeginBlocker(ctx, stakingKeeper) + staking.BeginBlocker(ctx, StakingKeeper) return ctx } -func setValidatorRewards(ctx sdk.Context, stakingKeeper stakingkeeper.Keeper, distKeeper distributionkeeper.Keeper, valAddr sdk.ValAddress, reward string) { +func setValidatorRewards(ctx sdk.Context, StakingKeeper stakingkeeper.Keeper, distKeeper distributionkeeper.Keeper, valAddr sdk.ValAddress, reward string) { // allocate some rewards - vali := stakingKeeper.Validator(ctx, valAddr) + vali := StakingKeeper.Validator(ctx, valAddr) amount, err := sdk.NewDecFromStr(reward) if err != nil { panic(err) diff --git a/x/wasm/keeper/submsg_test.go b/x/wasm/keeper/submsg_test.go index 9d1904fa7f..201aff7a3b 100644 --- a/x/wasm/keeper/submsg_test.go +++ b/x/wasm/keeper/submsg_test.go @@ -21,7 +21,7 @@ import ( // Try a simple send, no gas limit to for a sanity check before trying table tests func TestDispatchSubMsgSuccessCase(t *testing.T) { ctx, keepers := CreateTestInput(t, false, ReflectFeatures) - accKeeper, keeper, bankKeeper := keepers.AccountKeeper, keepers.WasmKeeper, keepers.BankKeeper + accKeeper, keeper, BankKeeper := keepers.AccountKeeper, keepers.WasmKeeper, keepers.BankKeeper deposit := sdk.NewCoins(sdk.NewInt64Coin("denom", 100000)) contractStart := sdk.NewCoins(sdk.NewInt64Coin("denom", 40000)) @@ -41,9 +41,9 @@ func TestDispatchSubMsgSuccessCase(t *testing.T) { require.NotEmpty(t, contractAddr) // check some account values - checkAccount(t, ctx, accKeeper, bankKeeper, contractAddr, contractStart) - checkAccount(t, ctx, accKeeper, bankKeeper, creator, creatorBalance) - checkAccount(t, ctx, accKeeper, bankKeeper, fred, nil) + checkAccount(t, ctx, accKeeper, BankKeeper, contractAddr, contractStart) + checkAccount(t, ctx, accKeeper, BankKeeper, creator, creatorBalance) + checkAccount(t, ctx, accKeeper, BankKeeper, fred, nil) // creator can send contract's tokens to fred (using SendMsg) msg := wasmvmtypes.CosmosMsg{ @@ -72,10 +72,10 @@ func TestDispatchSubMsgSuccessCase(t *testing.T) { require.NoError(t, err) // fred got coins - checkAccount(t, ctx, accKeeper, bankKeeper, fred, sdk.NewCoins(sdk.NewInt64Coin("denom", 15000))) + checkAccount(t, ctx, accKeeper, BankKeeper, fred, sdk.NewCoins(sdk.NewInt64Coin("denom", 15000))) // contract lost them - checkAccount(t, ctx, accKeeper, bankKeeper, contractAddr, sdk.NewCoins(sdk.NewInt64Coin("denom", 25000))) - checkAccount(t, ctx, accKeeper, bankKeeper, creator, creatorBalance) + checkAccount(t, ctx, accKeeper, BankKeeper, contractAddr, sdk.NewCoins(sdk.NewInt64Coin("denom", 25000))) + checkAccount(t, ctx, accKeeper, BankKeeper, creator, creatorBalance) // query the reflect state to ensure the result was stored query := testdata.ReflectQueryMsg{ diff --git a/x/wasm/keeper/test_common.go b/x/wasm/keeper/test_common.go index 717228962d..533dce6764 100644 --- a/x/wasm/keeper/test_common.go +++ b/x/wasm/keeper/test_common.go @@ -124,15 +124,15 @@ var TestingStakeParams = stakingtypes.Params{ type TestFaucet struct { t testing.TB - bankKeeper bankkeeper.Keeper + BankKeeper bankkeeper.Keeper sender sdk.AccAddress balance sdk.Coins minterModuleName string } -func NewTestFaucet(t testing.TB, ctx sdk.Context, bankKeeper bankkeeper.Keeper, minterModuleName string, initialAmount ...sdk.Coin) *TestFaucet { +func NewTestFaucet(t testing.TB, ctx sdk.Context, BankKeeper bankkeeper.Keeper, minterModuleName string, initialAmount ...sdk.Coin) *TestFaucet { require.NotEmpty(t, initialAmount) - r := &TestFaucet{t: t, bankKeeper: bankKeeper, minterModuleName: minterModuleName} + r := &TestFaucet{t: t, BankKeeper: BankKeeper, minterModuleName: minterModuleName} _, _, addr := keyPubAddr() r.sender = addr r.Mint(ctx, addr, initialAmount...) @@ -143,9 +143,9 @@ func NewTestFaucet(t testing.TB, ctx sdk.Context, bankKeeper bankkeeper.Keeper, func (f *TestFaucet) Mint(parentCtx sdk.Context, addr sdk.AccAddress, amounts ...sdk.Coin) { require.NotEmpty(f.t, amounts) ctx := parentCtx.WithEventManager(sdk.NewEventManager()) // discard all faucet related events - err := f.bankKeeper.MintCoins(ctx, f.minterModuleName, amounts) + err := f.BankKeeper.MintCoins(ctx, f.minterModuleName, amounts) require.NoError(f.t, err) - err = f.bankKeeper.SendCoinsFromModuleToAccount(ctx, f.minterModuleName, addr, amounts) + err = f.BankKeeper.SendCoinsFromModuleToAccount(ctx, f.minterModuleName, addr, amounts) require.NoError(f.t, err) f.balance = f.balance.Add(amounts...) } @@ -157,7 +157,7 @@ func (f *TestFaucet) Fund(parentCtx sdk.Context, receiver sdk.AccAddress, amount f.Mint(parentCtx, f.sender, amounts...) } ctx := parentCtx.WithEventManager(sdk.NewEventManager()) // discard all faucet related events - err := f.bankKeeper.SendCoins(ctx, f.sender, receiver, amounts) + err := f.BankKeeper.SendCoins(ctx, f.sender, receiver, amounts) require.NoError(f.t, err) f.balance = f.balance.Sub(amounts) } @@ -238,7 +238,7 @@ func createTestInput( encodingConfig := MakeEncodingConfig(t) appCodec, legacyAmino := encodingConfig.Marshaler, encodingConfig.Amino - paramsKeeper := paramskeeper.NewKeeper( + ParamsKeeper := paramskeeper.NewKeeper( appCodec, legacyAmino, keys[paramstypes.StoreKey], @@ -258,10 +258,10 @@ func createTestInput( govtypes.ModuleName, types.ModuleName, } { - paramsKeeper.Subspace(m) + ParamsKeeper.Subspace(m) } subspace := func(m string) paramstypes.Subspace { - r, ok := paramsKeeper.GetSubspace(m) + r, ok := ParamsKeeper.GetSubspace(m) require.True(t, ok) return r } @@ -275,7 +275,7 @@ func createTestInput( ibctransfertypes.ModuleName: {authtypes.Minter, authtypes.Burner}, types.ModuleName: {authtypes.Burner}, } - accountKeeper := authkeeper.NewAccountKeeper( + AccountKeeper := authkeeper.NewAccountKeeper( appCodec, keys[authtypes.StoreKey], // target store subspace(authtypes.ModuleName), @@ -287,41 +287,41 @@ func createTestInput( blockedAddrs[authtypes.NewModuleAddress(acc).String()] = true } - bankKeeper := bankkeeper.NewBaseKeeper( + BankKeeper := bankkeeper.NewBaseKeeper( appCodec, keys[banktypes.StoreKey], - accountKeeper, + AccountKeeper, subspace(banktypes.ModuleName), blockedAddrs, ) - bankKeeper.SetParams(ctx, banktypes.DefaultParams()) + BankKeeper.SetParams(ctx, banktypes.DefaultParams()) - stakingKeeper := stakingkeeper.NewKeeper( + StakingKeeper := stakingkeeper.NewKeeper( appCodec, keys[stakingtypes.StoreKey], - accountKeeper, - bankKeeper, + AccountKeeper, + BankKeeper, subspace(stakingtypes.ModuleName), ) - stakingKeeper.SetParams(ctx, TestingStakeParams) + StakingKeeper.SetParams(ctx, TestingStakeParams) distKeeper := distributionkeeper.NewKeeper( appCodec, keys[distributiontypes.StoreKey], subspace(distributiontypes.ModuleName), - accountKeeper, - bankKeeper, - stakingKeeper, + AccountKeeper, + BankKeeper, + StakingKeeper, authtypes.FeeCollectorName, nil, ) distKeeper.SetParams(ctx, distributiontypes.DefaultParams()) - stakingKeeper.SetHooks(distKeeper.Hooks()) + StakingKeeper.SetHooks(distKeeper.Hooks()) // set genesis items required for distribution distKeeper.SetFeePool(ctx, distributiontypes.InitialFeePool()) - upgradeKeeper := upgradekeeper.NewKeeper( + UpgradeKeeper := upgradekeeper.NewKeeper( map[int64]bool{}, keys[upgradetypes.StoreKey], appCodec, @@ -329,35 +329,35 @@ func createTestInput( nil, ) - faucet := NewTestFaucet(t, ctx, bankKeeper, minttypes.ModuleName, sdk.NewCoin("stake", sdk.NewInt(100_000_000_000))) + faucet := NewTestFaucet(t, ctx, BankKeeper, minttypes.ModuleName, sdk.NewCoin("stake", sdk.NewInt(100_000_000_000))) // set some funds ot pay out validatores, based on code from: // https://github.com/cosmos/cosmos-sdk/blob/fea231556aee4d549d7551a6190389c4328194eb/x/distribution/keeper/keeper_test.go#L50-L57 distrAcc := distKeeper.GetDistributionAccount(ctx) faucet.Fund(ctx, distrAcc.GetAddress(), sdk.NewCoin("stake", sdk.NewInt(2000000))) - accountKeeper.SetModuleAccount(ctx, distrAcc) + AccountKeeper.SetModuleAccount(ctx, distrAcc) - capabilityKeeper := capabilitykeeper.NewKeeper( + CapabilityKeeper := capabilitykeeper.NewKeeper( appCodec, keys[capabilitytypes.StoreKey], memKeys[capabilitytypes.MemStoreKey], ) - scopedIBCKeeper := capabilityKeeper.ScopeToModule(ibchost.ModuleName) - scopedWasmKeeper := capabilityKeeper.ScopeToModule(types.ModuleName) + scopedIBCKeeper := CapabilityKeeper.ScopeToModule(ibchost.ModuleName) + scopedWasmKeeper := CapabilityKeeper.ScopeToModule(types.ModuleName) ibcKeeper := ibckeeper.NewKeeper( appCodec, keys[ibchost.StoreKey], subspace(ibchost.ModuleName), - stakingKeeper, - upgradeKeeper, + StakingKeeper, + UpgradeKeeper, scopedIBCKeeper, ) router := baseapp.NewRouter() - bh := bank.NewHandler(bankKeeper) + bh := bank.NewHandler(BankKeeper) router.AddRoute(sdk.NewRoute(banktypes.RouterKey, bh)) - sh := staking.NewHandler(stakingKeeper) + sh := staking.NewHandler(StakingKeeper) router.AddRoute(sdk.NewRoute(stakingtypes.RouterKey, sh)) dh := distribution.NewHandler(distKeeper) router.AddRoute(sdk.NewRoute(distributiontypes.RouterKey, dh)) @@ -374,9 +374,9 @@ func createTestInput( appCodec, keys[types.StoreKey], subspace(types.ModuleName), - accountKeeper, - bankKeeper, - stakingKeeper, + AccountKeeper, + BankKeeper, + StakingKeeper, distKeeper, ibcKeeper.ChannelKeeper, &ibcKeeper.PortKeeper, @@ -395,9 +395,9 @@ func createTestInput( router.AddRoute(sdk.NewRoute(types.RouterKey, TestHandler(contractKeeper))) am := module.NewManager( // minimal module set that we use for message/ query tests - bank.NewAppModule(appCodec, bankKeeper, accountKeeper), - staking.NewAppModule(appCodec, stakingKeeper, accountKeeper, bankKeeper), - distribution.NewAppModule(appCodec, distKeeper, accountKeeper, bankKeeper, stakingKeeper), + bank.NewAppModule(appCodec, BankKeeper, AccountKeeper), + staking.NewAppModule(appCodec, StakingKeeper, AccountKeeper, BankKeeper), + distribution.NewAppModule(appCodec, distKeeper, AccountKeeper, BankKeeper, StakingKeeper), ) am.RegisterServices(module.NewConfigurator(appCodec, msgRouter, querier)) types.RegisterMsgServer(msgRouter, NewMsgServerImpl(NewDefaultPermissionKeeper(keeper))) @@ -405,33 +405,33 @@ func createTestInput( govRouter := govtypes.NewRouter(). AddRoute(govtypes.RouterKey, govtypes.ProposalHandler). - AddRoute(paramproposal.RouterKey, params.NewParamChangeProposalHandler(paramsKeeper)). + AddRoute(paramproposal.RouterKey, params.NewParamChangeProposalHandler(ParamsKeeper)). AddRoute(distributiontypes.RouterKey, distribution.NewCommunityPoolSpendProposalHandler(distKeeper)). AddRoute(types.RouterKey, NewWasmProposalHandler(&keeper, types.EnableAllProposals)) - govKeeper := govkeeper.NewKeeper( + GovKeeper := govkeeper.NewKeeper( appCodec, keys[govtypes.StoreKey], subspace(govtypes.ModuleName).WithKeyTable(govtypes.ParamKeyTable()), - accountKeeper, - bankKeeper, - stakingKeeper, + AccountKeeper, + BankKeeper, + StakingKeeper, govRouter, ) - govKeeper.SetProposalID(ctx, govtypes.DefaultStartingProposalID) - govKeeper.SetDepositParams(ctx, govtypes.DefaultDepositParams()) - govKeeper.SetVotingParams(ctx, govtypes.DefaultVotingParams()) - govKeeper.SetTallyParams(ctx, govtypes.DefaultTallyParams()) + GovKeeper.SetProposalID(ctx, govtypes.DefaultStartingProposalID) + GovKeeper.SetDepositParams(ctx, govtypes.DefaultDepositParams()) + GovKeeper.SetVotingParams(ctx, govtypes.DefaultVotingParams()) + GovKeeper.SetTallyParams(ctx, govtypes.DefaultTallyParams()) keepers := TestKeepers{ - AccountKeeper: accountKeeper, - StakingKeeper: stakingKeeper, + AccountKeeper: AccountKeeper, + StakingKeeper: StakingKeeper, DistKeeper: distKeeper, ContractKeeper: contractKeeper, WasmKeeper: &keeper, - BankKeeper: bankKeeper, - GovKeeper: govKeeper, + BankKeeper: BankKeeper, + GovKeeper: GovKeeper, IBCKeeper: ibcKeeper, Router: router, EncodingConfig: encodingConfig, diff --git a/x/wasm/module.go b/x/wasm/module.go index a237a910d4..47e0e1b3e0 100644 --- a/x/wasm/module.go +++ b/x/wasm/module.go @@ -103,8 +103,8 @@ type AppModule struct { cdc codec.Codec keeper *Keeper validatorSetSource keeper.ValidatorSetSource - accountKeeper types.AccountKeeper // for simulation - bankKeeper simulation.BankKeeper + AccountKeeper types.AccountKeeper // for simulation + BankKeeper simulation.BankKeeper } // ConsensusVersion is a sequence number for state-breaking change of the @@ -126,8 +126,8 @@ func NewAppModule( cdc: cdc, keeper: keeper, validatorSetSource: validatorSetSource, - accountKeeper: ak, - bankKeeper: bk, + AccountKeeper: ak, + BankKeeper: bk, } } @@ -206,7 +206,7 @@ func (am AppModule) RegisterStoreDecoder(sdr sdk.StoreDecoderRegistry) { // WeightedOperations returns the all the gov module operations with their respective weights. func (am AppModule) WeightedOperations(simState module.SimulationState) []simtypes.WeightedOperation { - return simulation.WeightedOperations(&simState, am.accountKeeper, am.bankKeeper, am.keeper) + return simulation.WeightedOperations(&simState, am.AccountKeeper, am.BankKeeper, am.keeper) } // ____________________________________________________________________________ diff --git a/x/wasm/module_test.go b/x/wasm/module_test.go index ab52363b71..8eddf966cc 100644 --- a/x/wasm/module_test.go +++ b/x/wasm/module_test.go @@ -29,8 +29,8 @@ type testData struct { ctx sdk.Context acctKeeper authkeeper.AccountKeeper keeper Keeper - bankKeeper bankkeeper.Keeper - stakingKeeper stakingkeeper.Keeper + BankKeeper bankkeeper.Keeper + StakingKeeper stakingkeeper.Keeper faucet *keeper.TestFaucet } @@ -42,8 +42,8 @@ func setupTest(t *testing.T) testData { ctx: ctx, acctKeeper: keepers.AccountKeeper, keeper: *keepers.WasmKeeper, - bankKeeper: keepers.BankKeeper, - stakingKeeper: keepers.StakingKeeper, + BankKeeper: keepers.BankKeeper, + StakingKeeper: keepers.StakingKeeper, faucet: keepers.Faucet, } return data @@ -258,13 +258,13 @@ func TestHandleExecute(t *testing.T) { creatorAcct := data.acctKeeper.GetAccount(data.ctx, creator) require.NotNil(t, creatorAcct) // we started at 2*deposit, should have spent one above - assert.Equal(t, deposit, data.bankKeeper.GetAllBalances(data.ctx, creatorAcct.GetAddress())) + assert.Equal(t, deposit, data.BankKeeper.GetAllBalances(data.ctx, creatorAcct.GetAddress())) // ensure contract has updated balance contractAddr, _ := sdk.AccAddressFromBech32(contractBech32Addr) contractAcct := data.acctKeeper.GetAccount(data.ctx, contractAddr) require.NotNil(t, contractAcct) - assert.Equal(t, deposit, data.bankKeeper.GetAllBalances(data.ctx, contractAcct.GetAddress())) + assert.Equal(t, deposit, data.BankKeeper.GetAllBalances(data.ctx, contractAcct.GetAddress())) execCmd := MsgExecuteContract{ Sender: fred.String(), @@ -314,14 +314,14 @@ func TestHandleExecute(t *testing.T) { // ensure bob now exists and got both payments released bobAcct = data.acctKeeper.GetAccount(data.ctx, bob) require.NotNil(t, bobAcct) - balance := data.bankKeeper.GetAllBalances(data.ctx, bobAcct.GetAddress()) + balance := data.BankKeeper.GetAllBalances(data.ctx, bobAcct.GetAddress()) assert.Equal(t, deposit.Add(topUp...), balance) // ensure contract has updated balance contractAcct = data.acctKeeper.GetAccount(data.ctx, contractAddr) require.NotNil(t, contractAcct) - assert.Equal(t, sdk.Coins{}, data.bankKeeper.GetAllBalances(data.ctx, contractAcct.GetAddress())) + assert.Equal(t, sdk.Coins{}, data.BankKeeper.GetAllBalances(data.ctx, contractAcct.GetAddress())) // ensure all contract state is as after init assertCodeList(t, q, data.ctx, 1) @@ -392,14 +392,14 @@ func TestHandleExecuteEscrow(t *testing.T) { // ensure bob now exists and got both payments released bobAcct := data.acctKeeper.GetAccount(data.ctx, bob) require.NotNil(t, bobAcct) - balance := data.bankKeeper.GetAllBalances(data.ctx, bobAcct.GetAddress()) + balance := data.BankKeeper.GetAllBalances(data.ctx, bobAcct.GetAddress()) assert.Equal(t, deposit.Add(topUp...), balance) // ensure contract has updated balance contractAddr, _ := sdk.AccAddressFromBech32(contractBech32Addr) contractAcct := data.acctKeeper.GetAccount(data.ctx, contractAddr) require.NotNil(t, contractAcct) - assert.Equal(t, sdk.Coins{}, data.bankKeeper.GetAllBalances(data.ctx, contractAcct.GetAddress())) + assert.Equal(t, sdk.Coins{}, data.BankKeeper.GetAllBalances(data.ctx, contractAcct.GetAddress())) } func TestReadWasmConfig(t *testing.T) { diff --git a/x/wasm/relay_test.go b/x/wasm/relay_test.go index 5edd182d59..d27d3d9860 100644 --- a/x/wasm/relay_test.go +++ b/x/wasm/relay_test.go @@ -193,10 +193,10 @@ func TestContractCanInitiateIBCTransferMsg(t *testing.T) { require.Equal(t, 0, len(chainB.PendingSendPackets)) // and dest chain balance contains voucher - bankKeeperB := chainB.GetTestSupport().BankKeeper() + BankKeeperB := chainB.GetTestSupport().BankKeeper() expBalance := ibctransfertypes.GetTransferCoin(path.EndpointB.ChannelConfig.PortID, path.EndpointB.ChannelID, coinToSendToB.Denom, coinToSendToB.Amount) gotBalance := chainB.Balance(chainB.SenderAccount.GetAddress(), expBalance.Denom) - assert.Equal(t, expBalance, gotBalance, "got total balance: %s", bankKeeperB.GetAllBalances(chainB.GetContext(), chainB.SenderAccount.GetAddress())) + assert.Equal(t, expBalance, gotBalance, "got total balance: %s", BankKeeperB.GetAllBalances(chainB.GetContext(), chainB.SenderAccount.GetAddress())) } func TestContractCanEmulateIBCTransferMessage(t *testing.T) { @@ -268,10 +268,10 @@ func TestContractCanEmulateIBCTransferMessage(t *testing.T) { require.Equal(t, 0, len(chainB.PendingSendPackets)) // and dest chain balance contains voucher - bankKeeperB := chainB.GetTestSupport().BankKeeper() + BankKeeperB := chainB.GetTestSupport().BankKeeper() expBalance := ibctransfertypes.GetTransferCoin(path.EndpointB.ChannelConfig.PortID, path.EndpointB.ChannelID, coinToSendToB.Denom, coinToSendToB.Amount) gotBalance := chainB.Balance(chainB.SenderAccount.GetAddress(), expBalance.Denom) - assert.Equal(t, expBalance, gotBalance, "got total balance: %s", bankKeeperB.GetAllBalances(chainB.GetContext(), chainB.SenderAccount.GetAddress())) + assert.Equal(t, expBalance, gotBalance, "got total balance: %s", BankKeeperB.GetAllBalances(chainB.GetContext(), chainB.SenderAccount.GetAddress())) } func TestContractCanEmulateIBCTransferMessageWithTimeout(t *testing.T) { From df44859b5f571d4aa2d00bec3ea7ad12f290b497 Mon Sep 17 00:00:00 2001 From: faddat Date: Fri, 8 Jul 2022 12:45:56 +0000 Subject: [PATCH 2/7] fix linting --- app/test_helpers.go | 12 ++++++------ x/wasm/keeper/genesis.go | 4 ++-- x/wasm/keeper/handler_plugin.go | 8 ++++---- x/wasm/keeper/keeper.go | 18 +++++++++--------- x/wasm/keeper/query_plugins.go | 6 +++--- x/wasm/keeper/test_common.go | 4 ++-- 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/app/test_helpers.go b/app/test_helpers.go index 39c27ed1ca..cf3de89a82 100644 --- a/app/test_helpers.go +++ b/app/test_helpers.go @@ -447,12 +447,12 @@ func (ao EmptyBaseAppOptions) Get(o string) interface{} { // // Instead of using the mint module account, which has the // permission of minting, create a "faucet" account. (@fdymylja) -func FundAccount(BankKeeper bankkeeper.Keeper, ctx sdk.Context, addr sdk.AccAddress, amounts sdk.Coins) error { - if err := BankKeeper.MintCoins(ctx, minttypes.ModuleName, amounts); err != nil { +func FundAccount(bankKeeper bankkeeper.Keeper, ctx sdk.Context, addr sdk.AccAddress, amounts sdk.Coins) error { + if err := bankKeeper.MintCoins(ctx, minttypes.ModuleName, amounts); err != nil { return err } - return BankKeeper.SendCoinsFromModuleToAccount(ctx, minttypes.ModuleName, addr, amounts) + return bankKeeper.SendCoinsFromModuleToAccount(ctx, minttypes.ModuleName, addr, amounts) } // FundModuleAccount is a utility function that funds a module account by @@ -461,10 +461,10 @@ func FundAccount(BankKeeper bankkeeper.Keeper, ctx sdk.Context, addr sdk.AccAddr // // Instead of using the mint module account, which has the // permission of minting, create a "faucet" account. (@fdymylja) -func FundModuleAccount(BankKeeper bankkeeper.Keeper, ctx sdk.Context, recipientMod string, amounts sdk.Coins) error { - if err := BankKeeper.MintCoins(ctx, minttypes.ModuleName, amounts); err != nil { +func FundModuleAccount(bankKeeper bankkeeper.Keeper, ctx sdk.Context, recipientMod string, amounts sdk.Coins) error { + if err := bankKeeper.MintCoins(ctx, minttypes.ModuleName, amounts); err != nil { return err } - return BankKeeper.SendCoinsFromModuleToModule(ctx, minttypes.ModuleName, recipientMod, amounts) + return bankKeeper.SendCoinsFromModuleToModule(ctx, minttypes.ModuleName, recipientMod, amounts) } diff --git a/x/wasm/keeper/genesis.go b/x/wasm/keeper/genesis.go index ac45b9a19e..7fa5280b9e 100644 --- a/x/wasm/keeper/genesis.go +++ b/x/wasm/keeper/genesis.go @@ -16,7 +16,7 @@ type ValidatorSetSource interface { // InitGenesis sets supply information for genesis. // // CONTRACT: all types of accounts must have been already initialized/created -func InitGenesis(ctx sdk.Context, keeper *Keeper, data types.GenesisState, StakingKeeper ValidatorSetSource, msgHandler sdk.Handler) ([]abci.ValidatorUpdate, error) { +func InitGenesis(ctx sdk.Context, keeper *Keeper, data types.GenesisState, stakingKeeper ValidatorSetSource, msgHandler sdk.Handler) ([]abci.ValidatorUpdate, error) { contractKeeper := NewGovPermissionKeeper(keeper) keeper.SetParams(ctx, data.Params) var maxCodeID uint64 @@ -78,7 +78,7 @@ func InitGenesis(ctx sdk.Context, keeper *Keeper, data types.GenesisState, Staki return nil, sdkerrors.Wrap(err, "genesis") } } - return StakingKeeper.ApplyAndReturnValidatorSetUpdates(ctx) + return stakingKeeper.ApplyAndReturnValidatorSetUpdates(ctx) } // ExportGenesis returns a GenesisState for a given context and keeper. diff --git a/x/wasm/keeper/handler_plugin.go b/x/wasm/keeper/handler_plugin.go index 9e2b16309d..e83ed03535 100644 --- a/x/wasm/keeper/handler_plugin.go +++ b/x/wasm/keeper/handler_plugin.go @@ -35,8 +35,8 @@ type SDKMessageHandler struct { func NewDefaultMessageHandler( router MessageRouter, channelKeeper types.ChannelKeeper, - CapabilityKeeper types.CapabilityKeeper, - BankKeeper types.Burner, + capabilityKeeper types.CapabilityKeeper, + bankKeeper types.Burner, unpacker codectypes.AnyUnpacker, portSource types.ICS20TransferPortSource, customEncoders ...*MessageEncoders, @@ -47,8 +47,8 @@ func NewDefaultMessageHandler( } return NewMessageHandlerChain( NewSDKMessageHandler(router, encoders), - NewIBCRawPacketHandler(channelKeeper, CapabilityKeeper), - NewBurnCoinMessageHandler(BankKeeper), + NewIBCRawPacketHandler(channelKeeper, capabilityKeeper), + NewBurnCoinMessageHandler(bankKeeper), ) } diff --git a/x/wasm/keeper/keeper.go b/x/wasm/keeper/keeper.go index 3dc25acb3e..034cfab6d0 100644 --- a/x/wasm/keeper/keeper.go +++ b/x/wasm/keeper/keeper.go @@ -91,13 +91,13 @@ func NewKeeper( cdc codec.Codec, storeKey sdk.StoreKey, paramSpace paramtypes.Subspace, - AccountKeeper types.AccountKeeper, - BankKeeper types.BankKeeper, - StakingKeeper types.StakingKeeper, + accountKeeper types.AccountKeeper, + bankKeeper types.BankKeeper, + stakingKeeper types.StakingKeeper, distKeeper types.DistributionKeeper, channelKeeper types.ChannelKeeper, portKeeper types.PortKeeper, - CapabilityKeeper types.CapabilityKeeper, + capabilityKeeper types.CapabilityKeeper, portSource types.ICS20TransferPortSource, router MessageRouter, queryRouter GRPCQueryRouter, @@ -119,17 +119,17 @@ func NewKeeper( storeKey: storeKey, cdc: cdc, wasmVM: wasmer, - AccountKeeper: AccountKeeper, - bank: NewBankCoinTransferrer(BankKeeper), + AccountKeeper: accountKeeper, + bank: NewBankCoinTransferrer(bankKeeper), portKeeper: portKeeper, - CapabilityKeeper: CapabilityKeeper, - messenger: NewDefaultMessageHandler(router, channelKeeper, CapabilityKeeper, BankKeeper, cdc, portSource), + CapabilityKeeper: capabilityKeeper, + messenger: NewDefaultMessageHandler(router, channelKeeper, capabilityKeeper, bankKeeper, cdc, portSource), queryGasLimit: wasmConfig.SmartQueryGasLimit, paramSpace: paramSpace, gasRegister: NewDefaultWasmGasRegister(), maxQueryStackSize: types.DefaultMaxQueryStackSize, } - keeper.wasmVMQueryHandler = DefaultQueryPlugins(BankKeeper, StakingKeeper, distKeeper, channelKeeper, queryRouter, keeper) + keeper.wasmVMQueryHandler = DefaultQueryPlugins(bankKeeper, stakingKeeper, distKeeper, channelKeeper, queryRouter, keeper) for _, o := range opts { o.apply(keeper) } diff --git a/x/wasm/keeper/query_plugins.go b/x/wasm/keeper/query_plugins.go index 6301412767..b0e095b12c 100644 --- a/x/wasm/keeper/query_plugins.go +++ b/x/wasm/keeper/query_plugins.go @@ -162,14 +162,14 @@ func (e QueryPlugins) HandleQuery(ctx sdk.Context, caller sdk.AccAddress, reques return nil, wasmvmtypes.Unknown{} } -func BankQuerier(BankKeeper types.BankViewKeeper) func(ctx sdk.Context, request *wasmvmtypes.BankQuery) ([]byte, error) { +func BankQuerier(bankKeeper types.BankViewKeeper) func(ctx sdk.Context, request *wasmvmtypes.BankQuery) ([]byte, error) { return func(ctx sdk.Context, request *wasmvmtypes.BankQuery) ([]byte, error) { if request.AllBalances != nil { addr, err := sdk.AccAddressFromBech32(request.AllBalances.Address) if err != nil { return nil, sdkerrors.Wrap(sdkerrors.ErrInvalidAddress, request.AllBalances.Address) } - coins := BankKeeper.GetAllBalances(ctx, addr) + coins := bankKeeper.GetAllBalances(ctx, addr) res := wasmvmtypes.AllBalancesResponse{ Amount: ConvertSdkCoinsToWasmCoins(coins), } @@ -180,7 +180,7 @@ func BankQuerier(BankKeeper types.BankViewKeeper) func(ctx sdk.Context, request if err != nil { return nil, sdkerrors.Wrap(sdkerrors.ErrInvalidAddress, request.Balance.Address) } - coin := BankKeeper.GetBalance(ctx, addr, request.Balance.Denom) + coin := bankKeeper.GetBalance(ctx, addr, request.Balance.Denom) res := wasmvmtypes.BalanceResponse{ Amount: wasmvmtypes.Coin{ Denom: coin.Denom, diff --git a/x/wasm/keeper/test_common.go b/x/wasm/keeper/test_common.go index 533dce6764..b4b5f52f67 100644 --- a/x/wasm/keeper/test_common.go +++ b/x/wasm/keeper/test_common.go @@ -130,9 +130,9 @@ type TestFaucet struct { minterModuleName string } -func NewTestFaucet(t testing.TB, ctx sdk.Context, BankKeeper bankkeeper.Keeper, minterModuleName string, initialAmount ...sdk.Coin) *TestFaucet { +func NewTestFaucet(t testing.TB, ctx sdk.Context, bankKeeper bankkeeper.Keeper, minterModuleName string, initialAmount ...sdk.Coin) *TestFaucet { require.NotEmpty(t, initialAmount) - r := &TestFaucet{t: t, BankKeeper: BankKeeper, minterModuleName: minterModuleName} + r := &TestFaucet{t: t, BankKeeper: bankKeeper, minterModuleName: minterModuleName} _, _, addr := keyPubAddr() r.sender = addr r.Mint(ctx, addr, initialAmount...) From 2861c40d8b53900d849fd1d0d4091bae0f29d162 Mon Sep 17 00:00:00 2001 From: Alex Peters Date: Tue, 23 Aug 2022 15:09:29 +0200 Subject: [PATCH 3/7] Revert variable renaming --- app/app.go | 52 +++++----- x/wasm/genesis_test.go | 2 +- x/wasm/keeper/handler_plugin.go | 6 +- x/wasm/keeper/ibc.go | 6 +- x/wasm/keeper/keeper.go | 14 +-- x/wasm/keeper/keeper_test.go | 36 +++---- x/wasm/keeper/proposal_integration_test.go | 84 ++++++++-------- x/wasm/keeper/query_plugins_test.go | 8 +- x/wasm/keeper/reflect_test.go | 44 ++++----- x/wasm/keeper/staking_test.go | 106 ++++++++++----------- x/wasm/keeper/submsg_test.go | 14 +-- x/wasm/keeper/test_common.go | 98 +++++++++---------- x/wasm/module.go | 10 +- x/wasm/module_test.go | 20 ++-- x/wasm/relay_test.go | 8 +- 15 files changed, 254 insertions(+), 254 deletions(-) diff --git a/app/app.go b/app/app.go index 370a0698d5..23259d0d0d 100644 --- a/app/app.go +++ b/app/app.go @@ -373,7 +373,7 @@ func NewWasmApp( keys[feegrant.StoreKey], app.AccountKeeper, ) - StakingKeeper := stakingkeeper.NewKeeper( + stakingKeeper := stakingkeeper.NewKeeper( appCodec, keys[stakingtypes.StoreKey], app.AccountKeeper, @@ -384,7 +384,7 @@ func NewWasmApp( appCodec, keys[minttypes.StoreKey], app.getSubspace(minttypes.ModuleName), - &StakingKeeper, + &stakingKeeper, app.AccountKeeper, app.BankKeeper, authtypes.FeeCollectorName, @@ -395,14 +395,14 @@ func NewWasmApp( app.getSubspace(distrtypes.ModuleName), app.AccountKeeper, app.BankKeeper, - &StakingKeeper, + &stakingKeeper, authtypes.FeeCollectorName, app.ModuleAccountAddrs(), ) app.SlashingKeeper = slashingkeeper.NewKeeper( appCodec, keys[slashingtypes.StoreKey], - &StakingKeeper, + &stakingKeeper, app.getSubspace(slashingtypes.ModuleName), ) app.CrisisKeeper = crisiskeeper.NewKeeper( @@ -420,8 +420,8 @@ func NewWasmApp( ) // register the staking hooks - // NOTE: StakingKeeper above is passed by reference, so that it will contain these hooks - app.StakingKeeper = *StakingKeeper.SetHooks( + // NOTE: stakingKeeper above is passed by reference, so that it will contain these hooks + app.StakingKeeper = *stakingKeeper.SetHooks( stakingtypes.NewMultiStakingHooks(app.DistrKeeper.Hooks(), app.SlashingKeeper.Hooks()), ) @@ -491,13 +491,13 @@ func NewWasmApp( icaControllerIBCModule := icacontroller.NewIBCModule(app.ICAControllerKeeper, interTxIBCModule) // create evidence keeper with router - EvidenceKeeper := evidencekeeper.NewKeeper( + evidenceKeeper := evidencekeeper.NewKeeper( appCodec, keys[evidencetypes.StoreKey], &app.StakingKeeper, app.SlashingKeeper, ) - app.EvidenceKeeper = *EvidenceKeeper + app.EvidenceKeeper = *evidenceKeeper wasmDir := filepath.Join(homePath, "wasm") wasmConfig, err := wasm.ReadWasmConfig(appOpts) @@ -549,7 +549,7 @@ func NewWasmApp( app.getSubspace(govtypes.ModuleName), app.AccountKeeper, app.BankKeeper, - &StakingKeeper, + &stakingKeeper, govRouter, ) /**** Module Options ****/ @@ -889,21 +889,21 @@ func GetMaccPerms() map[string][]string { // initParamsKeeper init params keeper and its subspaces func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino, key, tkey sdk.StoreKey) paramskeeper.Keeper { - ParamsKeeper := paramskeeper.NewKeeper(appCodec, legacyAmino, key, tkey) - - ParamsKeeper.Subspace(authtypes.ModuleName) - ParamsKeeper.Subspace(banktypes.ModuleName) - ParamsKeeper.Subspace(stakingtypes.ModuleName) - ParamsKeeper.Subspace(minttypes.ModuleName) - ParamsKeeper.Subspace(distrtypes.ModuleName) - ParamsKeeper.Subspace(slashingtypes.ModuleName) - ParamsKeeper.Subspace(govtypes.ModuleName).WithKeyTable(govtypes.ParamKeyTable()) - ParamsKeeper.Subspace(crisistypes.ModuleName) - ParamsKeeper.Subspace(ibctransfertypes.ModuleName) - ParamsKeeper.Subspace(ibchost.ModuleName) - ParamsKeeper.Subspace(icahosttypes.SubModuleName) - ParamsKeeper.Subspace(icacontrollertypes.SubModuleName) - ParamsKeeper.Subspace(wasm.ModuleName) - - return ParamsKeeper + paramsKeeper := paramskeeper.NewKeeper(appCodec, legacyAmino, key, tkey) + + paramsKeeper.Subspace(authtypes.ModuleName) + paramsKeeper.Subspace(banktypes.ModuleName) + paramsKeeper.Subspace(stakingtypes.ModuleName) + paramsKeeper.Subspace(minttypes.ModuleName) + paramsKeeper.Subspace(distrtypes.ModuleName) + paramsKeeper.Subspace(slashingtypes.ModuleName) + paramsKeeper.Subspace(govtypes.ModuleName).WithKeyTable(govtypes.ParamKeyTable()) + paramsKeeper.Subspace(crisistypes.ModuleName) + paramsKeeper.Subspace(ibctransfertypes.ModuleName) + paramsKeeper.Subspace(ibchost.ModuleName) + paramsKeeper.Subspace(icahosttypes.SubModuleName) + paramsKeeper.Subspace(icacontrollertypes.SubModuleName) + paramsKeeper.Subspace(wasm.ModuleName) + + return paramsKeeper } diff --git a/x/wasm/genesis_test.go b/x/wasm/genesis_test.go index f9e9f640ba..ea97c97f07 100644 --- a/x/wasm/genesis_test.go +++ b/x/wasm/genesis_test.go @@ -79,7 +79,7 @@ func TestInitGenesis(t *testing.T) { q2 := newData.module.LegacyQuerierHandler(nil) // initialize new app with genstate - InitGenesis(newData.ctx, &newData.keeper, *genState, newData.StakingKeeper, newData.module.Route().Handler()) + InitGenesis(newData.ctx, &newData.keeper, *genState, newData.stakingKeeper, newData.module.Route().Handler()) // run same checks again on newdata, to make sure it was reinitialized correctly assertCodeList(t, q2, newData.ctx, 1) diff --git a/x/wasm/keeper/handler_plugin.go b/x/wasm/keeper/handler_plugin.go index e83ed03535..c138e5ed00 100644 --- a/x/wasm/keeper/handler_plugin.go +++ b/x/wasm/keeper/handler_plugin.go @@ -143,11 +143,11 @@ func (m MessageHandlerChain) DispatchMsg(ctx sdk.Context, contractAddr sdk.AccAd // IBCRawPacketHandler handels IBC.SendPacket messages which are published to an IBC channel. type IBCRawPacketHandler struct { channelKeeper types.ChannelKeeper - CapabilityKeeper types.CapabilityKeeper + capabilityKeeper types.CapabilityKeeper } func NewIBCRawPacketHandler(chk types.ChannelKeeper, cak types.CapabilityKeeper) IBCRawPacketHandler { - return IBCRawPacketHandler{channelKeeper: chk, CapabilityKeeper: cak} + return IBCRawPacketHandler{channelKeeper: chk, capabilityKeeper: cak} } // DispatchMsg publishes a raw IBC packet onto the channel. @@ -174,7 +174,7 @@ func (h IBCRawPacketHandler) DispatchMsg(ctx sdk.Context, _ sdk.AccAddress, cont if !ok { return nil, nil, sdkerrors.Wrap(channeltypes.ErrInvalidChannel, "not found") } - channelCap, ok := h.CapabilityKeeper.GetCapability(ctx, host.ChannelCapabilityPath(contractIBCPortID, contractIBCChannelID)) + channelCap, ok := h.capabilityKeeper.GetCapability(ctx, host.ChannelCapabilityPath(contractIBCPortID, contractIBCChannelID)) if !ok { return nil, nil, sdkerrors.Wrap(channeltypes.ErrChannelCapabilityNotFound, "module does not own channel capability") } diff --git a/x/wasm/keeper/ibc.go b/x/wasm/keeper/ibc.go index eb71ec9f8e..f6f928df62 100644 --- a/x/wasm/keeper/ibc.go +++ b/x/wasm/keeper/ibc.go @@ -25,7 +25,7 @@ func (k Keeper) bindIbcPort(ctx sdk.Context, portID string) error { // (lack of permissions or someone else has it) func (k Keeper) ensureIbcPort(ctx sdk.Context, contractAddr sdk.AccAddress) (string, error) { portID := PortIDForContract(contractAddr) - if _, ok := k.CapabilityKeeper.GetCapability(ctx, host.PortPath(portID)); ok { + if _, ok := k.capabilityKeeper.GetCapability(ctx, host.PortPath(portID)); ok { return portID, nil } return portID, k.bindIbcPort(ctx, portID) @@ -46,11 +46,11 @@ func ContractFromPortID(portID string) (sdk.AccAddress, error) { // AuthenticateCapability wraps the scopedKeeper's AuthenticateCapability function func (k Keeper) AuthenticateCapability(ctx sdk.Context, cap *capabilitytypes.Capability, name string) bool { - return k.CapabilityKeeper.AuthenticateCapability(ctx, cap, name) + return k.capabilityKeeper.AuthenticateCapability(ctx, cap, name) } // ClaimCapability allows the transfer module to claim a capability // that IBC module passes to it func (k Keeper) ClaimCapability(ctx sdk.Context, cap *capabilitytypes.Capability, name string) error { - return k.CapabilityKeeper.ClaimCapability(ctx, cap, name) + return k.capabilityKeeper.ClaimCapability(ctx, cap, name) } diff --git a/x/wasm/keeper/keeper.go b/x/wasm/keeper/keeper.go index 034cfab6d0..3fdcbec483 100644 --- a/x/wasm/keeper/keeper.go +++ b/x/wasm/keeper/keeper.go @@ -70,10 +70,10 @@ type WasmVMResponseHandler interface { type Keeper struct { storeKey sdk.StoreKey cdc codec.Codec - AccountKeeper types.AccountKeeper + accountKeeper types.AccountKeeper bank CoinTransferrer portKeeper types.PortKeeper - CapabilityKeeper types.CapabilityKeeper + capabilityKeeper types.CapabilityKeeper wasmVM types.WasmerEngine wasmVMQueryHandler WasmVMQueryHandler wasmVMResponseHandler WasmVMResponseHandler @@ -119,10 +119,10 @@ func NewKeeper( storeKey: storeKey, cdc: cdc, wasmVM: wasmer, - AccountKeeper: accountKeeper, + accountKeeper: accountKeeper, bank: NewBankCoinTransferrer(bankKeeper), portKeeper: portKeeper, - CapabilityKeeper: capabilityKeeper, + capabilityKeeper: capabilityKeeper, messenger: NewDefaultMessageHandler(router, channelKeeper, capabilityKeeper, bankKeeper, cdc, portSource), queryGasLimit: wasmConfig.SmartQueryGasLimit, paramSpace: paramSpace, @@ -246,7 +246,7 @@ func (k Keeper) instantiate(ctx sdk.Context, codeID uint64, creator, admin sdk.A // create contract address contractAddress := k.generateContractAddress(ctx, codeID) - existingAcct := k.AccountKeeper.GetAccount(ctx, contractAddress) + existingAcct := k.accountKeeper.GetAccount(ctx, contractAddress) if existingAcct != nil { return nil, nil, sdkerrors.Wrap(types.ErrAccountExists, existingAcct.GetAddress().String()) } @@ -259,8 +259,8 @@ func (k Keeper) instantiate(ctx sdk.Context, codeID uint64, creator, admin sdk.A } else { // create an empty account (so we don't have issues later) // TODO: can we remove this? - contractAccount := k.AccountKeeper.NewAccountWithAddress(ctx, contractAddress) - k.AccountKeeper.SetAccount(ctx, contractAccount) + contractAccount := k.accountKeeper.NewAccountWithAddress(ctx, contractAddress) + k.accountKeeper.SetAccount(ctx, contractAccount) } // get contact info diff --git a/x/wasm/keeper/keeper_test.go b/x/wasm/keeper/keeper_test.go index 2cf206ebdf..bb20a39267 100644 --- a/x/wasm/keeper/keeper_test.go +++ b/x/wasm/keeper/keeper_test.go @@ -122,12 +122,12 @@ func TestCreateStoresInstantiatePermission(t *testing.T) { for msg, spec := range specs { t.Run(msg, func(t *testing.T) { ctx, keepers := CreateTestInput(t, false, SupportedFeatures) - accKeeper, keeper, BankKeeper := keepers.AccountKeeper, keepers.ContractKeeper, keepers.BankKeeper + accKeeper, keeper, bankKeeper := keepers.AccountKeeper, keepers.ContractKeeper, keepers.BankKeeper keepers.WasmKeeper.SetParams(ctx, types.Params{ CodeUploadAccess: types.AllowEverybody, InstantiateDefaultPermission: spec.srcPermission, }) - fundAccounts(t, ctx, accKeeper, BankKeeper, myAddr, deposit) + fundAccounts(t, ctx, accKeeper, bankKeeper, myAddr, deposit) codeID, err := keeper.Create(ctx, myAddr, hackatomWasm, nil) require.NoError(t, err) @@ -452,10 +452,10 @@ func TestInstantiateWithDeposit(t *testing.T) { for msg, spec := range specs { t.Run(msg, func(t *testing.T) { ctx, keepers := CreateTestInput(t, false, SupportedFeatures) - accKeeper, BankKeeper, keeper := keepers.AccountKeeper, keepers.BankKeeper, keepers.ContractKeeper + accKeeper, bankKeeper, keeper := keepers.AccountKeeper, keepers.BankKeeper, keepers.ContractKeeper if spec.fundAddr { - fundAccounts(t, ctx, accKeeper, BankKeeper, spec.srcActor, sdk.NewCoins(sdk.NewInt64Coin("denom", 200))) + fundAccounts(t, ctx, accKeeper, bankKeeper, spec.srcActor, sdk.NewCoins(sdk.NewInt64Coin("denom", 200))) } contractID, err := keeper.Create(ctx, spec.srcActor, hackatomWasm, nil) require.NoError(t, err) @@ -468,7 +468,7 @@ func TestInstantiateWithDeposit(t *testing.T) { return } require.NoError(t, err) - balances := BankKeeper.GetAllBalances(ctx, addr) + balances := bankKeeper.GetAllBalances(ctx, addr) assert.Equal(t, deposit, balances) }) } @@ -519,8 +519,8 @@ func TestInstantiateWithPermissions(t *testing.T) { for msg, spec := range specs { t.Run(msg, func(t *testing.T) { ctx, keepers := CreateTestInput(t, false, SupportedFeatures) - accKeeper, BankKeeper, keeper := keepers.AccountKeeper, keepers.BankKeeper, keepers.ContractKeeper - fundAccounts(t, ctx, accKeeper, BankKeeper, spec.srcActor, deposit) + accKeeper, bankKeeper, keeper := keepers.AccountKeeper, keepers.BankKeeper, keepers.ContractKeeper + fundAccounts(t, ctx, accKeeper, bankKeeper, spec.srcActor, deposit) contractID, err := keeper.Create(ctx, myAddr, hackatomWasm, &spec.srcPermission) require.NoError(t, err) @@ -566,7 +566,7 @@ func TestInstantiateWithContractDataResponse(t *testing.T) { func TestExecute(t *testing.T) { ctx, keepers := CreateTestInput(t, false, SupportedFeatures) - accKeeper, keeper, BankKeeper := keepers.AccountKeeper, keepers.ContractKeeper, keepers.BankKeeper + accKeeper, keeper, bankKeeper := keepers.AccountKeeper, keepers.ContractKeeper, keepers.BankKeeper deposit := sdk.NewCoins(sdk.NewInt64Coin("denom", 100000)) topUp := sdk.NewCoins(sdk.NewInt64Coin("denom", 5000)) @@ -596,12 +596,12 @@ func TestExecute(t *testing.T) { creatorAcct := accKeeper.GetAccount(ctx, creator) require.NotNil(t, creatorAcct) // we started at 2*deposit, should have spent one above - assert.Equal(t, deposit, BankKeeper.GetAllBalances(ctx, creatorAcct.GetAddress())) + assert.Equal(t, deposit, bankKeeper.GetAllBalances(ctx, creatorAcct.GetAddress())) // ensure contract has updated balance contractAcct := accKeeper.GetAccount(ctx, addr) require.NotNil(t, contractAcct) - assert.Equal(t, deposit, BankKeeper.GetAllBalances(ctx, contractAcct.GetAddress())) + assert.Equal(t, deposit, bankKeeper.GetAllBalances(ctx, contractAcct.GetAddress())) // unauthorized - trialCtx so we don't change state trialCtx := ctx.WithMultiStore(ctx.MultiStore().CacheWrap().(sdk.MultiStore)) @@ -628,13 +628,13 @@ func TestExecute(t *testing.T) { // ensure bob now exists and got both payments released bobAcct = accKeeper.GetAccount(ctx, bob) require.NotNil(t, bobAcct) - balance := BankKeeper.GetAllBalances(ctx, bobAcct.GetAddress()) + balance := bankKeeper.GetAllBalances(ctx, bobAcct.GetAddress()) assert.Equal(t, deposit.Add(topUp...), balance) // ensure contract has updated balance contractAcct = accKeeper.GetAccount(ctx, addr) require.NotNil(t, contractAcct) - assert.Equal(t, sdk.Coins{}, BankKeeper.GetAllBalances(ctx, contractAcct.GetAddress())) + assert.Equal(t, sdk.Coins{}, bankKeeper.GetAllBalances(ctx, contractAcct.GetAddress())) // and events emitted require.Len(t, em.Events(), 9) @@ -703,12 +703,12 @@ func TestExecuteWithDeposit(t *testing.T) { for msg, spec := range specs { t.Run(msg, func(t *testing.T) { ctx, keepers := CreateTestInput(t, false, SupportedFeatures) - accKeeper, BankKeeper, keeper := keepers.AccountKeeper, keepers.BankKeeper, keepers.ContractKeeper + accKeeper, bankKeeper, keeper := keepers.AccountKeeper, keepers.BankKeeper, keepers.ContractKeeper if spec.newBankParams != nil { - BankKeeper.SetParams(ctx, *spec.newBankParams) + bankKeeper.SetParams(ctx, *spec.newBankParams) } if spec.fundAddr { - fundAccounts(t, ctx, accKeeper, BankKeeper, spec.srcActor, sdk.NewCoins(sdk.NewInt64Coin("denom", 200))) + fundAccounts(t, ctx, accKeeper, bankKeeper, spec.srcActor, sdk.NewCoins(sdk.NewInt64Coin("denom", 200))) } codeID, err := keeper.Create(ctx, spec.srcActor, hackatomWasm, nil) require.NoError(t, err) @@ -729,7 +729,7 @@ func TestExecuteWithDeposit(t *testing.T) { return } require.NoError(t, err) - balances := BankKeeper.GetAllBalances(ctx, spec.beneficiary) + balances := bankKeeper.GetAllBalances(ctx, spec.beneficiary) assert.Equal(t, deposit, balances) }) } @@ -1248,7 +1248,7 @@ type stealFundsMsg struct { func TestSudo(t *testing.T) { ctx, keepers := CreateTestInput(t, false, SupportedFeatures) - accKeeper, keeper, BankKeeper := keepers.AccountKeeper, keepers.ContractKeeper, keepers.BankKeeper + accKeeper, keeper, bankKeeper := keepers.AccountKeeper, keepers.ContractKeeper, keepers.BankKeeper deposit := sdk.NewCoins(sdk.NewInt64Coin("denom", 100000)) creator := keepers.Faucet.NewFundedAccount(ctx, deposit.Add(deposit...)...) @@ -1295,7 +1295,7 @@ func TestSudo(t *testing.T) { // ensure community now exists and got paid comAcct = accKeeper.GetAccount(ctx, community) require.NotNil(t, comAcct) - balance := BankKeeper.GetBalance(ctx, comAcct.GetAddress(), "denom") + balance := bankKeeper.GetBalance(ctx, comAcct.GetAddress(), "denom") assert.Equal(t, sdk.NewInt64Coin("denom", 76543), balance) // and events emitted require.Len(t, em.Events(), 4, prettyEvents(t, em.Events())) diff --git a/x/wasm/keeper/proposal_integration_test.go b/x/wasm/keeper/proposal_integration_test.go index 3b2d1807b0..3d5097b501 100644 --- a/x/wasm/keeper/proposal_integration_test.go +++ b/x/wasm/keeper/proposal_integration_test.go @@ -25,7 +25,7 @@ import ( func TestStoreCodeProposal(t *testing.T) { ctx, keepers := CreateTestInput(t, false, "staking") - GovKeeper, wasmKeeper := keepers.GovKeeper, keepers.WasmKeeper + govKeeper, wasmKeeper := keepers.GovKeeper, keepers.WasmKeeper wasmKeeper.SetParams(ctx, types.Params{ CodeUploadAccess: types.AllowNobody, InstantiateDefaultPermission: types.AccessTypeNobody, @@ -41,11 +41,11 @@ func TestStoreCodeProposal(t *testing.T) { }) // when stored - storedProposal, err := GovKeeper.SubmitProposal(ctx, src) + storedProposal, err := govKeeper.SubmitProposal(ctx, src) require.NoError(t, err) // and proposal execute - handler := GovKeeper.Router().GetRoute(storedProposal.ProposalRoute()) + handler := govKeeper.Router().GetRoute(storedProposal.ProposalRoute()) err = handler(ctx, storedProposal.GetContent()) require.NoError(t, err) @@ -62,7 +62,7 @@ func TestStoreCodeProposal(t *testing.T) { func TestInstantiateProposal(t *testing.T) { ctx, keepers := CreateTestInput(t, false, "staking") - GovKeeper, wasmKeeper := keepers.GovKeeper, keepers.WasmKeeper + govKeeper, wasmKeeper := keepers.GovKeeper, keepers.WasmKeeper wasmKeeper.SetParams(ctx, types.Params{ CodeUploadAccess: types.AllowNobody, InstantiateDefaultPermission: types.AccessTypeNobody, @@ -89,11 +89,11 @@ func TestInstantiateProposal(t *testing.T) { em := sdk.NewEventManager() // when stored - storedProposal, err := GovKeeper.SubmitProposal(ctx, src) + storedProposal, err := govKeeper.SubmitProposal(ctx, src) require.NoError(t, err) // and proposal execute - handler := GovKeeper.Router().GetRoute(storedProposal.ProposalRoute()) + handler := govKeeper.Router().GetRoute(storedProposal.ProposalRoute()) err = handler(ctx.WithEventManager(em), storedProposal.GetContent()) require.NoError(t, err) @@ -125,7 +125,7 @@ func TestInstantiateProposal(t *testing.T) { func TestInstantiateProposal_NoAdmin(t *testing.T) { ctx, keepers := CreateTestInput(t, false, "staking") - GovKeeper, wasmKeeper := keepers.GovKeeper, keepers.WasmKeeper + govKeeper, wasmKeeper := keepers.GovKeeper, keepers.WasmKeeper wasmKeeper.SetParams(ctx, types.Params{ CodeUploadAccess: types.AllowNobody, InstantiateDefaultPermission: types.AccessTypeNobody, @@ -148,7 +148,7 @@ func TestInstantiateProposal_NoAdmin(t *testing.T) { p.Admin = "invalid" p.Label = "testing" }) - _, err = GovKeeper.SubmitProposal(ctx, src) + _, err = govKeeper.SubmitProposal(ctx, src) require.Error(t, err) // test with no admin @@ -161,11 +161,11 @@ func TestInstantiateProposal_NoAdmin(t *testing.T) { em := sdk.NewEventManager() // when stored - storedProposal, err := GovKeeper.SubmitProposal(ctx, src) + storedProposal, err := govKeeper.SubmitProposal(ctx, src) require.NoError(t, err) // and proposal execute - handler := GovKeeper.Router().GetRoute(storedProposal.ProposalRoute()) + handler := govKeeper.Router().GetRoute(storedProposal.ProposalRoute()) err = handler(ctx.WithEventManager(em), storedProposal.GetContent()) require.NoError(t, err) @@ -197,7 +197,7 @@ func TestInstantiateProposal_NoAdmin(t *testing.T) { func TestMigrateProposal(t *testing.T) { ctx, keepers := CreateTestInput(t, false, "staking") - GovKeeper, wasmKeeper := keepers.GovKeeper, keepers.WasmKeeper + govKeeper, wasmKeeper := keepers.GovKeeper, keepers.WasmKeeper wasmKeeper.SetParams(ctx, types.Params{ CodeUploadAccess: types.AllowNobody, InstantiateDefaultPermission: types.AccessTypeNobody, @@ -242,11 +242,11 @@ func TestMigrateProposal(t *testing.T) { em := sdk.NewEventManager() // when stored - storedProposal, err := GovKeeper.SubmitProposal(ctx, &src) + storedProposal, err := govKeeper.SubmitProposal(ctx, &src) require.NoError(t, err) // and proposal execute - handler := GovKeeper.Router().GetRoute(storedProposal.ProposalRoute()) + handler := govKeeper.Router().GetRoute(storedProposal.ProposalRoute()) err = handler(ctx.WithEventManager(em), storedProposal.GetContent()) require.NoError(t, err) @@ -278,13 +278,13 @@ func TestMigrateProposal(t *testing.T) { func TestExecuteProposal(t *testing.T) { ctx, keepers := CreateTestInput(t, false, "staking") - GovKeeper, BankKeeper := keepers.GovKeeper, keepers.BankKeeper + govKeeper, bankKeeper := keepers.GovKeeper, keepers.BankKeeper exampleContract := InstantiateHackatomExampleContract(t, ctx, keepers) contractAddr := exampleContract.Contract // check balance - bal := BankKeeper.GetBalance(ctx, contractAddr, "denom") + bal := bankKeeper.GetBalance(ctx, contractAddr, "denom") require.Equal(t, bal.Amount, sdk.NewInt(100)) releaseMsg := struct { @@ -305,10 +305,10 @@ func TestExecuteProposal(t *testing.T) { em := sdk.NewEventManager() // fails on store - this doesn't have permission - storedProposal, err := GovKeeper.SubmitProposal(ctx, &badSrc) + storedProposal, err := govKeeper.SubmitProposal(ctx, &badSrc) require.Error(t, err) // balance should not change - bal = BankKeeper.GetBalance(ctx, contractAddr, "denom") + bal = bankKeeper.GetBalance(ctx, contractAddr, "denom") require.Equal(t, bal.Amount, sdk.NewInt(100)) // try again with the proper run-as @@ -323,31 +323,31 @@ func TestExecuteProposal(t *testing.T) { em = sdk.NewEventManager() // when stored - storedProposal, err = GovKeeper.SubmitProposal(ctx, &src) + storedProposal, err = govKeeper.SubmitProposal(ctx, &src) require.NoError(t, err) // and proposal execute - handler := GovKeeper.Router().GetRoute(storedProposal.ProposalRoute()) + handler := govKeeper.Router().GetRoute(storedProposal.ProposalRoute()) err = handler(ctx.WithEventManager(em), storedProposal.GetContent()) require.NoError(t, err) // balance should be empty (proper release) - bal = BankKeeper.GetBalance(ctx, contractAddr, "denom") + bal = bankKeeper.GetBalance(ctx, contractAddr, "denom") require.Equal(t, bal.Amount, sdk.NewInt(0)) } func TestSudoProposal(t *testing.T) { ctx, keepers := CreateTestInput(t, false, "staking") - GovKeeper, BankKeeper := keepers.GovKeeper, keepers.BankKeeper + govKeeper, bankKeeper := keepers.GovKeeper, keepers.BankKeeper exampleContract := InstantiateHackatomExampleContract(t, ctx, keepers) contractAddr := exampleContract.Contract _, _, anyAddr := keyPubAddr() // check balance - bal := BankKeeper.GetBalance(ctx, contractAddr, "denom") + bal := bankKeeper.GetBalance(ctx, contractAddr, "denom") require.Equal(t, bal.Amount, sdk.NewInt(100)) - bal = BankKeeper.GetBalance(ctx, anyAddr, "denom") + bal = bankKeeper.GetBalance(ctx, anyAddr, "denom") require.Equal(t, bal.Amount, sdk.NewInt(0)) type StealMsg struct { @@ -374,18 +374,18 @@ func TestSudoProposal(t *testing.T) { em := sdk.NewEventManager() // when stored - storedProposal, err := GovKeeper.SubmitProposal(ctx, &src) + storedProposal, err := govKeeper.SubmitProposal(ctx, &src) require.NoError(t, err) // and proposal execute - handler := GovKeeper.Router().GetRoute(storedProposal.ProposalRoute()) + handler := govKeeper.Router().GetRoute(storedProposal.ProposalRoute()) err = handler(ctx.WithEventManager(em), storedProposal.GetContent()) require.NoError(t, err) // balance should be empty (and verifier richer) - bal = BankKeeper.GetBalance(ctx, contractAddr, "denom") + bal = bankKeeper.GetBalance(ctx, contractAddr, "denom") require.Equal(t, bal.Amount, sdk.NewInt(25)) - bal = BankKeeper.GetBalance(ctx, anyAddr, "denom") + bal = bankKeeper.GetBalance(ctx, anyAddr, "denom") require.Equal(t, bal.Amount, sdk.NewInt(75)) } @@ -448,7 +448,7 @@ func TestAdminProposals(t *testing.T) { for msg, spec := range specs { t.Run(msg, func(t *testing.T) { ctx, keepers := CreateTestInput(t, false, "staking") - GovKeeper, wasmKeeper := keepers.GovKeeper, keepers.WasmKeeper + govKeeper, wasmKeeper := keepers.GovKeeper, keepers.WasmKeeper wasmKeeper.SetParams(ctx, types.Params{ CodeUploadAccess: types.AllowNobody, InstantiateDefaultPermission: types.AccessTypeNobody, @@ -459,11 +459,11 @@ func TestAdminProposals(t *testing.T) { require.NoError(t, wasmKeeper.importContract(ctx, contractAddr, &spec.state, []types.Model{})) // when stored - storedProposal, err := GovKeeper.SubmitProposal(ctx, spec.srcProposal) + storedProposal, err := govKeeper.SubmitProposal(ctx, spec.srcProposal) require.NoError(t, err) // and execute proposal - handler := GovKeeper.Router().GetRoute(storedProposal.ProposalRoute()) + handler := govKeeper.Router().GetRoute(storedProposal.ProposalRoute()) err = handler(ctx, storedProposal.GetContent()) require.NoError(t, err) @@ -477,7 +477,7 @@ func TestAdminProposals(t *testing.T) { func TestUpdateParamsProposal(t *testing.T) { ctx, keepers := CreateTestInput(t, false, "staking") - GovKeeper, wasmKeeper := keepers.GovKeeper, keepers.WasmKeeper + govKeeper, wasmKeeper := keepers.GovKeeper, keepers.WasmKeeper var ( legacyAmino = keepers.EncodingConfig.Amino @@ -556,11 +556,11 @@ func TestUpdateParamsProposal(t *testing.T) { Changes: jsonProposal.Changes.ToParamChanges(), } // when stored - storedProposal, err := GovKeeper.SubmitProposal(ctx, &proposal) + storedProposal, err := govKeeper.SubmitProposal(ctx, &proposal) require.NoError(t, err) // and proposal execute - handler := GovKeeper.Router().GetRoute(storedProposal.ProposalRoute()) + handler := govKeeper.Router().GetRoute(storedProposal.ProposalRoute()) err = handler(ctx, storedProposal.GetContent()) require.NoError(t, err) @@ -574,7 +574,7 @@ func TestUpdateParamsProposal(t *testing.T) { func TestPinCodesProposal(t *testing.T) { ctx, keepers := CreateTestInput(t, false, "staking") - GovKeeper, wasmKeeper := keepers.GovKeeper, keepers.WasmKeeper + govKeeper, wasmKeeper := keepers.GovKeeper, keepers.WasmKeeper mock := wasmtesting.MockWasmer{ CreateFn: wasmtesting.NoOpCreateFn, @@ -639,7 +639,7 @@ func TestPinCodesProposal(t *testing.T) { } // when stored - storedProposal, gotErr := GovKeeper.SubmitProposal(ctx, &proposal) + storedProposal, gotErr := govKeeper.SubmitProposal(ctx, &proposal) if spec.expErr { require.Error(t, gotErr) return @@ -647,7 +647,7 @@ func TestPinCodesProposal(t *testing.T) { require.NoError(t, gotErr) // and proposal execute - handler := GovKeeper.Router().GetRoute(storedProposal.ProposalRoute()) + handler := govKeeper.Router().GetRoute(storedProposal.ProposalRoute()) gotErr = handler(ctx, storedProposal.GetContent()) require.NoError(t, gotErr) @@ -662,7 +662,7 @@ func TestPinCodesProposal(t *testing.T) { func TestUnpinCodesProposal(t *testing.T) { ctx, keepers := CreateTestInput(t, false, "staking") - GovKeeper, wasmKeeper := keepers.GovKeeper, keepers.WasmKeeper + govKeeper, wasmKeeper := keepers.GovKeeper, keepers.WasmKeeper mock := wasmtesting.MockWasmer{ CreateFn: wasmtesting.NoOpCreateFn, @@ -727,7 +727,7 @@ func TestUnpinCodesProposal(t *testing.T) { } // when stored - storedProposal, gotErr := GovKeeper.SubmitProposal(ctx, &proposal) + storedProposal, gotErr := govKeeper.SubmitProposal(ctx, &proposal) if spec.expErr { require.Error(t, gotErr) return @@ -735,7 +735,7 @@ func TestUnpinCodesProposal(t *testing.T) { require.NoError(t, gotErr) // and proposal execute - handler := GovKeeper.Router().GetRoute(storedProposal.ProposalRoute()) + handler := govKeeper.Router().GetRoute(storedProposal.ProposalRoute()) gotErr = handler(ctx, storedProposal.GetContent()) require.NoError(t, gotErr) @@ -750,7 +750,7 @@ func TestUnpinCodesProposal(t *testing.T) { func TestUpdateInstantiateConfigProposal(t *testing.T) { ctx, keepers := CreateTestInput(t, false, "staking") - GovKeeper, wasmKeeper := keepers.GovKeeper, keepers.WasmKeeper + govKeeper, wasmKeeper := keepers.GovKeeper, keepers.WasmKeeper mock := wasmtesting.MockWasmer{ CreateFn: wasmtesting.NoOpCreateFn, @@ -821,7 +821,7 @@ func TestUpdateInstantiateConfigProposal(t *testing.T) { } // when stored - storedProposal, gotErr := GovKeeper.SubmitProposal(ctx, &proposal) + storedProposal, gotErr := govKeeper.SubmitProposal(ctx, &proposal) if spec.expErr { require.Error(t, gotErr) return @@ -829,7 +829,7 @@ func TestUpdateInstantiateConfigProposal(t *testing.T) { require.NoError(t, gotErr) // and proposal execute - handler := GovKeeper.Router().GetRoute(storedProposal.ProposalRoute()) + handler := govKeeper.Router().GetRoute(storedProposal.ProposalRoute()) gotErr = handler(ctx, storedProposal.GetContent()) require.NoError(t, gotErr) diff --git a/x/wasm/keeper/query_plugins_test.go b/x/wasm/keeper/query_plugins_test.go index c62e03c5db..c58932d67e 100644 --- a/x/wasm/keeper/query_plugins_test.go +++ b/x/wasm/keeper/query_plugins_test.go @@ -319,7 +319,7 @@ func TestIBCQuerier(t *testing.T) { } func TestBankQuerierBalance(t *testing.T) { - mock := BankKeeperMock{GetBalanceFn: func(ctx sdk.Context, addr sdk.AccAddress, denom string) sdk.Coin { + mock := bankKeeperMock{GetBalanceFn: func(ctx sdk.Context, addr sdk.AccAddress, denom string) sdk.Coin { return sdk.NewCoin(denom, sdk.NewInt(1)) }} @@ -510,19 +510,19 @@ func (m mockWasmQueryKeeper) IsPinnedCode(ctx sdk.Context, codeID uint64) bool { return m.IsPinnedCodeFn(ctx, codeID) } -type BankKeeperMock struct { +type bankKeeperMock struct { GetBalanceFn func(ctx sdk.Context, addr sdk.AccAddress, denom string) sdk.Coin GetAllBalancesFn func(ctx sdk.Context, addr sdk.AccAddress) sdk.Coins } -func (m BankKeeperMock) GetBalance(ctx sdk.Context, addr sdk.AccAddress, denom string) sdk.Coin { +func (m bankKeeperMock) GetBalance(ctx sdk.Context, addr sdk.AccAddress, denom string) sdk.Coin { if m.GetBalanceFn == nil { panic("not expected to be called") } return m.GetBalanceFn(ctx, addr, denom) } -func (m BankKeeperMock) GetAllBalances(ctx sdk.Context, addr sdk.AccAddress) sdk.Coins { +func (m bankKeeperMock) GetAllBalances(ctx sdk.Context, addr sdk.AccAddress) sdk.Coins { if m.GetAllBalancesFn == nil { panic("not expected to be called") } diff --git a/x/wasm/keeper/reflect_test.go b/x/wasm/keeper/reflect_test.go index ed3d6eb7fe..2f89a265c4 100644 --- a/x/wasm/keeper/reflect_test.go +++ b/x/wasm/keeper/reflect_test.go @@ -40,7 +40,7 @@ const ReflectFeatures = "staking,mask,stargate" func TestReflectContractSend(t *testing.T) { cdc := MakeEncodingConfig(t).Marshaler ctx, keepers := CreateTestInput(t, false, ReflectFeatures, WithMessageEncoders(reflectEncoders(cdc))) - accKeeper, keeper, BankKeeper := keepers.AccountKeeper, keepers.ContractKeeper, keepers.BankKeeper + accKeeper, keeper, bankKeeper := keepers.AccountKeeper, keepers.ContractKeeper, keepers.BankKeeper deposit := sdk.NewCoins(sdk.NewInt64Coin("denom", 100000)) creator := keepers.Faucet.NewFundedAccount(ctx, deposit...) @@ -77,10 +77,10 @@ func TestReflectContractSend(t *testing.T) { require.NotEmpty(t, escrowAddr) // let's make sure all balances make sense - checkAccount(t, ctx, accKeeper, BankKeeper, creator, sdk.NewCoins(sdk.NewInt64Coin("denom", 35000))) // 100k - 40k - 25k - checkAccount(t, ctx, accKeeper, BankKeeper, reflectAddr, reflectStart) - checkAccount(t, ctx, accKeeper, BankKeeper, escrowAddr, escrowStart) - checkAccount(t, ctx, accKeeper, BankKeeper, bob, nil) + checkAccount(t, ctx, accKeeper, bankKeeper, creator, sdk.NewCoins(sdk.NewInt64Coin("denom", 35000))) // 100k - 40k - 25k + checkAccount(t, ctx, accKeeper, bankKeeper, reflectAddr, reflectStart) + checkAccount(t, ctx, accKeeper, bankKeeper, escrowAddr, escrowStart) + checkAccount(t, ctx, accKeeper, bankKeeper, bob, nil) // now for the trick.... we reflect a message through the reflect to call the escrow // we also send an additional 14k tokens there. @@ -110,16 +110,16 @@ func TestReflectContractSend(t *testing.T) { require.NoError(t, err) // did this work??? - checkAccount(t, ctx, accKeeper, BankKeeper, creator, sdk.NewCoins(sdk.NewInt64Coin("denom", 35000))) // same as before - checkAccount(t, ctx, accKeeper, BankKeeper, reflectAddr, sdk.NewCoins(sdk.NewInt64Coin("denom", 26000))) // 40k - 14k (from send) - checkAccount(t, ctx, accKeeper, BankKeeper, escrowAddr, sdk.Coins{}) // emptied reserved - checkAccount(t, ctx, accKeeper, BankKeeper, bob, sdk.NewCoins(sdk.NewInt64Coin("denom", 39000))) // all escrow of 25k + 14k + checkAccount(t, ctx, accKeeper, bankKeeper, creator, sdk.NewCoins(sdk.NewInt64Coin("denom", 35000))) // same as before + checkAccount(t, ctx, accKeeper, bankKeeper, reflectAddr, sdk.NewCoins(sdk.NewInt64Coin("denom", 26000))) // 40k - 14k (from send) + checkAccount(t, ctx, accKeeper, bankKeeper, escrowAddr, sdk.Coins{}) // emptied reserved + checkAccount(t, ctx, accKeeper, bankKeeper, bob, sdk.NewCoins(sdk.NewInt64Coin("denom", 39000))) // all escrow of 25k + 14k } func TestReflectCustomMsg(t *testing.T) { cdc := MakeEncodingConfig(t).Marshaler ctx, keepers := CreateTestInput(t, false, ReflectFeatures, WithMessageEncoders(reflectEncoders(cdc)), WithQueryPlugins(reflectPlugins())) - accKeeper, keeper, BankKeeper := keepers.AccountKeeper, keepers.ContractKeeper, keepers.BankKeeper + accKeeper, keeper, bankKeeper := keepers.AccountKeeper, keepers.ContractKeeper, keepers.BankKeeper deposit := sdk.NewCoins(sdk.NewInt64Coin("denom", 100000)) creator := keepers.Faucet.NewFundedAccount(ctx, deposit...) @@ -149,9 +149,9 @@ func TestReflectCustomMsg(t *testing.T) { require.NoError(t, err) // check some account values - checkAccount(t, ctx, accKeeper, BankKeeper, contractAddr, contractStart) - checkAccount(t, ctx, accKeeper, BankKeeper, bob, deposit) - checkAccount(t, ctx, accKeeper, BankKeeper, fred, nil) + checkAccount(t, ctx, accKeeper, bankKeeper, contractAddr, contractStart) + checkAccount(t, ctx, accKeeper, bankKeeper, bob, deposit) + checkAccount(t, ctx, accKeeper, bankKeeper, fred, nil) // bob can send contract's tokens to fred (using SendMsg) msgs := []wasmvmtypes.CosmosMsg{{ @@ -176,10 +176,10 @@ func TestReflectCustomMsg(t *testing.T) { require.NoError(t, err) // fred got coins - checkAccount(t, ctx, accKeeper, BankKeeper, fred, sdk.NewCoins(sdk.NewInt64Coin("denom", 15000))) + checkAccount(t, ctx, accKeeper, bankKeeper, fred, sdk.NewCoins(sdk.NewInt64Coin("denom", 15000))) // contract lost them - checkAccount(t, ctx, accKeeper, BankKeeper, contractAddr, sdk.NewCoins(sdk.NewInt64Coin("denom", 25000))) - checkAccount(t, ctx, accKeeper, BankKeeper, bob, deposit) + checkAccount(t, ctx, accKeeper, bankKeeper, contractAddr, sdk.NewCoins(sdk.NewInt64Coin("denom", 25000))) + checkAccount(t, ctx, accKeeper, bankKeeper, bob, deposit) // construct an opaque message var sdkSendMsg sdk.Msg = &banktypes.MsgSend{ @@ -201,10 +201,10 @@ func TestReflectCustomMsg(t *testing.T) { require.NoError(t, err) // fred got more coins - checkAccount(t, ctx, accKeeper, BankKeeper, fred, sdk.NewCoins(sdk.NewInt64Coin("denom", 38000))) + checkAccount(t, ctx, accKeeper, bankKeeper, fred, sdk.NewCoins(sdk.NewInt64Coin("denom", 38000))) // contract lost them - checkAccount(t, ctx, accKeeper, BankKeeper, contractAddr, sdk.NewCoins(sdk.NewInt64Coin("denom", 2000))) - checkAccount(t, ctx, accKeeper, BankKeeper, bob, deposit) + checkAccount(t, ctx, accKeeper, bankKeeper, contractAddr, sdk.NewCoins(sdk.NewInt64Coin("denom", 2000))) + checkAccount(t, ctx, accKeeper, bankKeeper, bob, deposit) } func TestMaskReflectCustomQuery(t *testing.T) { @@ -491,7 +491,7 @@ func TestWasmRawQueryWithNil(t *testing.T) { require.Equal(t, []byte{}, reflectRawRes.Data) } -func checkAccount(t *testing.T, ctx sdk.Context, accKeeper authkeeper.AccountKeeper, BankKeeper bankkeeper.Keeper, addr sdk.AccAddress, expected sdk.Coins) { +func checkAccount(t *testing.T, ctx sdk.Context, accKeeper authkeeper.AccountKeeper, bankKeeper bankkeeper.Keeper, addr sdk.AccAddress, expected sdk.Coins) { acct := accKeeper.GetAccount(ctx, addr) if expected == nil { assert.Nil(t, acct) @@ -499,9 +499,9 @@ func checkAccount(t *testing.T, ctx sdk.Context, accKeeper authkeeper.AccountKee assert.NotNil(t, acct) if expected.Empty() { // there is confusion between nil and empty slice... let's just treat them the same - assert.True(t, BankKeeper.GetAllBalances(ctx, acct.GetAddress()).Empty()) + assert.True(t, bankKeeper.GetAllBalances(ctx, acct.GetAddress()).Empty()) } else { - assert.Equal(t, BankKeeper.GetAllBalances(ctx, acct.GetAddress()), expected) + assert.Equal(t, bankKeeper.GetAllBalances(ctx, acct.GetAddress()), expected) } } } diff --git a/x/wasm/keeper/staking_test.go b/x/wasm/keeper/staking_test.go index ac883fdd30..b6d719f135 100644 --- a/x/wasm/keeper/staking_test.go +++ b/x/wasm/keeper/staking_test.go @@ -94,11 +94,11 @@ type InvestmentResponse struct { func TestInitializeStaking(t *testing.T) { ctx, k := CreateTestInput(t, false, SupportedFeatures) - accKeeper, StakingKeeper, keeper, BankKeeper := k.AccountKeeper, k.StakingKeeper, k.ContractKeeper, k.BankKeeper + accKeeper, stakingKeeper, keeper, bankKeeper := k.AccountKeeper, k.StakingKeeper, k.ContractKeeper, k.BankKeeper - valAddr := addValidator(t, ctx, StakingKeeper, k.Faucet, sdk.NewInt64Coin("stake", 1234567)) - ctx = nextBlock(ctx, StakingKeeper) - v, found := StakingKeeper.GetValidator(ctx, valAddr) + valAddr := addValidator(t, ctx, stakingKeeper, k.Faucet, sdk.NewInt64Coin("stake", 1234567)) + ctx = nextBlock(ctx, stakingKeeper) + v, found := stakingKeeper.GetValidator(ctx, valAddr) assert.True(t, found) assert.Equal(t, v.GetDelegatorShares(), sdk.NewDec(1234567)) @@ -129,7 +129,7 @@ func TestInitializeStaking(t *testing.T) { require.NotEmpty(t, stakingAddr) // nothing spent here - checkAccount(t, ctx, accKeeper, BankKeeper, creator, deposit) + checkAccount(t, ctx, accKeeper, bankKeeper, creator, deposit) // try to register with a validator not on the list and it fails _, _, bob := keyPubAddr() @@ -148,7 +148,7 @@ func TestInitializeStaking(t *testing.T) { require.Error(t, err) // no changes to bonding shares - val, _ := StakingKeeper.GetValidator(ctx, valAddr) + val, _ := stakingKeeper.GetValidator(ctx, valAddr) assert.Equal(t, val.GetDelegatorShares(), sdk.NewDec(1234567)) } @@ -159,20 +159,20 @@ type initInfo struct { ctx sdk.Context accKeeper authkeeper.AccountKeeper - StakingKeeper stakingkeeper.Keeper + stakingKeeper stakingkeeper.Keeper distKeeper distributionkeeper.Keeper wasmKeeper Keeper contractKeeper wasmtypes.ContractOpsKeeper - BankKeeper bankkeeper.Keeper + bankKeeper bankkeeper.Keeper faucet *TestFaucet } func initializeStaking(t *testing.T) initInfo { ctx, k := CreateTestInput(t, false, SupportedFeatures) - accKeeper, StakingKeeper, keeper, BankKeeper := k.AccountKeeper, k.StakingKeeper, k.WasmKeeper, k.BankKeeper + accKeeper, stakingKeeper, keeper, bankKeeper := k.AccountKeeper, k.StakingKeeper, k.WasmKeeper, k.BankKeeper - valAddr := addValidator(t, ctx, StakingKeeper, k.Faucet, sdk.NewInt64Coin("stake", 1000000)) - ctx = nextBlock(ctx, StakingKeeper) + valAddr := addValidator(t, ctx, stakingKeeper, k.Faucet, sdk.NewInt64Coin("stake", 1000000)) + ctx = nextBlock(ctx, stakingKeeper) // set some baseline - this seems to be needed k.DistKeeper.SetValidatorHistoricalRewards(ctx, valAddr, 0, distributiontypes.ValidatorHistoricalRewards{ @@ -180,7 +180,7 @@ func initializeStaking(t *testing.T) initInfo { ReferenceCount: 1, }) - v, found := StakingKeeper.GetValidator(ctx, valAddr) + v, found := stakingKeeper.GetValidator(ctx, valAddr) assert.True(t, found) assert.Equal(t, v.GetDelegatorShares(), sdk.NewDec(1000000)) assert.Equal(t, v.Status, stakingtypes.Bonded) @@ -217,10 +217,10 @@ func initializeStaking(t *testing.T) initInfo { contractAddr: stakingAddr, ctx: ctx, accKeeper: accKeeper, - StakingKeeper: StakingKeeper, + stakingKeeper: stakingKeeper, wasmKeeper: *keeper, distKeeper: k.DistKeeper, - BankKeeper: BankKeeper, + bankKeeper: bankKeeper, contractKeeper: k.ContractKeeper, faucet: k.Faucet, } @@ -229,10 +229,10 @@ func initializeStaking(t *testing.T) initInfo { func TestBonding(t *testing.T) { initInfo := initializeStaking(t) ctx, valAddr, contractAddr := initInfo.ctx, initInfo.valAddr, initInfo.contractAddr - keeper, StakingKeeper, accKeeper, BankKeeper := initInfo.wasmKeeper, initInfo.StakingKeeper, initInfo.accKeeper, initInfo.BankKeeper + keeper, stakingKeeper, accKeeper, bankKeeper := initInfo.wasmKeeper, initInfo.stakingKeeper, initInfo.accKeeper, initInfo.bankKeeper // initial checks of bonding state - val, found := StakingKeeper.GetValidator(ctx, valAddr) + val, found := stakingKeeper.GetValidator(ctx, valAddr) require.True(t, found) initPower := val.GetDelegatorShares() @@ -255,16 +255,16 @@ func TestBonding(t *testing.T) { require.NoError(t, err) // check some account values - the money is on neither account (cuz it is bonded) - checkAccount(t, ctx, accKeeper, BankKeeper, contractAddr, sdk.Coins{}) - checkAccount(t, ctx, accKeeper, BankKeeper, bob, funds) + checkAccount(t, ctx, accKeeper, bankKeeper, contractAddr, sdk.Coins{}) + checkAccount(t, ctx, accKeeper, bankKeeper, bob, funds) // make sure the proper number of tokens have been bonded - val, _ = StakingKeeper.GetValidator(ctx, valAddr) + val, _ = stakingKeeper.GetValidator(ctx, valAddr) finalPower := val.GetDelegatorShares() assert.Equal(t, sdk.NewInt(80000), finalPower.Sub(initPower).TruncateInt()) // check the delegation itself - d, found := StakingKeeper.GetDelegation(ctx, contractAddr, valAddr) + d, found := stakingKeeper.GetDelegation(ctx, contractAddr, valAddr) require.True(t, found) assert.Equal(t, d.Shares, sdk.MustNewDecFromStr("80000")) @@ -277,10 +277,10 @@ func TestBonding(t *testing.T) { func TestUnbonding(t *testing.T) { initInfo := initializeStaking(t) ctx, valAddr, contractAddr := initInfo.ctx, initInfo.valAddr, initInfo.contractAddr - keeper, StakingKeeper, accKeeper, BankKeeper := initInfo.wasmKeeper, initInfo.StakingKeeper, initInfo.accKeeper, initInfo.BankKeeper + keeper, stakingKeeper, accKeeper, bankKeeper := initInfo.wasmKeeper, initInfo.stakingKeeper, initInfo.accKeeper, initInfo.bankKeeper // initial checks of bonding state - val, found := StakingKeeper.GetValidator(ctx, valAddr) + val, found := stakingKeeper.GetValidator(ctx, valAddr) require.True(t, found) initPower := val.GetDelegatorShares() @@ -298,7 +298,7 @@ func TestUnbonding(t *testing.T) { require.NoError(t, err) // update height a bit - ctx = nextBlock(ctx, StakingKeeper) + ctx = nextBlock(ctx, stakingKeeper) // now unbond 30k - note that 3k (10%) goes to the owner as a tax, 27k unbonded and available as claims unbond := StakingHandleMsg{ @@ -313,21 +313,21 @@ func TestUnbonding(t *testing.T) { // check some account values - the money is on neither account (cuz it is bonded) // Note: why is this immediate? just test setup? - checkAccount(t, ctx, accKeeper, BankKeeper, contractAddr, sdk.Coins{}) - checkAccount(t, ctx, accKeeper, BankKeeper, bob, funds) + checkAccount(t, ctx, accKeeper, bankKeeper, contractAddr, sdk.Coins{}) + checkAccount(t, ctx, accKeeper, bankKeeper, bob, funds) // make sure the proper number of tokens have been bonded (80k - 27k = 53k) - val, _ = StakingKeeper.GetValidator(ctx, valAddr) + val, _ = stakingKeeper.GetValidator(ctx, valAddr) finalPower := val.GetDelegatorShares() assert.Equal(t, sdk.NewInt(53000), finalPower.Sub(initPower).TruncateInt(), finalPower.String()) // check the delegation itself - d, found := StakingKeeper.GetDelegation(ctx, contractAddr, valAddr) + d, found := stakingKeeper.GetDelegation(ctx, contractAddr, valAddr) require.True(t, found) assert.Equal(t, d.Shares, sdk.MustNewDecFromStr("53000")) // check there is unbonding in progress - un, found := StakingKeeper.GetUnbondingDelegation(ctx, contractAddr, valAddr) + un, found := stakingKeeper.GetUnbondingDelegation(ctx, contractAddr, valAddr) require.True(t, found) require.Equal(t, 1, len(un.Entries)) assert.Equal(t, "27000", un.Entries[0].Balance.String()) @@ -342,11 +342,11 @@ func TestUnbonding(t *testing.T) { func TestReinvest(t *testing.T) { initInfo := initializeStaking(t) ctx, valAddr, contractAddr := initInfo.ctx, initInfo.valAddr, initInfo.contractAddr - keeper, StakingKeeper, accKeeper, BankKeeper := initInfo.wasmKeeper, initInfo.StakingKeeper, initInfo.accKeeper, initInfo.BankKeeper + keeper, stakingKeeper, accKeeper, bankKeeper := initInfo.wasmKeeper, initInfo.stakingKeeper, initInfo.accKeeper, initInfo.bankKeeper distKeeper := initInfo.distKeeper // initial checks of bonding state - val, found := StakingKeeper.GetValidator(ctx, valAddr) + val, found := stakingKeeper.GetValidator(ctx, valAddr) require.True(t, found) initPower := val.GetDelegatorShares() assert.Equal(t, val.Tokens, sdk.NewInt(1000000), "%s", val.Tokens) @@ -367,9 +367,9 @@ func TestReinvest(t *testing.T) { require.NoError(t, err) // update height a bit to solidify the delegation - ctx = nextBlock(ctx, StakingKeeper) + ctx = nextBlock(ctx, stakingKeeper) // we get 1/6, our share should be 40k minus 10% commission = 36k - setValidatorRewards(ctx, StakingKeeper, distKeeper, valAddr, "240000") + setValidatorRewards(ctx, stakingKeeper, distKeeper, valAddr, "240000") // this should withdraw our outstanding 36k of rewards and reinvest them in the same delegation reinvest := StakingHandleMsg{ @@ -382,22 +382,22 @@ func TestReinvest(t *testing.T) { // check some account values - the money is on neither account (cuz it is bonded) // Note: why is this immediate? just test setup? - checkAccount(t, ctx, accKeeper, BankKeeper, contractAddr, sdk.Coins{}) - checkAccount(t, ctx, accKeeper, BankKeeper, bob, funds) + checkAccount(t, ctx, accKeeper, bankKeeper, contractAddr, sdk.Coins{}) + checkAccount(t, ctx, accKeeper, bankKeeper, bob, funds) // check the delegation itself - d, found := StakingKeeper.GetDelegation(ctx, contractAddr, valAddr) + d, found := stakingKeeper.GetDelegation(ctx, contractAddr, valAddr) require.True(t, found) // we started with 200k and added 36k assert.Equal(t, d.Shares, sdk.MustNewDecFromStr("236000")) // make sure the proper number of tokens have been bonded (80k + 40k = 120k) - val, _ = StakingKeeper.GetValidator(ctx, valAddr) + val, _ = stakingKeeper.GetValidator(ctx, valAddr) finalPower := val.GetDelegatorShares() assert.Equal(t, sdk.NewInt(236000), finalPower.Sub(initPower).TruncateInt(), finalPower.String()) // check there is no unbonding in progress - un, found := StakingKeeper.GetUnbondingDelegation(ctx, contractAddr, valAddr) + un, found := stakingKeeper.GetUnbondingDelegation(ctx, contractAddr, valAddr) assert.False(t, found, "%#v", un) // check we have the desired balance @@ -411,11 +411,11 @@ func TestQueryStakingInfo(t *testing.T) { // STEP 1: take a lot of setup from TestReinvest so we have non-zero info initInfo := initializeStaking(t) ctx, valAddr, contractAddr := initInfo.ctx, initInfo.valAddr, initInfo.contractAddr - keeper, StakingKeeper := initInfo.wasmKeeper, initInfo.StakingKeeper + keeper, stakingKeeper := initInfo.wasmKeeper, initInfo.stakingKeeper distKeeper := initInfo.distKeeper // initial checks of bonding state - val, found := StakingKeeper.GetValidator(ctx, valAddr) + val, found := stakingKeeper.GetValidator(ctx, valAddr) require.True(t, found) assert.Equal(t, sdk.NewInt(1000000), val.Tokens) @@ -435,9 +435,9 @@ func TestQueryStakingInfo(t *testing.T) { require.NoError(t, err) // update height a bit to solidify the delegation - ctx = nextBlock(ctx, StakingKeeper) + ctx = nextBlock(ctx, stakingKeeper) // we get 1/6, our share should be 40k minus 10% commission = 36k - setValidatorRewards(ctx, StakingKeeper, distKeeper, valAddr, "240000") + setValidatorRewards(ctx, stakingKeeper, distKeeper, valAddr, "240000") // see what the current rewards are origReward := distKeeper.GetValidatorCurrentRewards(ctx, valAddr) @@ -588,11 +588,11 @@ func TestQueryStakingPlugin(t *testing.T) { // STEP 1: take a lot of setup from TestReinvest so we have non-zero info initInfo := initializeStaking(t) ctx, valAddr, contractAddr := initInfo.ctx, initInfo.valAddr, initInfo.contractAddr - StakingKeeper := initInfo.StakingKeeper + stakingKeeper := initInfo.stakingKeeper distKeeper := initInfo.distKeeper // initial checks of bonding state - val, found := StakingKeeper.GetValidator(ctx, valAddr) + val, found := stakingKeeper.GetValidator(ctx, valAddr) require.True(t, found) assert.Equal(t, sdk.NewInt(1000000), val.Tokens) @@ -612,9 +612,9 @@ func TestQueryStakingPlugin(t *testing.T) { require.NoError(t, err) // update height a bit to solidify the delegation - ctx = nextBlock(ctx, StakingKeeper) + ctx = nextBlock(ctx, stakingKeeper) // we get 1/6, our share should be 40k minus 10% commission = 36k - setValidatorRewards(ctx, StakingKeeper, distKeeper, valAddr, "240000") + setValidatorRewards(ctx, stakingKeeper, distKeeper, valAddr, "240000") // see what the current rewards are origReward := distKeeper.GetValidatorCurrentRewards(ctx, valAddr) @@ -626,7 +626,7 @@ func TestQueryStakingPlugin(t *testing.T) { Validator: valAddr.String(), }, } - raw, err := StakingQuerier(StakingKeeper, distKeeper)(ctx, &query) + raw, err := StakingQuerier(stakingKeeper, distKeeper)(ctx, &query) require.NoError(t, err) var res wasmvmtypes.DelegationResponse mustParse(t, raw, &res) @@ -651,7 +651,7 @@ func TestQueryStakingPlugin(t *testing.T) { } // adds a few validators and returns a list of validators that are registered -func addValidator(t *testing.T, ctx sdk.Context, StakingKeeper stakingkeeper.Keeper, faucet *TestFaucet, value sdk.Coin) sdk.ValAddress { +func addValidator(t *testing.T, ctx sdk.Context, stakingKeeper stakingkeeper.Keeper, faucet *TestFaucet, value sdk.Coin) sdk.ValAddress { owner := faucet.NewFundedAccount(ctx, value) privKey := secp256k1.GenPrivKey() @@ -676,7 +676,7 @@ func addValidator(t *testing.T, ctx sdk.Context, StakingKeeper stakingkeeper.Kee Value: value, } - h := staking.NewHandler(StakingKeeper) + h := staking.NewHandler(stakingKeeper) _, err = h(ctx, &msg) require.NoError(t, err) return addr @@ -684,16 +684,16 @@ func addValidator(t *testing.T, ctx sdk.Context, StakingKeeper stakingkeeper.Kee // this will commit the current set, update the block height and set historic info // basically, letting two blocks pass -func nextBlock(ctx sdk.Context, StakingKeeper stakingkeeper.Keeper) sdk.Context { - staking.EndBlocker(ctx, StakingKeeper) +func nextBlock(ctx sdk.Context, stakingKeeper stakingkeeper.Keeper) sdk.Context { + staking.EndBlocker(ctx, stakingKeeper) ctx = ctx.WithBlockHeight(ctx.BlockHeight() + 1) - staking.BeginBlocker(ctx, StakingKeeper) + staking.BeginBlocker(ctx, stakingKeeper) return ctx } -func setValidatorRewards(ctx sdk.Context, StakingKeeper stakingkeeper.Keeper, distKeeper distributionkeeper.Keeper, valAddr sdk.ValAddress, reward string) { +func setValidatorRewards(ctx sdk.Context, stakingKeeper stakingkeeper.Keeper, distKeeper distributionkeeper.Keeper, valAddr sdk.ValAddress, reward string) { // allocate some rewards - vali := StakingKeeper.Validator(ctx, valAddr) + vali := stakingKeeper.Validator(ctx, valAddr) amount, err := sdk.NewDecFromStr(reward) if err != nil { panic(err) diff --git a/x/wasm/keeper/submsg_test.go b/x/wasm/keeper/submsg_test.go index 201aff7a3b..9d1904fa7f 100644 --- a/x/wasm/keeper/submsg_test.go +++ b/x/wasm/keeper/submsg_test.go @@ -21,7 +21,7 @@ import ( // Try a simple send, no gas limit to for a sanity check before trying table tests func TestDispatchSubMsgSuccessCase(t *testing.T) { ctx, keepers := CreateTestInput(t, false, ReflectFeatures) - accKeeper, keeper, BankKeeper := keepers.AccountKeeper, keepers.WasmKeeper, keepers.BankKeeper + accKeeper, keeper, bankKeeper := keepers.AccountKeeper, keepers.WasmKeeper, keepers.BankKeeper deposit := sdk.NewCoins(sdk.NewInt64Coin("denom", 100000)) contractStart := sdk.NewCoins(sdk.NewInt64Coin("denom", 40000)) @@ -41,9 +41,9 @@ func TestDispatchSubMsgSuccessCase(t *testing.T) { require.NotEmpty(t, contractAddr) // check some account values - checkAccount(t, ctx, accKeeper, BankKeeper, contractAddr, contractStart) - checkAccount(t, ctx, accKeeper, BankKeeper, creator, creatorBalance) - checkAccount(t, ctx, accKeeper, BankKeeper, fred, nil) + checkAccount(t, ctx, accKeeper, bankKeeper, contractAddr, contractStart) + checkAccount(t, ctx, accKeeper, bankKeeper, creator, creatorBalance) + checkAccount(t, ctx, accKeeper, bankKeeper, fred, nil) // creator can send contract's tokens to fred (using SendMsg) msg := wasmvmtypes.CosmosMsg{ @@ -72,10 +72,10 @@ func TestDispatchSubMsgSuccessCase(t *testing.T) { require.NoError(t, err) // fred got coins - checkAccount(t, ctx, accKeeper, BankKeeper, fred, sdk.NewCoins(sdk.NewInt64Coin("denom", 15000))) + checkAccount(t, ctx, accKeeper, bankKeeper, fred, sdk.NewCoins(sdk.NewInt64Coin("denom", 15000))) // contract lost them - checkAccount(t, ctx, accKeeper, BankKeeper, contractAddr, sdk.NewCoins(sdk.NewInt64Coin("denom", 25000))) - checkAccount(t, ctx, accKeeper, BankKeeper, creator, creatorBalance) + checkAccount(t, ctx, accKeeper, bankKeeper, contractAddr, sdk.NewCoins(sdk.NewInt64Coin("denom", 25000))) + checkAccount(t, ctx, accKeeper, bankKeeper, creator, creatorBalance) // query the reflect state to ensure the result was stored query := testdata.ReflectQueryMsg{ diff --git a/x/wasm/keeper/test_common.go b/x/wasm/keeper/test_common.go index b4b5f52f67..717228962d 100644 --- a/x/wasm/keeper/test_common.go +++ b/x/wasm/keeper/test_common.go @@ -124,7 +124,7 @@ var TestingStakeParams = stakingtypes.Params{ type TestFaucet struct { t testing.TB - BankKeeper bankkeeper.Keeper + bankKeeper bankkeeper.Keeper sender sdk.AccAddress balance sdk.Coins minterModuleName string @@ -132,7 +132,7 @@ type TestFaucet struct { func NewTestFaucet(t testing.TB, ctx sdk.Context, bankKeeper bankkeeper.Keeper, minterModuleName string, initialAmount ...sdk.Coin) *TestFaucet { require.NotEmpty(t, initialAmount) - r := &TestFaucet{t: t, BankKeeper: bankKeeper, minterModuleName: minterModuleName} + r := &TestFaucet{t: t, bankKeeper: bankKeeper, minterModuleName: minterModuleName} _, _, addr := keyPubAddr() r.sender = addr r.Mint(ctx, addr, initialAmount...) @@ -143,9 +143,9 @@ func NewTestFaucet(t testing.TB, ctx sdk.Context, bankKeeper bankkeeper.Keeper, func (f *TestFaucet) Mint(parentCtx sdk.Context, addr sdk.AccAddress, amounts ...sdk.Coin) { require.NotEmpty(f.t, amounts) ctx := parentCtx.WithEventManager(sdk.NewEventManager()) // discard all faucet related events - err := f.BankKeeper.MintCoins(ctx, f.minterModuleName, amounts) + err := f.bankKeeper.MintCoins(ctx, f.minterModuleName, amounts) require.NoError(f.t, err) - err = f.BankKeeper.SendCoinsFromModuleToAccount(ctx, f.minterModuleName, addr, amounts) + err = f.bankKeeper.SendCoinsFromModuleToAccount(ctx, f.minterModuleName, addr, amounts) require.NoError(f.t, err) f.balance = f.balance.Add(amounts...) } @@ -157,7 +157,7 @@ func (f *TestFaucet) Fund(parentCtx sdk.Context, receiver sdk.AccAddress, amount f.Mint(parentCtx, f.sender, amounts...) } ctx := parentCtx.WithEventManager(sdk.NewEventManager()) // discard all faucet related events - err := f.BankKeeper.SendCoins(ctx, f.sender, receiver, amounts) + err := f.bankKeeper.SendCoins(ctx, f.sender, receiver, amounts) require.NoError(f.t, err) f.balance = f.balance.Sub(amounts) } @@ -238,7 +238,7 @@ func createTestInput( encodingConfig := MakeEncodingConfig(t) appCodec, legacyAmino := encodingConfig.Marshaler, encodingConfig.Amino - ParamsKeeper := paramskeeper.NewKeeper( + paramsKeeper := paramskeeper.NewKeeper( appCodec, legacyAmino, keys[paramstypes.StoreKey], @@ -258,10 +258,10 @@ func createTestInput( govtypes.ModuleName, types.ModuleName, } { - ParamsKeeper.Subspace(m) + paramsKeeper.Subspace(m) } subspace := func(m string) paramstypes.Subspace { - r, ok := ParamsKeeper.GetSubspace(m) + r, ok := paramsKeeper.GetSubspace(m) require.True(t, ok) return r } @@ -275,7 +275,7 @@ func createTestInput( ibctransfertypes.ModuleName: {authtypes.Minter, authtypes.Burner}, types.ModuleName: {authtypes.Burner}, } - AccountKeeper := authkeeper.NewAccountKeeper( + accountKeeper := authkeeper.NewAccountKeeper( appCodec, keys[authtypes.StoreKey], // target store subspace(authtypes.ModuleName), @@ -287,41 +287,41 @@ func createTestInput( blockedAddrs[authtypes.NewModuleAddress(acc).String()] = true } - BankKeeper := bankkeeper.NewBaseKeeper( + bankKeeper := bankkeeper.NewBaseKeeper( appCodec, keys[banktypes.StoreKey], - AccountKeeper, + accountKeeper, subspace(banktypes.ModuleName), blockedAddrs, ) - BankKeeper.SetParams(ctx, banktypes.DefaultParams()) + bankKeeper.SetParams(ctx, banktypes.DefaultParams()) - StakingKeeper := stakingkeeper.NewKeeper( + stakingKeeper := stakingkeeper.NewKeeper( appCodec, keys[stakingtypes.StoreKey], - AccountKeeper, - BankKeeper, + accountKeeper, + bankKeeper, subspace(stakingtypes.ModuleName), ) - StakingKeeper.SetParams(ctx, TestingStakeParams) + stakingKeeper.SetParams(ctx, TestingStakeParams) distKeeper := distributionkeeper.NewKeeper( appCodec, keys[distributiontypes.StoreKey], subspace(distributiontypes.ModuleName), - AccountKeeper, - BankKeeper, - StakingKeeper, + accountKeeper, + bankKeeper, + stakingKeeper, authtypes.FeeCollectorName, nil, ) distKeeper.SetParams(ctx, distributiontypes.DefaultParams()) - StakingKeeper.SetHooks(distKeeper.Hooks()) + stakingKeeper.SetHooks(distKeeper.Hooks()) // set genesis items required for distribution distKeeper.SetFeePool(ctx, distributiontypes.InitialFeePool()) - UpgradeKeeper := upgradekeeper.NewKeeper( + upgradeKeeper := upgradekeeper.NewKeeper( map[int64]bool{}, keys[upgradetypes.StoreKey], appCodec, @@ -329,35 +329,35 @@ func createTestInput( nil, ) - faucet := NewTestFaucet(t, ctx, BankKeeper, minttypes.ModuleName, sdk.NewCoin("stake", sdk.NewInt(100_000_000_000))) + faucet := NewTestFaucet(t, ctx, bankKeeper, minttypes.ModuleName, sdk.NewCoin("stake", sdk.NewInt(100_000_000_000))) // set some funds ot pay out validatores, based on code from: // https://github.com/cosmos/cosmos-sdk/blob/fea231556aee4d549d7551a6190389c4328194eb/x/distribution/keeper/keeper_test.go#L50-L57 distrAcc := distKeeper.GetDistributionAccount(ctx) faucet.Fund(ctx, distrAcc.GetAddress(), sdk.NewCoin("stake", sdk.NewInt(2000000))) - AccountKeeper.SetModuleAccount(ctx, distrAcc) + accountKeeper.SetModuleAccount(ctx, distrAcc) - CapabilityKeeper := capabilitykeeper.NewKeeper( + capabilityKeeper := capabilitykeeper.NewKeeper( appCodec, keys[capabilitytypes.StoreKey], memKeys[capabilitytypes.MemStoreKey], ) - scopedIBCKeeper := CapabilityKeeper.ScopeToModule(ibchost.ModuleName) - scopedWasmKeeper := CapabilityKeeper.ScopeToModule(types.ModuleName) + scopedIBCKeeper := capabilityKeeper.ScopeToModule(ibchost.ModuleName) + scopedWasmKeeper := capabilityKeeper.ScopeToModule(types.ModuleName) ibcKeeper := ibckeeper.NewKeeper( appCodec, keys[ibchost.StoreKey], subspace(ibchost.ModuleName), - StakingKeeper, - UpgradeKeeper, + stakingKeeper, + upgradeKeeper, scopedIBCKeeper, ) router := baseapp.NewRouter() - bh := bank.NewHandler(BankKeeper) + bh := bank.NewHandler(bankKeeper) router.AddRoute(sdk.NewRoute(banktypes.RouterKey, bh)) - sh := staking.NewHandler(StakingKeeper) + sh := staking.NewHandler(stakingKeeper) router.AddRoute(sdk.NewRoute(stakingtypes.RouterKey, sh)) dh := distribution.NewHandler(distKeeper) router.AddRoute(sdk.NewRoute(distributiontypes.RouterKey, dh)) @@ -374,9 +374,9 @@ func createTestInput( appCodec, keys[types.StoreKey], subspace(types.ModuleName), - AccountKeeper, - BankKeeper, - StakingKeeper, + accountKeeper, + bankKeeper, + stakingKeeper, distKeeper, ibcKeeper.ChannelKeeper, &ibcKeeper.PortKeeper, @@ -395,9 +395,9 @@ func createTestInput( router.AddRoute(sdk.NewRoute(types.RouterKey, TestHandler(contractKeeper))) am := module.NewManager( // minimal module set that we use for message/ query tests - bank.NewAppModule(appCodec, BankKeeper, AccountKeeper), - staking.NewAppModule(appCodec, StakingKeeper, AccountKeeper, BankKeeper), - distribution.NewAppModule(appCodec, distKeeper, AccountKeeper, BankKeeper, StakingKeeper), + bank.NewAppModule(appCodec, bankKeeper, accountKeeper), + staking.NewAppModule(appCodec, stakingKeeper, accountKeeper, bankKeeper), + distribution.NewAppModule(appCodec, distKeeper, accountKeeper, bankKeeper, stakingKeeper), ) am.RegisterServices(module.NewConfigurator(appCodec, msgRouter, querier)) types.RegisterMsgServer(msgRouter, NewMsgServerImpl(NewDefaultPermissionKeeper(keeper))) @@ -405,33 +405,33 @@ func createTestInput( govRouter := govtypes.NewRouter(). AddRoute(govtypes.RouterKey, govtypes.ProposalHandler). - AddRoute(paramproposal.RouterKey, params.NewParamChangeProposalHandler(ParamsKeeper)). + AddRoute(paramproposal.RouterKey, params.NewParamChangeProposalHandler(paramsKeeper)). AddRoute(distributiontypes.RouterKey, distribution.NewCommunityPoolSpendProposalHandler(distKeeper)). AddRoute(types.RouterKey, NewWasmProposalHandler(&keeper, types.EnableAllProposals)) - GovKeeper := govkeeper.NewKeeper( + govKeeper := govkeeper.NewKeeper( appCodec, keys[govtypes.StoreKey], subspace(govtypes.ModuleName).WithKeyTable(govtypes.ParamKeyTable()), - AccountKeeper, - BankKeeper, - StakingKeeper, + accountKeeper, + bankKeeper, + stakingKeeper, govRouter, ) - GovKeeper.SetProposalID(ctx, govtypes.DefaultStartingProposalID) - GovKeeper.SetDepositParams(ctx, govtypes.DefaultDepositParams()) - GovKeeper.SetVotingParams(ctx, govtypes.DefaultVotingParams()) - GovKeeper.SetTallyParams(ctx, govtypes.DefaultTallyParams()) + govKeeper.SetProposalID(ctx, govtypes.DefaultStartingProposalID) + govKeeper.SetDepositParams(ctx, govtypes.DefaultDepositParams()) + govKeeper.SetVotingParams(ctx, govtypes.DefaultVotingParams()) + govKeeper.SetTallyParams(ctx, govtypes.DefaultTallyParams()) keepers := TestKeepers{ - AccountKeeper: AccountKeeper, - StakingKeeper: StakingKeeper, + AccountKeeper: accountKeeper, + StakingKeeper: stakingKeeper, DistKeeper: distKeeper, ContractKeeper: contractKeeper, WasmKeeper: &keeper, - BankKeeper: BankKeeper, - GovKeeper: GovKeeper, + BankKeeper: bankKeeper, + GovKeeper: govKeeper, IBCKeeper: ibcKeeper, Router: router, EncodingConfig: encodingConfig, diff --git a/x/wasm/module.go b/x/wasm/module.go index 47e0e1b3e0..a237a910d4 100644 --- a/x/wasm/module.go +++ b/x/wasm/module.go @@ -103,8 +103,8 @@ type AppModule struct { cdc codec.Codec keeper *Keeper validatorSetSource keeper.ValidatorSetSource - AccountKeeper types.AccountKeeper // for simulation - BankKeeper simulation.BankKeeper + accountKeeper types.AccountKeeper // for simulation + bankKeeper simulation.BankKeeper } // ConsensusVersion is a sequence number for state-breaking change of the @@ -126,8 +126,8 @@ func NewAppModule( cdc: cdc, keeper: keeper, validatorSetSource: validatorSetSource, - AccountKeeper: ak, - BankKeeper: bk, + accountKeeper: ak, + bankKeeper: bk, } } @@ -206,7 +206,7 @@ func (am AppModule) RegisterStoreDecoder(sdr sdk.StoreDecoderRegistry) { // WeightedOperations returns the all the gov module operations with their respective weights. func (am AppModule) WeightedOperations(simState module.SimulationState) []simtypes.WeightedOperation { - return simulation.WeightedOperations(&simState, am.AccountKeeper, am.BankKeeper, am.keeper) + return simulation.WeightedOperations(&simState, am.accountKeeper, am.bankKeeper, am.keeper) } // ____________________________________________________________________________ diff --git a/x/wasm/module_test.go b/x/wasm/module_test.go index 8eddf966cc..ab52363b71 100644 --- a/x/wasm/module_test.go +++ b/x/wasm/module_test.go @@ -29,8 +29,8 @@ type testData struct { ctx sdk.Context acctKeeper authkeeper.AccountKeeper keeper Keeper - BankKeeper bankkeeper.Keeper - StakingKeeper stakingkeeper.Keeper + bankKeeper bankkeeper.Keeper + stakingKeeper stakingkeeper.Keeper faucet *keeper.TestFaucet } @@ -42,8 +42,8 @@ func setupTest(t *testing.T) testData { ctx: ctx, acctKeeper: keepers.AccountKeeper, keeper: *keepers.WasmKeeper, - BankKeeper: keepers.BankKeeper, - StakingKeeper: keepers.StakingKeeper, + bankKeeper: keepers.BankKeeper, + stakingKeeper: keepers.StakingKeeper, faucet: keepers.Faucet, } return data @@ -258,13 +258,13 @@ func TestHandleExecute(t *testing.T) { creatorAcct := data.acctKeeper.GetAccount(data.ctx, creator) require.NotNil(t, creatorAcct) // we started at 2*deposit, should have spent one above - assert.Equal(t, deposit, data.BankKeeper.GetAllBalances(data.ctx, creatorAcct.GetAddress())) + assert.Equal(t, deposit, data.bankKeeper.GetAllBalances(data.ctx, creatorAcct.GetAddress())) // ensure contract has updated balance contractAddr, _ := sdk.AccAddressFromBech32(contractBech32Addr) contractAcct := data.acctKeeper.GetAccount(data.ctx, contractAddr) require.NotNil(t, contractAcct) - assert.Equal(t, deposit, data.BankKeeper.GetAllBalances(data.ctx, contractAcct.GetAddress())) + assert.Equal(t, deposit, data.bankKeeper.GetAllBalances(data.ctx, contractAcct.GetAddress())) execCmd := MsgExecuteContract{ Sender: fred.String(), @@ -314,14 +314,14 @@ func TestHandleExecute(t *testing.T) { // ensure bob now exists and got both payments released bobAcct = data.acctKeeper.GetAccount(data.ctx, bob) require.NotNil(t, bobAcct) - balance := data.BankKeeper.GetAllBalances(data.ctx, bobAcct.GetAddress()) + balance := data.bankKeeper.GetAllBalances(data.ctx, bobAcct.GetAddress()) assert.Equal(t, deposit.Add(topUp...), balance) // ensure contract has updated balance contractAcct = data.acctKeeper.GetAccount(data.ctx, contractAddr) require.NotNil(t, contractAcct) - assert.Equal(t, sdk.Coins{}, data.BankKeeper.GetAllBalances(data.ctx, contractAcct.GetAddress())) + assert.Equal(t, sdk.Coins{}, data.bankKeeper.GetAllBalances(data.ctx, contractAcct.GetAddress())) // ensure all contract state is as after init assertCodeList(t, q, data.ctx, 1) @@ -392,14 +392,14 @@ func TestHandleExecuteEscrow(t *testing.T) { // ensure bob now exists and got both payments released bobAcct := data.acctKeeper.GetAccount(data.ctx, bob) require.NotNil(t, bobAcct) - balance := data.BankKeeper.GetAllBalances(data.ctx, bobAcct.GetAddress()) + balance := data.bankKeeper.GetAllBalances(data.ctx, bobAcct.GetAddress()) assert.Equal(t, deposit.Add(topUp...), balance) // ensure contract has updated balance contractAddr, _ := sdk.AccAddressFromBech32(contractBech32Addr) contractAcct := data.acctKeeper.GetAccount(data.ctx, contractAddr) require.NotNil(t, contractAcct) - assert.Equal(t, sdk.Coins{}, data.BankKeeper.GetAllBalances(data.ctx, contractAcct.GetAddress())) + assert.Equal(t, sdk.Coins{}, data.bankKeeper.GetAllBalances(data.ctx, contractAcct.GetAddress())) } func TestReadWasmConfig(t *testing.T) { diff --git a/x/wasm/relay_test.go b/x/wasm/relay_test.go index d27d3d9860..5edd182d59 100644 --- a/x/wasm/relay_test.go +++ b/x/wasm/relay_test.go @@ -193,10 +193,10 @@ func TestContractCanInitiateIBCTransferMsg(t *testing.T) { require.Equal(t, 0, len(chainB.PendingSendPackets)) // and dest chain balance contains voucher - BankKeeperB := chainB.GetTestSupport().BankKeeper() + bankKeeperB := chainB.GetTestSupport().BankKeeper() expBalance := ibctransfertypes.GetTransferCoin(path.EndpointB.ChannelConfig.PortID, path.EndpointB.ChannelID, coinToSendToB.Denom, coinToSendToB.Amount) gotBalance := chainB.Balance(chainB.SenderAccount.GetAddress(), expBalance.Denom) - assert.Equal(t, expBalance, gotBalance, "got total balance: %s", BankKeeperB.GetAllBalances(chainB.GetContext(), chainB.SenderAccount.GetAddress())) + assert.Equal(t, expBalance, gotBalance, "got total balance: %s", bankKeeperB.GetAllBalances(chainB.GetContext(), chainB.SenderAccount.GetAddress())) } func TestContractCanEmulateIBCTransferMessage(t *testing.T) { @@ -268,10 +268,10 @@ func TestContractCanEmulateIBCTransferMessage(t *testing.T) { require.Equal(t, 0, len(chainB.PendingSendPackets)) // and dest chain balance contains voucher - BankKeeperB := chainB.GetTestSupport().BankKeeper() + bankKeeperB := chainB.GetTestSupport().BankKeeper() expBalance := ibctransfertypes.GetTransferCoin(path.EndpointB.ChannelConfig.PortID, path.EndpointB.ChannelID, coinToSendToB.Denom, coinToSendToB.Amount) gotBalance := chainB.Balance(chainB.SenderAccount.GetAddress(), expBalance.Denom) - assert.Equal(t, expBalance, gotBalance, "got total balance: %s", BankKeeperB.GetAllBalances(chainB.GetContext(), chainB.SenderAccount.GetAddress())) + assert.Equal(t, expBalance, gotBalance, "got total balance: %s", bankKeeperB.GetAllBalances(chainB.GetContext(), chainB.SenderAccount.GetAddress())) } func TestContractCanEmulateIBCTransferMessageWithTimeout(t *testing.T) { From 2cbde48daa497eff4ceb2053bfccc3cb7e20a8fb Mon Sep 17 00:00:00 2001 From: Alex Peters Date: Tue, 23 Aug 2022 15:16:33 +0200 Subject: [PATCH 4/7] Deprecate attribute access helper --- app/test_access.go | 1 + 1 file changed, 1 insertion(+) diff --git a/app/test_access.go b/app/test_access.go index a3c3400aba..d992a89602 100644 --- a/app/test_access.go +++ b/app/test_access.go @@ -18,6 +18,7 @@ import ( "github.com/CosmWasm/wasmd/x/wasm" ) +// Deprecated: use public app attributes directly type TestSupport struct { t testing.TB app *WasmApp From 45a967035780a95a37b541d42fe930914a9f8875 Mon Sep 17 00:00:00 2001 From: Alex Peters Date: Tue, 23 Aug 2022 15:16:50 +0200 Subject: [PATCH 5/7] Formatting only --- app/export.go | 3 ++- x/wasm/simulation/operations.go | 1 + x/wasm/types/types.go | 9 +++++---- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app/export.go b/app/export.go index 65c0866dfa..c494a9b6da 100644 --- a/app/export.go +++ b/app/export.go @@ -46,7 +46,8 @@ func (app *WasmApp) ExportAppStateAndValidators( // prepare for fresh start at zero height // NOTE zero height genesis is a temporary feature which will be deprecated -// in favour of export at a block height +// +// in favour of export at a block height func (app *WasmApp) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs []string) { applyAllowedAddrs := false diff --git a/x/wasm/simulation/operations.go b/x/wasm/simulation/operations.go index 66635a2b73..09bbbd2659 100644 --- a/x/wasm/simulation/operations.go +++ b/x/wasm/simulation/operations.go @@ -21,6 +21,7 @@ import ( ) // Simulation operation weights constants +// //nolint:gosec const ( OpWeightMsgStoreCode = "op_weight_msg_store_code" diff --git a/x/wasm/types/types.go b/x/wasm/types/types.go index 7c9e14e64e..887e895b29 100644 --- a/x/wasm/types/types.go +++ b/x/wasm/types/types.go @@ -128,10 +128,11 @@ func (c *ContractInfo) SetExtension(ext ContractInfoExtension) error { // ReadExtension copies the extension value to the pointer passed as argument so that there is no need to cast // For example with a custom extension of type `MyContractDetails` it will look as following: -// var d MyContractDetails -// if err := info.ReadExtension(&d); err != nil { -// return nil, sdkerrors.Wrap(err, "extension") -// } +// +// var d MyContractDetails +// if err := info.ReadExtension(&d); err != nil { +// return nil, sdkerrors.Wrap(err, "extension") +// } func (c *ContractInfo) ReadExtension(e ContractInfoExtension) error { rv := reflect.ValueOf(e) if rv.Kind() != reflect.Ptr || rv.IsNil() { From cd62f4ed91a6f6c0d413d99fdb33aa349641a86d Mon Sep 17 00:00:00 2001 From: Alex Peters Date: Tue, 23 Aug 2022 15:39:55 +0200 Subject: [PATCH 6/7] Replace usage of deprecated test helper --- x/wasm/ibctesting/chain.go | 88 ++++++++++------------------------- x/wasm/ibctesting/endpoint.go | 20 ++++---- x/wasm/ibctesting/path.go | 4 +- x/wasm/ibctesting/wasm.go | 2 +- x/wasm/relay_pingpong_test.go | 2 +- x/wasm/relay_test.go | 8 ++-- 6 files changed, 42 insertions(+), 82 deletions(-) diff --git a/x/wasm/ibctesting/chain.go b/x/wasm/ibctesting/chain.go index 16f46b7b32..77fce0bd5e 100644 --- a/x/wasm/ibctesting/chain.go +++ b/x/wasm/ibctesting/chain.go @@ -6,7 +6,6 @@ import ( "testing" "time" - "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1" @@ -17,7 +16,6 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" capabilitykeeper "github.com/cosmos/cosmos-sdk/x/capability/keeper" capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" - stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" "github.com/cosmos/cosmos-sdk/x/staking/teststaking" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" clienttypes "github.com/cosmos/ibc-go/v3/modules/core/02-client/types" @@ -25,10 +23,8 @@ import ( commitmenttypes "github.com/cosmos/ibc-go/v3/modules/core/23-commitment/types" host "github.com/cosmos/ibc-go/v3/modules/core/24-host" "github.com/cosmos/ibc-go/v3/modules/core/exported" - ibckeeper "github.com/cosmos/ibc-go/v3/modules/core/keeper" "github.com/cosmos/ibc-go/v3/modules/core/types" ibctmtypes "github.com/cosmos/ibc-go/v3/modules/light-clients/07-tendermint/types" - ibctesting "github.com/cosmos/ibc-go/v3/testing" "github.com/cosmos/ibc-go/v3/testing/mock" "github.com/stretchr/testify/require" abci "github.com/tendermint/tendermint/abci/types" @@ -38,6 +34,9 @@ import ( tmtypes "github.com/tendermint/tendermint/types" tmversion "github.com/tendermint/tendermint/version" + "github.com/CosmWasm/wasmd/app" + "github.com/CosmWasm/wasmd/app/params" + wasmd "github.com/CosmWasm/wasmd/app" "github.com/CosmWasm/wasmd/x/wasm" ) @@ -51,7 +50,7 @@ type TestChain struct { t *testing.T Coordinator *Coordinator - App ibctesting.TestingApp + App *app.WasmApp ChainID string LastHeader *ibctmtypes.Header // header for last block height committed CurrentHeader tmproto.Header // header for current block height @@ -104,7 +103,7 @@ func NewTestChain(t *testing.T, coord *Coordinator, chainID string, opts ...wasm Coins: sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, amount)), } - app := NewTestingAppDecorator(t, wasmd.SetupWithGenesisValSet(t, valSet, []authtypes.GenesisAccount{acc}, opts, balance)) + wasmApp := wasmd.SetupWithGenesisValSet(t, valSet, []authtypes.GenesisAccount{acc}, opts, balance) // create current header and call begin block header := tmproto.Header{ @@ -113,18 +112,18 @@ func NewTestChain(t *testing.T, coord *Coordinator, chainID string, opts ...wasm Time: coord.CurrentTime.UTC(), } - txConfig := app.GetTxConfig() + txConfig := params.MakeEncodingConfig().TxConfig // create an account to send transactions from chain := &TestChain{ t: t, Coordinator: coord, ChainID: chainID, - App: app, + App: wasmApp, CurrentHeader: header, - QueryServer: app.GetIBCKeeper(), + QueryServer: wasmApp.IBCKeeper, TxConfig: txConfig, - Codec: app.AppCodec(), + Codec: wasmApp.AppCodec(), Vals: valSet, Signers: signers, senderPrivKey: senderPrivKey, @@ -138,7 +137,7 @@ func NewTestChain(t *testing.T, coord *Coordinator, chainID string, opts ...wasm // GetContext returns the current context for the application. func (chain *TestChain) GetContext() sdk.Context { - return chain.App.GetBaseApp().NewContext(false, chain.CurrentHeader) + return chain.App.BaseApp.NewContext(false, chain.CurrentHeader) } // QueryProof performs an abci query with the given key and returns the proto encoded merkle proof @@ -247,7 +246,7 @@ func (chain *TestChain) SendMsgs(msgs ...sdk.Msg) (*sdk.Result, error) { _, r, err := wasmd.SignAndDeliver( chain.t, chain.TxConfig, - chain.App.GetBaseApp(), + chain.App.BaseApp, chain.GetContext().BlockHeader(), msgs, chain.ChainID, @@ -291,7 +290,7 @@ func (chain *TestChain) captureIBCEvents(r *sdk.Result) { // GetClientState retrieves the client state for the provided clientID. The client is // expected to exist otherwise testing will fail. func (chain *TestChain) GetClientState(clientID string) exported.ClientState { - clientState, found := chain.App.GetIBCKeeper().ClientKeeper.GetClientState(chain.GetContext(), clientID) + clientState, found := chain.App.IBCKeeper.ClientKeeper.GetClientState(chain.GetContext(), clientID) require.True(chain.t, found) return clientState @@ -300,13 +299,13 @@ func (chain *TestChain) GetClientState(clientID string) exported.ClientState { // GetConsensusState retrieves the consensus state for the provided clientID and height. // It will return a success boolean depending on if consensus state exists or not. func (chain *TestChain) GetConsensusState(clientID string, height exported.Height) (exported.ConsensusState, bool) { - return chain.App.GetIBCKeeper().ClientKeeper.GetClientConsensusState(chain.GetContext(), clientID, height) + return chain.App.IBCKeeper.ClientKeeper.GetClientConsensusState(chain.GetContext(), clientID, height) } // GetValsAtHeight will return the validator set of the chain at a given height. It will return // a success boolean depending on if the validator set exists or not at that height. func (chain *TestChain) GetValsAtHeight(height int64) (*tmtypes.ValidatorSet, bool) { - histInfo, ok := chain.App.GetStakingKeeper().GetHistoricalInfo(chain.GetContext(), height) + histInfo, ok := chain.App.StakingKeeper.GetHistoricalInfo(chain.GetContext(), height) if !ok { return nil, false } @@ -323,7 +322,7 @@ func (chain *TestChain) GetValsAtHeight(height int64) (*tmtypes.ValidatorSet, bo // GetAcknowledgement retrieves an acknowledgement for the provided packet. If the // acknowledgement does not exist then testing will fail. func (chain *TestChain) GetAcknowledgement(packet exported.PacketI) []byte { - ack, found := chain.App.GetIBCKeeper().ChannelKeeper.GetPacketAcknowledgement(chain.GetContext(), packet.GetDestPort(), packet.GetDestChannel(), packet.GetSequence()) + ack, found := chain.App.IBCKeeper.ChannelKeeper.GetPacketAcknowledgement(chain.GetContext(), packet.GetDestPort(), packet.GetDestChannel(), packet.GetSequence()) require.True(chain.t, found) return ack @@ -331,7 +330,7 @@ func (chain *TestChain) GetAcknowledgement(packet exported.PacketI) []byte { // GetPrefix returns the prefix for used by a chain in connection creation func (chain *TestChain) GetPrefix() commitmenttypes.MerklePrefix { - return commitmenttypes.NewMerklePrefix(chain.App.GetIBCKeeper().ConnectionKeeper.GetCommitmentPrefix().Bytes()) + return commitmenttypes.NewMerklePrefix(chain.App.IBCKeeper.ConnectionKeeper.GetCommitmentPrefix().Bytes()) } // ConstructUpdateTMClientHeader will construct a valid 07-tendermint Header to update the @@ -490,10 +489,10 @@ func CreateSortedSignerArray(altPrivVal, suitePrivVal tmtypes.PrivValidator, // Other applications must bind to the port in InitGenesis or modify this code. func (chain *TestChain) CreatePortCapability(scopedKeeper capabilitykeeper.ScopedKeeper, portID string) { // check if the portId is already binded, if not bind it - _, ok := chain.App.GetScopedIBCKeeper().GetCapability(chain.GetContext(), host.PortPath(portID)) + _, ok := chain.App.ScopedIBCKeeper.GetCapability(chain.GetContext(), host.PortPath(portID)) if !ok { // create capability using the IBC capability keeper - cap, err := chain.App.GetScopedIBCKeeper().NewCapability(chain.GetContext(), host.PortPath(portID)) + cap, err := chain.App.ScopedIBCKeeper.NewCapability(chain.GetContext(), host.PortPath(portID)) require.NoError(chain.t, err) // claim capability using the scopedKeeper @@ -509,7 +508,7 @@ func (chain *TestChain) CreatePortCapability(scopedKeeper capabilitykeeper.Scope // GetPortCapability returns the port capability for the given portID. The capability must // exist, otherwise testing will fail. func (chain *TestChain) GetPortCapability(portID string) *capabilitytypes.Capability { - cap, ok := chain.App.GetScopedIBCKeeper().GetCapability(chain.GetContext(), host.PortPath(portID)) + cap, ok := chain.App.ScopedIBCKeeper.GetCapability(chain.GetContext(), host.PortPath(portID)) require.True(chain.t, ok) return cap @@ -521,9 +520,9 @@ func (chain *TestChain) GetPortCapability(portID string) *capabilitytypes.Capabi func (chain *TestChain) CreateChannelCapability(scopedKeeper capabilitykeeper.ScopedKeeper, portID, channelID string) { capName := host.ChannelCapabilityPath(portID, channelID) // check if the portId is already binded, if not bind it - _, ok := chain.App.GetScopedIBCKeeper().GetCapability(chain.GetContext(), capName) + _, ok := chain.App.ScopedIBCKeeper.GetCapability(chain.GetContext(), capName) if !ok { - cap, err := chain.App.GetScopedIBCKeeper().NewCapability(chain.GetContext(), capName) + cap, err := chain.App.ScopedIBCKeeper.NewCapability(chain.GetContext(), capName) require.NoError(chain.t, err) err = scopedKeeper.ClaimCapability(chain.GetContext(), cap, capName) require.NoError(chain.t, err) @@ -537,55 +536,16 @@ func (chain *TestChain) CreateChannelCapability(scopedKeeper capabilitykeeper.Sc // GetChannelCapability returns the channel capability for the given portID and channelID. // The capability must exist, otherwise testing will fail. func (chain *TestChain) GetChannelCapability(portID, channelID string) *capabilitytypes.Capability { - cap, ok := chain.App.GetScopedIBCKeeper().GetCapability(chain.GetContext(), host.ChannelCapabilityPath(portID, channelID)) + cap, ok := chain.App.ScopedIBCKeeper.GetCapability(chain.GetContext(), host.ChannelCapabilityPath(portID, channelID)) require.True(chain.t, ok) return cap } func (chain *TestChain) Balance(acc sdk.AccAddress, denom string) sdk.Coin { - return chain.GetTestSupport().BankKeeper().GetBalance(chain.GetContext(), acc, denom) + return chain.App.BankKeeper.GetBalance(chain.GetContext(), acc, denom) } func (chain *TestChain) AllBalances(acc sdk.AccAddress) sdk.Coins { - return chain.GetTestSupport().BankKeeper().GetAllBalances(chain.GetContext(), acc) -} - -func (chain TestChain) GetTestSupport() *wasmd.TestSupport { - return chain.App.(*TestingAppDecorator).TestSupport() -} - -var _ ibctesting.TestingApp = TestingAppDecorator{} - -type TestingAppDecorator struct { - *wasmd.WasmApp - t *testing.T -} - -func NewTestingAppDecorator(t *testing.T, wasmApp *wasmd.WasmApp) *TestingAppDecorator { - return &TestingAppDecorator{WasmApp: wasmApp, t: t} -} - -func (a TestingAppDecorator) GetBaseApp() *baseapp.BaseApp { - return a.TestSupport().GetBaseApp() -} - -func (a TestingAppDecorator) GetStakingKeeper() stakingkeeper.Keeper { - return a.TestSupport().StakingKeeper() -} - -func (a TestingAppDecorator) GetIBCKeeper() *ibckeeper.Keeper { - return a.TestSupport().IBCKeeper() -} - -func (a TestingAppDecorator) GetScopedIBCKeeper() capabilitykeeper.ScopedKeeper { - return a.TestSupport().ScopeIBCKeeper() -} - -func (a TestingAppDecorator) GetTxConfig() client.TxConfig { - return a.TestSupport().GetTxConfig() -} - -func (a TestingAppDecorator) TestSupport() *wasmd.TestSupport { - return wasmd.NewTestSupport(a.t, a.WasmApp) + return chain.App.BankKeeper.GetAllBalances(chain.GetContext(), acc) } diff --git a/x/wasm/ibctesting/endpoint.go b/x/wasm/ibctesting/endpoint.go index 9411a79724..9d62ce7f62 100644 --- a/x/wasm/ibctesting/endpoint.go +++ b/x/wasm/ibctesting/endpoint.go @@ -381,7 +381,7 @@ func (endpoint *Endpoint) SendPacket(packet exported.PacketI) error { channelCap := endpoint.Chain.GetChannelCapability(packet.GetSourcePort(), packet.GetSourceChannel()) // no need to send message, acting as a module - err := endpoint.Chain.App.GetIBCKeeper().ChannelKeeper.SendPacket(endpoint.Chain.GetContext(), channelCap, packet) + err := endpoint.Chain.App.IBCKeeper.ChannelKeeper.SendPacket(endpoint.Chain.GetContext(), channelCap, packet) if err != nil { return err } @@ -415,7 +415,7 @@ func (endpoint *Endpoint) WriteAcknowledgement(ack exported.Acknowledgement, pac channelCap := endpoint.Chain.GetChannelCapability(packet.GetDestPort(), packet.GetDestChannel()) // no need to send message, acting as a handler - err := endpoint.Chain.App.GetIBCKeeper().ChannelKeeper.WriteAcknowledgement(endpoint.Chain.GetContext(), channelCap, packet, ack) + err := endpoint.Chain.App.IBCKeeper.ChannelKeeper.WriteAcknowledgement(endpoint.Chain.GetContext(), channelCap, packet, ack) if err != nil { return err } @@ -452,7 +452,7 @@ func (endpoint *Endpoint) TimeoutPacket(packet channeltypes.Packet) error { } proof, proofHeight := endpoint.Counterparty.QueryProof(packetKey) - nextSeqRecv, found := endpoint.Counterparty.Chain.App.GetIBCKeeper().ChannelKeeper.GetNextSequenceRecv(endpoint.Counterparty.Chain.GetContext(), endpoint.ChannelConfig.PortID, endpoint.ChannelID) + nextSeqRecv, found := endpoint.Counterparty.Chain.App.IBCKeeper.ChannelKeeper.GetNextSequenceRecv(endpoint.Counterparty.Chain.GetContext(), endpoint.ChannelConfig.PortID, endpoint.ChannelID) require.True(endpoint.Chain.t, found) timeoutMsg := channeltypes.NewMsgTimeout( @@ -468,7 +468,7 @@ func (endpoint *Endpoint) SetChannelClosed() error { channel := endpoint.GetChannel() channel.State = channeltypes.CLOSED - endpoint.Chain.App.GetIBCKeeper().ChannelKeeper.SetChannel(endpoint.Chain.GetContext(), endpoint.ChannelConfig.PortID, endpoint.ChannelID, channel) + endpoint.Chain.App.IBCKeeper.ChannelKeeper.SetChannel(endpoint.Chain.GetContext(), endpoint.ChannelConfig.PortID, endpoint.ChannelID, channel) endpoint.Chain.Coordinator.CommitBlock(endpoint.Chain) @@ -483,7 +483,7 @@ func (endpoint *Endpoint) GetClientState() exported.ClientState { // SetClientState sets the client state for this endpoint. func (endpoint *Endpoint) SetClientState(clientState exported.ClientState) { - endpoint.Chain.App.GetIBCKeeper().ClientKeeper.SetClientState(endpoint.Chain.GetContext(), endpoint.ClientID, clientState) + endpoint.Chain.App.IBCKeeper.ClientKeeper.SetClientState(endpoint.Chain.GetContext(), endpoint.ClientID, clientState) } // GetConsensusState retrieves the Consensus State for this endpoint at the provided height. @@ -497,13 +497,13 @@ func (endpoint *Endpoint) GetConsensusState(height exported.Height) exported.Con // SetConsensusState sets the consensus state for this endpoint. func (endpoint *Endpoint) SetConsensusState(consensusState exported.ConsensusState, height exported.Height) { - endpoint.Chain.App.GetIBCKeeper().ClientKeeper.SetClientConsensusState(endpoint.Chain.GetContext(), endpoint.ClientID, height, consensusState) + endpoint.Chain.App.IBCKeeper.ClientKeeper.SetClientConsensusState(endpoint.Chain.GetContext(), endpoint.ClientID, height, consensusState) } // GetConnection retrieves an IBC Connection for the endpoint. The // connection is expected to exist otherwise testing will fail. func (endpoint *Endpoint) GetConnection() connectiontypes.ConnectionEnd { - connection, found := endpoint.Chain.App.GetIBCKeeper().ConnectionKeeper.GetConnection(endpoint.Chain.GetContext(), endpoint.ConnectionID) + connection, found := endpoint.Chain.App.IBCKeeper.ConnectionKeeper.GetConnection(endpoint.Chain.GetContext(), endpoint.ConnectionID) require.True(endpoint.Chain.t, found) return connection @@ -511,13 +511,13 @@ func (endpoint *Endpoint) GetConnection() connectiontypes.ConnectionEnd { // SetConnection sets the connection for this endpoint. func (endpoint *Endpoint) SetConnection(connection connectiontypes.ConnectionEnd) { - endpoint.Chain.App.GetIBCKeeper().ConnectionKeeper.SetConnection(endpoint.Chain.GetContext(), endpoint.ConnectionID, connection) + endpoint.Chain.App.IBCKeeper.ConnectionKeeper.SetConnection(endpoint.Chain.GetContext(), endpoint.ConnectionID, connection) } // GetChannel retrieves an IBC Channel for the endpoint. The channel // is expected to exist otherwise testing will fail. func (endpoint *Endpoint) GetChannel() channeltypes.Channel { - channel, found := endpoint.Chain.App.GetIBCKeeper().ChannelKeeper.GetChannel(endpoint.Chain.GetContext(), endpoint.ChannelConfig.PortID, endpoint.ChannelID) + channel, found := endpoint.Chain.App.IBCKeeper.ChannelKeeper.GetChannel(endpoint.Chain.GetContext(), endpoint.ChannelConfig.PortID, endpoint.ChannelID) require.True(endpoint.Chain.t, found) return channel @@ -525,7 +525,7 @@ func (endpoint *Endpoint) GetChannel() channeltypes.Channel { // SetChannel sets the channel for this endpoint. func (endpoint *Endpoint) SetChannel(channel channeltypes.Channel) { - endpoint.Chain.App.GetIBCKeeper().ChannelKeeper.SetChannel(endpoint.Chain.GetContext(), endpoint.ChannelConfig.PortID, endpoint.ChannelID, channel) + endpoint.Chain.App.IBCKeeper.ChannelKeeper.SetChannel(endpoint.Chain.GetContext(), endpoint.ChannelConfig.PortID, endpoint.ChannelID, channel) } // QueryClientStateProof performs and abci query for a client stat associated diff --git a/x/wasm/ibctesting/path.go b/x/wasm/ibctesting/path.go index 2ce5e044a6..15912bd400 100644 --- a/x/wasm/ibctesting/path.go +++ b/x/wasm/ibctesting/path.go @@ -40,7 +40,7 @@ func (path *Path) SetChannelOrdered() { // if EndpointA does not contain a packet commitment for that packet. An error is returned // if a relay step fails or the packet commitment does not exist on either endpoint. func (path *Path) RelayPacket(packet channeltypes.Packet, ack []byte) error { - pc := path.EndpointA.Chain.App.GetIBCKeeper().ChannelKeeper.GetPacketCommitment(path.EndpointA.Chain.GetContext(), packet.GetSourcePort(), packet.GetSourceChannel(), packet.GetSequence()) + pc := path.EndpointA.Chain.App.IBCKeeper.ChannelKeeper.GetPacketCommitment(path.EndpointA.Chain.GetContext(), packet.GetSourcePort(), packet.GetSourceChannel(), packet.GetSequence()) if bytes.Equal(pc, channeltypes.CommitPacket(path.EndpointA.Chain.App.AppCodec(), packet)) { // packet found, relay from A to B @@ -59,7 +59,7 @@ func (path *Path) RelayPacket(packet channeltypes.Packet, ack []byte) error { } - pc = path.EndpointB.Chain.App.GetIBCKeeper().ChannelKeeper.GetPacketCommitment(path.EndpointB.Chain.GetContext(), packet.GetSourcePort(), packet.GetSourceChannel(), packet.GetSequence()) + pc = path.EndpointB.Chain.App.IBCKeeper.ChannelKeeper.GetPacketCommitment(path.EndpointB.Chain.GetContext(), packet.GetSourcePort(), packet.GetSourceChannel(), packet.GetSequence()) if bytes.Equal(pc, channeltypes.CommitPacket(path.EndpointB.Chain.App.AppCodec(), packet)) { // packet found, relay B to A diff --git a/x/wasm/ibctesting/wasm.go b/x/wasm/ibctesting/wasm.go index 6957f63404..8b7dfc8f0b 100644 --- a/x/wasm/ibctesting/wasm.go +++ b/x/wasm/ibctesting/wasm.go @@ -138,5 +138,5 @@ func (chain *TestChain) ContractInfo(contractAddr sdk.AccAddress) *types.Contrac type testSupporter interface { TestSupport() *wasmd.TestSupport } - return chain.App.(testSupporter).TestSupport().WasmKeeper().GetContractInfo(chain.GetContext(), contractAddr) + return chain.App.WasmKeeper.GetContractInfo(chain.GetContext(), contractAddr) } diff --git a/x/wasm/relay_pingpong_test.go b/x/wasm/relay_pingpong_test.go index 46c32497b3..8dfa403e82 100644 --- a/x/wasm/relay_pingpong_test.go +++ b/x/wasm/relay_pingpong_test.go @@ -326,7 +326,7 @@ func (p player) incrementCounter(key []byte, store wasmvm.KVStore) uint64 { } func (p player) QueryState(key []byte) uint64 { - raw := p.chain.GetTestSupport().WasmKeeper().QueryRaw(p.chain.GetContext(), p.contractAddr, key) + raw := p.chain.App.WasmKeeper.QueryRaw(p.chain.GetContext(), p.contractAddr, key) return sdk.BigEndianToUint64(raw) } diff --git a/x/wasm/relay_test.go b/x/wasm/relay_test.go index 5edd182d59..63e4bdc467 100644 --- a/x/wasm/relay_test.go +++ b/x/wasm/relay_test.go @@ -193,7 +193,7 @@ func TestContractCanInitiateIBCTransferMsg(t *testing.T) { require.Equal(t, 0, len(chainB.PendingSendPackets)) // and dest chain balance contains voucher - bankKeeperB := chainB.GetTestSupport().BankKeeper() + bankKeeperB := chainB.App.BankKeeper expBalance := ibctransfertypes.GetTransferCoin(path.EndpointB.ChannelConfig.PortID, path.EndpointB.ChannelID, coinToSendToB.Denom, coinToSendToB.Amount) gotBalance := chainB.Balance(chainB.SenderAccount.GetAddress(), expBalance.Denom) assert.Equal(t, expBalance, gotBalance, "got total balance: %s", bankKeeperB.GetAllBalances(chainB.GetContext(), chainB.SenderAccount.GetAddress())) @@ -268,7 +268,7 @@ func TestContractCanEmulateIBCTransferMessage(t *testing.T) { require.Equal(t, 0, len(chainB.PendingSendPackets)) // and dest chain balance contains voucher - bankKeeperB := chainB.GetTestSupport().BankKeeper() + bankKeeperB := chainB.App.BankKeeper expBalance := ibctransfertypes.GetTransferCoin(path.EndpointB.ChannelConfig.PortID, path.EndpointB.ChannelID, coinToSendToB.Denom, coinToSendToB.Amount) gotBalance := chainB.Balance(chainB.SenderAccount.GetAddress(), expBalance.Denom) assert.Equal(t, expBalance, gotBalance, "got total balance: %s", bankKeeperB.GetAllBalances(chainB.GetContext(), chainB.SenderAccount.GetAddress())) @@ -535,7 +535,7 @@ func (c *ackReceiverContract) IBCPacketReceive(codeID wasmvm.Checksum, env wasmv // call original ibctransfer keeper to not copy all code into this ibcPacket := toIBCPacket(packet) ctx := c.chain.GetContext() // HACK: please note that this is not reverted after checkTX - err := c.chain.GetTestSupport().TransferKeeper().OnRecvPacket(ctx, ibcPacket, src) + err := c.chain.App.TransferKeeper.OnRecvPacket(ctx, ibcPacket, src) if err != nil { return nil, 0, sdkerrors.Wrap(err, "within our smart contract") } @@ -560,7 +560,7 @@ func (c *ackReceiverContract) IBCPacketAck(codeID wasmvm.Checksum, env wasmvmtyp // call original ibctransfer keeper to not copy all code into this ctx := c.chain.GetContext() // HACK: please note that this is not reverted after checkTX ibcPacket := toIBCPacket(msg.OriginalPacket) - err := c.chain.GetTestSupport().TransferKeeper().OnAcknowledgementPacket(ctx, ibcPacket, data, ack) + err := c.chain.App.TransferKeeper.OnAcknowledgementPacket(ctx, ibcPacket, data, ack) if err != nil { return nil, 0, sdkerrors.Wrap(err, "within our smart contract") } From 61a4342f630d09f0d6044328172199583ab156d9 Mon Sep 17 00:00:00 2001 From: Alex Peters Date: Tue, 23 Aug 2022 15:45:08 +0200 Subject: [PATCH 7/7] Address linter report --- x/wasm/client/cli/query.go | 4 ++-- x/wasm/client/cli/tx.go | 4 ++-- x/wasm/ibctesting/chain.go | 5 ++--- x/wasm/ibctesting/wasm.go | 9 ++------- x/wasm/ioutils/ioutil.go | 3 +-- x/wasm/keeper/test_common.go | 4 ++-- x/wasm/simulation/operations.go | 4 ++-- 7 files changed, 13 insertions(+), 20 deletions(-) diff --git a/x/wasm/client/cli/query.go b/x/wasm/client/cli/query.go index 49cea64ea4..e7a21167af 100644 --- a/x/wasm/client/cli/query.go +++ b/x/wasm/client/cli/query.go @@ -7,7 +7,7 @@ import ( "encoding/json" "errors" "fmt" - "io/ioutil" + "os" "strconv" wasmvm "github.com/CosmWasm/wasmvm" @@ -174,7 +174,7 @@ func GetCmdQueryCode() *cobra.Command { } fmt.Printf("Downloading wasm code to %s\n", args[1]) - return ioutil.WriteFile(args[1], res.Data, 0o600) + return os.WriteFile(args[1], res.Data, 0o600) }, } flags.AddQueryFlagsToCmd(cmd) diff --git a/x/wasm/client/cli/tx.go b/x/wasm/client/cli/tx.go index 8f3203ea68..662758abcc 100644 --- a/x/wasm/client/cli/tx.go +++ b/x/wasm/client/cli/tx.go @@ -3,7 +3,7 @@ package cli import ( "errors" "fmt" - "io/ioutil" + "os" "strconv" "github.com/cosmos/cosmos-sdk/client" @@ -81,7 +81,7 @@ func StoreCodeCmd() *cobra.Command { } func parseStoreCodeArgs(file string, sender sdk.AccAddress, flags *flag.FlagSet) (types.MsgStoreCode, error) { - wasm, err := ioutil.ReadFile(file) + wasm, err := os.ReadFile(file) if err != nil { return types.MsgStoreCode{}, err } diff --git a/x/wasm/ibctesting/chain.go b/x/wasm/ibctesting/chain.go index 77fce0bd5e..b5e99f962a 100644 --- a/x/wasm/ibctesting/chain.go +++ b/x/wasm/ibctesting/chain.go @@ -37,7 +37,6 @@ import ( "github.com/CosmWasm/wasmd/app" "github.com/CosmWasm/wasmd/app/params" - wasmd "github.com/CosmWasm/wasmd/app" "github.com/CosmWasm/wasmd/x/wasm" ) @@ -103,7 +102,7 @@ func NewTestChain(t *testing.T, coord *Coordinator, chainID string, opts ...wasm Coins: sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, amount)), } - wasmApp := wasmd.SetupWithGenesisValSet(t, valSet, []authtypes.GenesisAccount{acc}, opts, balance) + wasmApp := app.SetupWithGenesisValSet(t, valSet, []authtypes.GenesisAccount{acc}, opts, balance) // create current header and call begin block header := tmproto.Header{ @@ -243,7 +242,7 @@ func (chain *TestChain) SendMsgs(msgs ...sdk.Msg) (*sdk.Result, error) { // ensure the chain has the latest time chain.Coordinator.UpdateTimeForChain(chain) - _, r, err := wasmd.SignAndDeliver( + _, r, err := app.SignAndDeliver( chain.t, chain.TxConfig, chain.App.BaseApp, diff --git a/x/wasm/ibctesting/wasm.go b/x/wasm/ibctesting/wasm.go index 8b7dfc8f0b..4639688f01 100644 --- a/x/wasm/ibctesting/wasm.go +++ b/x/wasm/ibctesting/wasm.go @@ -5,11 +5,9 @@ import ( "compress/gzip" "encoding/json" "fmt" - "io/ioutil" + "os" "strings" - wasmd "github.com/CosmWasm/wasmd/app" - ibctesting "github.com/cosmos/ibc-go/v3/testing" sdk "github.com/cosmos/cosmos-sdk/types" @@ -37,7 +35,7 @@ func (chain *TestChain) SeedNewContractInstance() sdk.AccAddress { } func (chain *TestChain) StoreCodeFile(filename string) types.MsgStoreCodeResponse { - wasmCode, err := ioutil.ReadFile(filename) + wasmCode, err := os.ReadFile(filename) require.NoError(chain.t, err) if strings.HasSuffix(filename, "wasm") { // compress for gas limit var buf bytes.Buffer @@ -135,8 +133,5 @@ func (chain *TestChain) parseSDKResultData(r *sdk.Result) sdk.TxMsgData { // ContractInfo is a helper function to returns the ContractInfo for the given contract address func (chain *TestChain) ContractInfo(contractAddr sdk.AccAddress) *types.ContractInfo { - type testSupporter interface { - TestSupport() *wasmd.TestSupport - } return chain.App.WasmKeeper.GetContractInfo(chain.GetContext(), contractAddr) } diff --git a/x/wasm/ioutils/ioutil.go b/x/wasm/ioutils/ioutil.go index 9c7bd81f04..5740132342 100644 --- a/x/wasm/ioutils/ioutil.go +++ b/x/wasm/ioutils/ioutil.go @@ -4,7 +4,6 @@ import ( "bytes" "compress/gzip" "io" - "io/ioutil" "github.com/CosmWasm/wasmd/x/wasm/types" ) @@ -26,7 +25,7 @@ func Uncompress(src []byte, limit uint64) ([]byte, error) { } zr.Multistream(false) defer zr.Close() - return ioutil.ReadAll(LimitReader(zr, int64(limit))) + return io.ReadAll(LimitReader(zr, int64(limit))) } // LimitReader returns a Reader that reads from r diff --git a/x/wasm/keeper/test_common.go b/x/wasm/keeper/test_common.go index 717228962d..9fedc3e7f1 100644 --- a/x/wasm/keeper/test_common.go +++ b/x/wasm/keeper/test_common.go @@ -4,7 +4,7 @@ import ( "encoding/binary" "encoding/json" "fmt" - "io/ioutil" + "os" "testing" "time" @@ -558,7 +558,7 @@ func StoreExampleContract(t testing.TB, ctx sdk.Context, keepers TestKeepers, wa creator, _, creatorAddr := keyPubAddr() fundAccounts(t, ctx, keepers.AccountKeeper, keepers.BankKeeper, creatorAddr, anyAmount) - wasmCode, err := ioutil.ReadFile(wasmFile) + wasmCode, err := os.ReadFile(wasmFile) require.NoError(t, err) codeID, err := keepers.ContractKeeper.Create(ctx, creatorAddr, wasmCode, nil) diff --git a/x/wasm/simulation/operations.go b/x/wasm/simulation/operations.go index 09bbbd2659..41903002a1 100644 --- a/x/wasm/simulation/operations.go +++ b/x/wasm/simulation/operations.go @@ -2,8 +2,8 @@ package simulation import ( "encoding/json" - "io/ioutil" "math/rand" + "os" wasmvmtypes "github.com/CosmWasm/wasmvm/types" "github.com/cosmos/cosmos-sdk/baseapp" @@ -84,7 +84,7 @@ func WeightedOperations( wasmBz = testdata.ReflectContractWasm() } else { var err error - wasmBz, err = ioutil.ReadFile(wasmContractPath) + wasmBz, err = os.ReadFile(wasmContractPath) if err != nil { panic(err) }