@agoric/cosmos 0.34.2-dev-3c8aafe.0 → 0.34.2-dev-74fbe43.0.74fbe43

package/x/swingset/keeper/keeper.go

@@ -7,23 +7,21 @@ import (
 	stdlog "log"
 	"math"
 
+	corestore "cosmossdk.io/core/store"
+	"cosmossdk.io/log"
 	sdkmath "cosmossdk.io/math"
-
-	"github.com/cometbft/cometbft/libs/log"
-
+	"cosmossdk.io/store/prefix"
+	storetypes "cosmossdk.io/store/types"
 	"github.com/cosmos/cosmos-sdk/baseapp"
 	"github.com/cosmos/cosmos-sdk/codec"
-	"github.com/cosmos/cosmos-sdk/store/prefix"
-	storetypes "github.com/cosmos/cosmos-sdk/store/types"
+	"github.com/cosmos/cosmos-sdk/runtime"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
 	paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"
 
 	"github.com/Agoric/agoric-sdk/golang/cosmos/ante"
 	agoric "github.com/Agoric/agoric-sdk/golang/cosmos/types"
 	"github.com/Agoric/agoric-sdk/golang/cosmos/vm"
 	"github.com/Agoric/agoric-sdk/golang/cosmos/x/swingset/types"
-	vstoragekeeper "github.com/Agoric/agoric-sdk/golang/cosmos/x/vstorage/keeper"
 )
 
 // Top-level paths for chain storage should remain synchronized with
