fix(tests): fix long tests for abci 2.0

simapp/test_helpers.go

@@ -142,13 +142,14 @@ func SetupWithGenesisValSet(t *testing.T, valSet *cmttypes.ValidatorSet, genAccs
 	)
 
 	// commit genesis changes
-	app.Commit(context.TODO(), &abci.RequestCommit{})
-	// app.BeginBlock(abci.RequestBeginBlock{Header: cmtproto.Header{
-	// 	Height:             app.LastBlockHeight() + 1,
-	// 	AppHash:            app.LastCommitID().Hash,
-	// 	ValidatorsHash:     valSet.Hash(),
-	// 	NextValidatorsHash: valSet.Hash(),
-	// }})
+	_, err = app.Commit(context.TODO(), nil)
+	require.NoError(t, err)
+	_, err = app.FinalizeBlock(context.TODO(), &abci.RequestFinalizeBlock{
+		Height:             app.LastBlockHeight() + 1,
+		Hash:               app.LastCommitID().Hash,
+		NextValidatorsHash: valSet.Hash(),
+	})
+	require.NoError(t, err)
 
 	return app
 }

tests/integration/store/rootmulti/rollback_test.go

@@ -23,7 +23,7 @@ func TestRollback(t *testing.T) {
 		AppOpts: simtestutil.NewAppOptionsWithFlagHome(t.TempDir()),
 	}
 	app := simapp.NewSimappWithCustomOptions(t, false, options)
-	app.Commit(context.TODO(), &abci.RequestCommit{})
+	app.Commit(context.TODO(), nil)
 	ver0 := app.LastBlockHeight()
 	// commit 10 blocks
 	for i := int64(1); i <= 10; i++ {
@@ -38,7 +38,7 @@ func TestRollback(t *testing.T) {
 		ctx := app.NewContext(false, header)
 		store := ctx.KVStore(app.GetKey("bank"))
 		store.Set([]byte("key"), []byte(fmt.Sprintf("value%d", i)))
-		app.Commit(context.TODO(), &abci.RequestCommit{})
+		app.Commit(context.TODO(), nil)
 	}
 
 	assert.Equal(t, ver0+10, app.LastBlockHeight())
@@ -61,13 +61,11 @@ func TestRollback(t *testing.T) {
 			Height:  ver0 + i,
 			AppHash: app.LastCommitID().Hash,
 		}
-		app.FinalizeBlock(context.TODO(), &abci.RequestFinalizeBlock{
-			Height: ver0 + i,
-		})
+		app.FinalizeBlock(context.TODO(), &abci.RequestFinalizeBlock{Height: ver0 + i})
 		ctx := app.NewContext(false, header)
 		store := ctx.KVStore(app.GetKey("bank"))
 		store.Set([]byte("key"), []byte(fmt.Sprintf("VALUE%d", i)))
-		app.Commit(context.TODO(), &abci.RequestCommit{})
+		app.Commit(context.TODO(), nil)
 	}
 
 	assert.Equal(t, ver0+10, app.LastBlockHeight())

testutil/integration/options.go

@@ -9,7 +9,7 @@ type Config struct {
 // Option is a function that can be used to configure the integration app.
 type Option func(*Config)
 
-// WithAutomaticBlockCreation enables begin/end block calls.
+// WithAutomaticFinalizeBlock calls ABCI finalize block.
 func WithAutomaticFinalizeBlock() Option {
 	return func(cfg *Config) {
 		cfg.AutomaticFinalizeBlock = true

testutil/integration/router.go

@@ -80,25 +80,28 @@ func NewIntegrationApp(
 	bApp.SetMsgServiceRouter(router)
 
 	if keys[consensusparamtypes.StoreKey] != nil {
-
 		// set baseApp param store
 		consensusParamsKeeper := consensusparamkeeper.NewKeeper(appCodec, runtime.NewKVStoreService(keys[consensusparamtypes.StoreKey]), authtypes.NewModuleAddress("gov").String(), runtime.EventService{})
 		bApp.SetParamStore(consensusParamsKeeper.ParamsStore)
 
 		if err := bApp.LoadLatestVersion(); err != nil {
 			panic(fmt.Errorf("failed to load application version from store: %w", err))
 		}
-		bApp.InitChain(context.TODO(), &cmtabcitypes.RequestInitChain{ChainId: appName, ConsensusParams: simtestutil.DefaultConsensusParams})
 
+		if _, err := bApp.InitChain(context.TODO(), &cmtabcitypes.RequestInitChain{ChainId: appName, ConsensusParams: simtestutil.DefaultConsensusParams}); err != nil {
+			panic(fmt.Errorf("failed to initialize application: %w", err))
+		}
 	} else {
 		if err := bApp.LoadLatestVersion(); err != nil {
 			panic(fmt.Errorf("failed to load application version from store: %w", err))
 		}
-		bApp.InitChain(context.TODO(), &cmtabcitypes.RequestInitChain{ChainId: appName})
+
+		if _, err := bApp.InitChain(context.TODO(), &cmtabcitypes.RequestInitChain{ChainId: appName}); err != nil {
+			panic(fmt.Errorf("failed to initialize application: %w", err))
+		}
 	}
 
-	bApp.InitChain(context.Background(), &cmtabcitypes.RequestInitChain{ChainId: appName})
-	bApp.Commit(context.TODO(), &cmtabcitypes.RequestCommit{})
+	bApp.Commit(context.TODO(), nil)
 
 	ctx := sdkCtx.WithBlockHeader(cmtproto.Header{ChainID: appName}).WithIsCheckTx(true)
 
@@ -125,22 +128,15 @@ func (app *App) RunMsg(msg sdk.Msg, option ...Option) (*codectypes.Any, error) {
 	}
 
 	if cfg.AutomaticCommit {
-		defer app.Commit(context.TODO(), &cmtabcitypes.RequestCommit{})
+		defer app.Commit(context.TODO(), nil)
 	}
 
 	if cfg.AutomaticFinalizeBlock {
 		height := app.LastBlockHeight() + 1
 		ctx := app.ctx.WithBlockHeight(height).WithChainID(appName)
-
-		app.FinalizeBlock(context.TODO(), &cmtabcitypes.RequestFinalizeBlock{Height: height})
-
-		app.logger.Info("Running BeginBlock", "height", height)
-		app.moduleManager.BeginBlock(ctx)
-
-		defer func() {
-			app.logger.Info("Running EndBlock", "height", height)
-			app.moduleManager.EndBlock(ctx)
-		}()
+		if _, err := app.FinalizeBlock(ctx, &cmtabcitypes.RequestFinalizeBlock{Height: height}); err != nil {
+			return nil, fmt.Errorf("failed to run finalize block: %w", err)
+		}
 	}
 
 	app.logger.Info("Running msg", "msg", msg.String())

testutil/sims/app_helpers.go

@@ -169,6 +169,11 @@ func SetupWithConfiguration(appConfig depinject.Config, startupConfig StartupCon
 
 	// commit genesis changes
 	if !startupConfig.AtGenesis {
+		_, err = app.Commit(context.TODO(), nil)
+		if err != nil {
+			return nil, fmt.Errorf("failed to commit genesis changes: %w", err)
+		}
+
 		_, err = app.FinalizeBlock(context.TODO(), &abci.RequestFinalizeBlock{
 			Height:             app.LastBlockHeight() + 1,
 			NextValidatorsHash: valSet.Hash(),