diff --git a/x/rollapp/keeper/msg_server_skip_delay_rollapp.go b/x/rollapp/keeper/msg_server_skip_delay_rollapp.go index b45528eac..2f612f00d 100644 --- a/x/rollapp/keeper/msg_server_skip_delay_rollapp.go +++ b/x/rollapp/keeper/msg_server_skip_delay_rollapp.go @@ -12,7 +12,7 @@ import ( func (k msgServer) SkipDelayRollapp(goCtx context.Context, msg *types.MsgSkipDelayRollapp) (*types.MsgSkipDelayRollappResponse, error) { ctx := sdk.UnwrapSDKContext(goCtx) - if !k.daoKeeper.IsDao(ctx, msg.Creator) { + if !k.daoKeeper.IsGlobalDao(ctx, msg.Creator) { return nil, types.ErrCheckGlobalDao } diff --git a/x/rollapp/keeper/msg_server_skip_delay_rollapp_test.go b/x/rollapp/keeper/msg_server_skip_delay_rollapp_test.go new file mode 100644 index 000000000..53849ad0c --- /dev/null +++ b/x/rollapp/keeper/msg_server_skip_delay_rollapp_test.go @@ -0,0 +1,29 @@ +package keeper_test + +import ( + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/openmetaearth/me-hub/x/rollapp/types" +) + +func (suite *RollappTestSuite) TestSkipDelayRollappRequiresGlobalDao() { + suite.SetupTest() + suite.InitializeDao() + goCtx := sdk.WrapSDKContext(suite.Ctx) + rollappID := suite.CreateDefaultRollapp() + + _, err := suite.msgServer.SkipDelayRollapp(goCtx, &types.MsgSkipDelayRollapp{ + Creator: suite.Dao.MeidDao, + RollappId: rollappID, + Skip: true, + }) + suite.Require().ErrorIs(err, types.ErrCheckGlobalDao) + suite.Require().False(suite.App.RollappKeeper.IsSkipDelayRollapp(suite.Ctx, rollappID)) + + _, err = suite.msgServer.SkipDelayRollapp(goCtx, &types.MsgSkipDelayRollapp{ + Creator: suite.Dao.GlobalDao, + RollappId: rollappID, + Skip: true, + }) + suite.Require().NoError(err) + suite.Require().True(suite.App.RollappKeeper.IsSkipDelayRollapp(suite.Ctx, rollappID)) +} diff --git a/x/rollapp/types/expected_keepers.go b/x/rollapp/types/expected_keepers.go index 8d1d4bf35..7466627c7 100755 --- a/x/rollapp/types/expected_keepers.go +++ b/x/rollapp/types/expected_keepers.go @@ -15,5 +15,5 @@ type ChannelKeeper interface { } type DaoKeeper interface { - IsDao(ctx sdk.Context, address string) bool + IsGlobalDao(ctx sdk.Context, address string) bool }