@@ -53,15 +51,17 @@ const (
 
 // Keeper maintains the link to data vstorage and exposes getter/setter methods for the various parts of the state machine
 type Keeper struct {
-	storeKey   storetypes.StoreKey
-	cdc        codec.Codec
-	paramSpace paramtypes.Subspace
+	storeService corestore.KVStoreService
+	cdc          codec.Codec
+	paramSpace   paramtypes.Subspace
 
 	accountKeeper    types.AccountKeeper
-	bankKeeper       bankkeeper.Keeper
-	vstorageKeeper   vstoragekeeper.Keeper
+	bankKeeper       types.BankKeeper
+	vstorageKeeper   types.VstorageKeeper
 	feeCollectorName string
 
+	authority string
+
 	// CallToController dispatches a message to the controlling process
 	callToController func(ctx sdk.Context, str string) (string, error)
 }
@@ -71,9 +71,10 @@ var _ ante.SwingsetKeeper = &Keeper{}
 
 // NewKeeper creates a new IBC transfer Keeper instance
 func NewKeeper(
-	cdc codec.Codec, key storetypes.StoreKey, paramSpace paramtypes.Subspace,
-	accountKeeper types.AccountKeeper, bankKeeper bankkeeper.Keeper,
-	vstorageKeeper vstoragekeeper.Keeper, feeCollectorName string,
+	cdc codec.Codec, storeService corestore.KVStoreService,
+	paramSpace paramtypes.Subspace,
+	accountKeeper types.AccountKeeper, bankKeeper types.BankKeeper,
+	vstorageKeeper types.VstorageKeeper, feeCollectorName string, authority string,
 	callToController func(ctx sdk.Context, str string) (string, error),
 ) Keeper {
 
@@ -83,14 +84,15 @@ func NewKeeper(
 	}
 
 	return Keeper{
-		storeKey:         key,
 		cdc:              cdc,
+		storeService:     storeService,
 		paramSpace:       paramSpace,
 		accountKeeper:    accountKeeper,
 		bankKeeper:       bankKeeper,
 		vstorageKeeper:   vstorageKeeper,
 		feeCollectorName: feeCollectorName,
 		callToController: callToController,
+		authority:        authority,
 	}
 }
 
@@ -171,7 +173,7 @@ func (k Keeper) GetSmartWalletState(ctx sdk.Context, addr sdk.AccAddress) types.
 }
 
 func (k Keeper) InboundQueueLength(ctx sdk.Context) (int32, error) {
-	size := sdk.NewInt(0)
+	size := sdkmath.NewInt(0)
 
 	highPriorityQueueLength, err := k.vstorageKeeper.GetQueueLength(ctx, StoragePathHighPriorityQueue)
 	if err != nil {
@@ -258,7 +260,8 @@ func (k Keeper) SetParams(ctx sdk.Context, params types.Params) {
 }
 
 func (k Keeper) GetState(ctx sdk.Context) types.State {
-	store := ctx.KVStore(k.storeKey)
+	kvstore := k.storeService.OpenKVStore(ctx)
+	store := runtime.KVStoreAdapter(kvstore)
 	bz := store.Get([]byte(stateKey))
 	state := types.State{}
 	k.cdc.MustUnmarshal(bz, &state)
@@ -266,7 +269,8 @@ func (k Keeper) GetState(ctx sdk.Context) types.State {
 }
 
 func (k Keeper) SetState(ctx sdk.Context, state types.State) {
-	store := ctx.KVStore(k.storeKey)
+	kvstore := k.storeService.OpenKVStore(ctx)
+	store := runtime.KVStoreAdapter(kvstore)
 	bz := k.cdc.MustMarshal(&state)
 	store.Set([]byte(stateKey), bz)
 }
@@ -323,8 +327,8 @@ func (k Keeper) ChargeBeans(
 	beansToDebit := nowOwing.Sub(remainderOwing)
 
 	// Convert the debit to coins.
-	beansPerFeeUnitDec := sdk.NewDecFromBigInt(beansPerUnit[types.BeansPerFeeUnit].BigInt())
-	beansToDebitDec := sdk.NewDecFromBigInt(beansToDebit.BigInt())
+	beansPerFeeUnitDec := sdkmath.LegacyNewDecFromBigInt(beansPerUnit[types.BeansPerFeeUnit].BigInt())
+	beansToDebitDec := sdkmath.LegacyNewDecFromBigInt(beansToDebit.BigInt())
 	feeUnitPrice := k.GetParams(ctx).FeeUnitPrice
 	feeDecCoins := sdk.NewDecCoinsFromCoins(feeUnitPrice...).MulDec(beansToDebitDec).QuoDec(beansPerFeeUnitDec)
 
@@ -485,8 +489,9 @@ func (k Keeper) SetMailbox(ctx sdk.Context, peer string, mailbox string) {
 	k.vstorageKeeper.LegacySetStorageAndNotify(ctx, agoric.NewKVEntry(path, mailbox))
 }
 
-func (k Keeper) GetSwingStore(ctx sdk.Context) sdk.KVStore {
-	store := ctx.KVStore(k.storeKey)
+func (k Keeper) GetSwingStore(ctx sdk.Context) storetypes.KVStore {
+	kvstore := k.storeService.OpenKVStore(ctx)
+	store := runtime.KVStoreAdapter(kvstore)
 	return prefix.NewStore(store, []byte(swingStoreKeyPrefix))
 }
 

package/x/swingset/keeper/keeper_test.go

@@ -5,13 +5,15 @@ import (
 	"reflect"
 	"testing"
 
+	"cosmossdk.io/log"
+	"cosmossdk.io/store"
+	storemetrics "cosmossdk.io/store/metrics"
+	prefixstore "cosmossdk.io/store/prefix"
+	storetypes "cosmossdk.io/store/types"
 	"github.com/Agoric/agoric-sdk/golang/cosmos/x/swingset/types"
-	"github.com/cosmos/cosmos-sdk/store"
-	prefixstore "github.com/cosmos/cosmos-sdk/store/prefix"
-	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	dbm "github.com/cometbft/cometbft-db"
+	dbm "github.com/cosmos/cosmos-db"
 )
 
 func mkcoin(denom string) func(amt int64) sdk.Coin {
@@ -188,7 +190,7 @@ func Test_calculateFees(t *testing.T) {
 				t.Errorf("calculateFees() error = %v, want %v", err, tt.errMsg)
 				return
 			}
-			if !got.IsEqual(tt.want) {
+			if !got.Equal(tt.want) {
 				t.Errorf("calculateFees() = %v, want %v", got, tt.want)
 			}
 		})
@@ -199,9 +201,10 @@ var (
 	swingsetStoreKey = storetypes.NewKVStoreKey(types.StoreKey)
 )
 
-func makeTestStore() sdk.KVStore {
+func makeTestStore() storetypes.KVStore {
 	db := dbm.NewMemDB()
-	ms := store.NewCommitMultiStore(db)
+	logger := log.NewNopLogger()
+	ms := store.NewCommitMultiStore(db, logger, storemetrics.NewNoOpMetrics())
 	ms.MountStoreWithDB(swingsetStoreKey, storetypes.StoreTypeIAVL, db)
 	err := ms.LoadLatestVersion()
 	if err != nil {

package/x/swingset/keeper/msg_server.go

@@ -3,6 +3,9 @@ package keeper
 import (
 	"context"
 
+	sdkioerrors "cosmossdk.io/errors"
+	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
+
 	"github.com/Agoric/agoric-sdk/golang/cosmos/vm"
 	"github.com/Agoric/agoric-sdk/golang/cosmos/x/swingset/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -43,6 +46,18 @@ func (keeper msgServer) routeAction(ctx sdk.Context, msg vm.ControllerAdmissionM
 func (keeper msgServer) DeliverInbound(goCtx context.Context, msg *types.MsgDeliverInbound) (*types.MsgDeliverInboundResponse, error) {
 	ctx := sdk.UnwrapSDKContext(goCtx)
 
+	if msg.Submitter.Empty() {
+		return nil, sdkioerrors.Wrap(sdkerrors.ErrInvalidAddress, "Submitter address cannot be empty")
+	}
+	if len(msg.Messages) != len(msg.Nums) {
+		return nil, sdkioerrors.Wrap(sdkerrors.ErrUnknownRequest, "Messages and Nums must be the same length")
+	}
+	for _, m := range msg.Messages {
+		if len(m) == 0 {
+			return nil, sdkioerrors.Wrap(sdkerrors.ErrUnknownRequest, "Messages cannot be empty")
+		}
+	}
+
 	// msg.Nums and msg.Messages must be zipped into an array of [num, message] pairs.
 	messages := make([][]interface{}, len(msg.Messages))
 	for i, message := range msg.Messages {
@@ -190,20 +205,52 @@ type installBundleAction struct {
 
 func (keeper msgServer) InstallBundle(goCtx context.Context, msg *types.MsgInstallBundle) (*types.MsgInstallBundleResponse, error) {
 	ctx := sdk.UnwrapSDKContext(goCtx)
+	if err := msg.ValidateBasic(); err != nil {
+		return nil, sdkioerrors.Wrap(sdkerrors.ErrInvalidRequest, err.Error())
+	}
 
-	err := msg.Uncompress()
-	if err != nil {
+	if err := msg.Uncompress(); err != nil {
 		return nil, err
 	}
+
+	if err := msg.ValidateBasic(); err != nil {
+		return nil, sdkioerrors.Wrap(sdkerrors.ErrInvalidRequest, err.Error())
+	}
+
 	action := installBundleAction{
 		MsgInstallBundle: msg,
 	}
 
-	err = keeper.routeAction(ctx, msg, action)
-	// fmt.Fprintln(os.Stderr, "Returned from SwingSet", out, err)
-	if err != nil {
+	if err := keeper.routeAction(ctx, msg, action); err != nil {
+		// fmt.Fprintln(os.Stderr, "Returned from SwingSet", out, err)
 		return nil, err
 	}
 
 	return &types.MsgInstallBundleResponse{}, nil
 }
+
+func (k msgServer) CoreEval(goCtx context.Context, msg *types.MsgCoreEval) (*types.MsgCoreEvalResponse, error) {
+	ctx := sdk.UnwrapSDKContext(goCtx)
+
+	if msg.Authority != k.authority {
+		return nil, sdkioerrors.Wrap(sdkerrors.ErrUnauthorized, "only governance authority can call CoreEval")
+	}
+
+	action := coreEvalAction{
+		Evals: []types.CoreEval{
+			{
+				JsonPermits: msg.JsonPermits,
+				JsCode:      msg.JsCode,
+			},
+		},
+	}
+
+	err := k.PushCoreEvalAction(ctx, action)
+	if err != nil {
+		return &types.MsgCoreEvalResponse{
+			Result: err.Error(),
+		}, err
+	}
+
+	return &types.MsgCoreEvalResponse{}, nil
+}

package/x/swingset/keeper/msg_server_test.go

@@ -0,0 +1,121 @@
+package keeper_test
+
+import (
+	"github.com/stretchr/testify/suite"
+	"go.uber.org/mock/gomock"
+
+	storetypes "cosmossdk.io/store/types"
+	cmtproto "github.com/cometbft/cometbft/proto/tendermint/types"
+	cmttime "github.com/cometbft/cometbft/types/time"
+	"github.com/cosmos/cosmos-sdk/codec"
+	paramskeeper "github.com/cosmos/cosmos-sdk/x/params/keeper"
+
+	"github.com/cosmos/cosmos-sdk/runtime"
+	"github.com/cosmos/cosmos-sdk/testutil"
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	moduletestutil "github.com/cosmos/cosmos-sdk/types/module/testutil"
+
+	"github.com/Agoric/agoric-sdk/golang/cosmos/x/swingset/keeper"
+	swingtestutil "github.com/Agoric/agoric-sdk/golang/cosmos/x/swingset/testutil"
+	"github.com/Agoric/agoric-sdk/golang/cosmos/x/swingset/types"
+	vbanktypes "github.com/Agoric/agoric-sdk/golang/cosmos/x/vbank/types"
+)
+
+type KeeperTestSuite struct {
+	suite.Suite
+
+	msgServer types.MsgServer
+	keeper    keeper.Keeper
+	ctx       sdk.Context
+
+	encCfg moduletestutil.TestEncodingConfig
+	ctrl   *gomock.Controller
+}
+
+const authority = "agoric10d07y265gmmuvt4z0w9aw880jnsr6hcznym2zg"
+
+func (suite *KeeperTestSuite) SetupTest() {
+	key := storetypes.NewKVStoreKey(types.StoreKey)
+	testCtx := testutil.DefaultContextWithDB(suite.T(), key, storetypes.NewTransientStoreKey("transient_test"))
+	ctx := testCtx.Ctx.WithBlockHeader(cmtproto.Header{Time: cmttime.Now()})
+	encCfg := moduletestutil.MakeTestEncodingConfig()
+
+	suite.ctx = ctx
+	suite.encCfg = encCfg
+	suite.ctrl = gomock.NewController(suite.T())
+
+	// Create mock keepers using gomock
+	mockAccountKeeper := swingtestutil.NewMockAccountKeeper(suite.ctrl)
+	mockBankKeeper := swingtestutil.NewMockBankKeeper(suite.ctrl)
+	mockVstorageKeeper := swingtestutil.NewMockVstorageKeeper(suite.ctrl)
+
+	callToController := func(ctx sdk.Context, jsonRequest string) (jsonReply string, err error) {
+		return "", nil
+	}
+
+	// Initialize params keeper and subspace properly
+	paramsKey := storetypes.NewKVStoreKey("params")
+	paramsTKey := storetypes.NewTransientStoreKey("transient_params")
+	paramsKeeper := paramskeeper.NewKeeper(suite.encCfg.Codec, codec.NewLegacyAmino(), paramsKey, paramsTKey)
+	paramsKeeper.Subspace(types.ModuleName)
+	paramsSubspace, _ := paramsKeeper.GetSubspace(types.ModuleName)
+
+	suite.keeper = keeper.NewKeeper(
+		suite.encCfg.Codec,
+		runtime.NewKVStoreService(key),
+		paramsSubspace,
+		mockAccountKeeper,
+		mockBankKeeper,
+		mockVstorageKeeper,
+		vbanktypes.ReservePoolName,
+		authority,
+		callToController,
+	)
+	suite.msgServer = keeper.NewMsgServerImpl(suite.keeper)
+}
+
+func (suite *KeeperTestSuite) TearDownTest() {
+	suite.ctrl.Finish()
+}
+
+// TestCoreEval tests the CoreEval message handler
+// Verifies that:
+// 1. Authorized CoreEval requests create proper CORE_EVAL actions
+// 2. Actions are pushed to the high priority queue with correct
+// 3. Eval contains the expected JS code and permits
+// 4. Proper metadata
+func (suite *KeeperTestSuite) TestCoreEval() {
+	suite.SetupTest()
+	// Create a mock vstorage keeper that expects a queue push with the correct action
+	mockVstorageKeeper := swingtestutil.NewMockVstorageKeeper(suite.ctrl)
+	mockVstorageKeeper.EXPECT().
+		PushQueueItem(gomock.Any(), gomock.Eq("highPriorityQueue"), gomock.Any()).
+		DoAndReturn(func(ctx interface{}, queueName string, actionData string) error {
+			// Verify the queue name is correct
+			suite.Equal("highPriorityQueue", queueName)
+
+			// Verify the action data contains the expected CoreEval action
+			suite.Contains(actionData, `"type":"CORE_EVAL"`)
+			suite.Contains(actionData, `"json_permits":"true"`)
+			suite.Contains(actionData, `"js_code":"()=\u003e{}"`)
+
+			suite.Contains(actionData, `"context":{"blockHeight":`)
+			suite.Contains(actionData, `"txHash":"x/gov"`)
+			suite.Contains(actionData, `"msgIdx":0`)
+
+			return nil
+		}).
+		Times(1)
+
+	// Test successful CoreEval
+	msg := &types.MsgCoreEval{
+		Authority:   authority,
+		JsonPermits: "true",
+		JsCode:      `()=>{}`,
+	}
+
+	resp, err := suite.msgServer.CoreEval(suite.ctx, msg)
+	suite.NoError(err)
+	suite.NotNil(resp)
+	suite.Empty(resp.Result)
+}

package/x/swingset/keeper/proposal.go

@@ -21,6 +21,10 @@ func (k Keeper) CoreEvalProposal(ctx sdk.Context, p *types.CoreEvalProposal) err
 		Evals: p.Evals,
 	}
 
+	return k.PushAction(ctx, action)
+}
+
+func (k Keeper) PushCoreEvalAction(ctx sdk.Context, action coreEvalAction) error {
 	// While the CoreEvalProposal was originally created by a transaction, by the time it
 	// passes by governance, we no longer have its provenance information, so we need to
 	// synthesize unique context information.

package/x/swingset/keeper/querier.go

@@ -75,7 +75,7 @@ func legacyQueryStorage(ctx sdk.Context, path string, req abci.RequestQuery, kee
 // nolint: unparam
 func legacyQueryKeys(ctx sdk.Context, path string, req abci.RequestQuery, keeper Keeper, legacyQuerierCdc *codec.LegacyAmino) (res []byte, err error) {
 	children := keeper.vstorageKeeper.GetChildren(ctx, path)
-	chlist := children.Children
+	chlist := children
 
 	if chlist == nil {
 		chlist = []string{}

package/x/swingset/keeper/swing_store_exports_handler.go

@@ -10,10 +10,10 @@ import (
 	"regexp"
 
 	sdkioerrors "cosmossdk.io/errors"
+	"cosmossdk.io/log"
 	agoric "github.com/Agoric/agoric-sdk/golang/cosmos/types"
 	"github.com/Agoric/agoric-sdk/golang/cosmos/vm"
 	"github.com/Agoric/agoric-sdk/golang/cosmos/x/swingset/types"
-	"github.com/cometbft/cometbft/libs/log"
 )
 
 // This module abstracts the generation and handling of swing-store exports,

package/x/swingset/keeper/swing_store_exports_handler_test.go

@@ -5,8 +5,8 @@ import (
 	"io"
 	"testing"
 
+	"cosmossdk.io/log"
 	"github.com/Agoric/agoric-sdk/golang/cosmos/vm"
-	"github.com/cometbft/cometbft/libs/log"
 )
 
 func newTestSwingStoreExportsHandler() *SwingStoreExportsHandler {

package/x/swingset/keeper/test_utils.go

@@ -3,12 +3,12 @@ package keeper
 import (
 	"testing"
 
-	"github.com/Agoric/agoric-sdk/golang/cosmos/x/vstorage"
+	"github.com/Agoric/agoric-sdk/golang/cosmos/x/swingset/types"
 )
 
 // GetVstorageKeeper returns the vstorage keeper from the swingset keeper
 // for testing purposes.
-func GetVstorageKeeper(t *testing.T, k Keeper) vstorage.Keeper {
+func GetVstorageKeeper(t *testing.T, k Keeper) types.VstorageKeeper {
 	if t == nil {
 		panic("this function is reserved for testing")
 	}

package/x/swingset/module.go

@@ -3,8 +3,8 @@ package swingset
 import (
 	"context"
 	"encoding/json"
-	"fmt"
 
+	"cosmossdk.io/core/appmodule"
 	"github.com/grpc-ecosystem/grpc-gateway/runtime"
 	"github.com/spf13/cobra"
 
@@ -16,20 +16,28 @@ import (
 	cdctypes "github.com/cosmos/cosmos-sdk/codec/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
 
-	abci "github.com/cometbft/cometbft/abci/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
 // type check to ensure the interface is properly implemented
 var (
-	_ module.AppModule      = AppModule{}
-	_ module.AppModuleBasic = AppModuleBasic{}
+	_ module.AppModule          = AppModule{}
+	_ module.AppModuleBasic     = AppModuleBasic{}
+	_ appmodule.HasBeginBlocker = AppModule{}
+	_ appmodule.HasEndBlocker   = AppModule{}
+	_ module.HasGenesis         = AppModule{}
 )
 
 // app module Basics object
 type AppModuleBasic struct {
 }
 
+// IsAppModule implements the appmodule.AppModule interface.
+func (am AppModule) IsAppModule() {}
+
+// IsOnePerModuleType is a marker function just indicates that this is a one-per-module type.
+func (am AppModule) IsOnePerModuleType() {}
+
 func (AppModuleBasic) Name() string {
 	return ModuleName
 }
@@ -128,26 +136,17 @@ func (am AppModule) RegisterServices(cfg module.Configurator) {
 
 func (AppModule) ConsensusVersion() uint64 { return 2 }
 
-func (am AppModule) BeginBlock(ctx sdk.Context, req abci.RequestBeginBlock) {
+func (am AppModule) BeginBlock(goCtx context.Context) error {
+	ctx := sdk.UnwrapSDKContext(goCtx)
 	am.ensureControllerInited(ctx)
 
-	err := BeginBlock(ctx, req, am.keeper)
-	if err != nil {
-		fmt.Println("BeginBlock error:", err)
-	}
+	return BeginBlock(ctx, am.keeper)
 }
 
-func (am AppModule) EndBlock(ctx sdk.Context, req abci.RequestEndBlock) []abci.ValidatorUpdate {
-	valUpdate, err := EndBlock(ctx, req, am.keeper)
-	if err != nil {
-		fmt.Println("EndBlock error:", err)
-	}
-	if valUpdate != nil {
-		return valUpdate
-	}
-
-	// Prevent Cosmos SDK internal errors.
-	return []abci.ValidatorUpdate{}
+func (am AppModule) EndBlock(goCtx context.Context) error {
+	ctx := sdk.UnwrapSDKContext(goCtx)
+	_, err := EndBlock(ctx, am.keeper)
+	return err
 }
 
 func (am *AppModule) checkSwingStoreExportSetup() {
@@ -156,7 +155,7 @@ func (am *AppModule) checkSwingStoreExportSetup() {
 	}
 }
 
-func (am AppModule) InitGenesis(ctx sdk.Context, cdc codec.JSONCodec, data json.RawMessage) []abci.ValidatorUpdate {
+func (am AppModule) InitGenesis(ctx sdk.Context, cdc codec.JSONCodec, data json.RawMessage) {
 	var genesisState types.GenesisState
 	cdc.MustUnmarshalJSON(data, &genesisState)
 	am.checkSwingStoreExportSetup()
@@ -164,7 +163,6 @@ func (am AppModule) InitGenesis(ctx sdk.Context, cdc codec.JSONCodec, data json.
 	if bootstrapNeeded {
 		am.setBootstrapNeeded()
 	}
-	return []abci.ValidatorUpdate{}
 }
 
 func (am AppModule) ExportGenesis(ctx sdk.Context, cdc codec.JSONCodec) json.RawMessage {

package/x/swingset/testing/queue.go

@@ -4,6 +4,7 @@ import (
 	"testing"
 
 	"github.com/Agoric/agoric-sdk/golang/cosmos/x/swingset/keeper"
+	"github.com/Agoric/agoric-sdk/golang/cosmos/x/vstorage"
 	vstoragetesting "github.com/Agoric/agoric-sdk/golang/cosmos/x/vstorage/testing"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
@@ -13,7 +14,8 @@ import (
 func GetActionQueueRecords(t *testing.T, ctx sdk.Context, swingsetKeeper keeper.Keeper) ([]string, error) {
 	vstorageKeeper := keeper.GetVstorageKeeper(t, swingsetKeeper)
 	actionQueueName := keeper.StoragePathActionQueue
-	return vstoragetesting.GetQueueItems(ctx, vstorageKeeper, actionQueueName)
+	// TODO: fix this type assertion vstorage needs interface needs to be updated
+	return vstoragetesting.GetQueueItems(ctx, vstorageKeeper.(vstorage.Keeper), actionQueueName)
 }
 
 // ResetActionQueue resets the action queue.
@@ -21,5 +23,6 @@ func GetActionQueueRecords(t *testing.T, ctx sdk.Context, swingsetKeeper keeper.
 func ResetActionQueue(t *testing.T, ctx sdk.Context, swingsetKeeper keeper.Keeper) error {
 	vstorageKeeper := keeper.GetVstorageKeeper(t, swingsetKeeper)
 	actionQueueName := keeper.StoragePathActionQueue
-	return vstoragetesting.ResetQueue(ctx, vstorageKeeper, actionQueueName)
+	// TODO: fix this type assertion vstorage needs interface needs to be updated
+	return vstoragetesting.ResetQueue(ctx, vstorageKeeper.(vstorage.Keeper), actionQueueName)
 }