Revert "add precommit callback (#7)" (#10)

This reverts commit 0e85c49.

baseapp/abci.go

@@ -485,10 +485,6 @@ func (app *BaseApp) Commit() abci.ResponseCommit {
 	// Commit. Use the header from this latest block.
 	app.setState(runTxModeCheck, header)
 
-	if app.precommiter != nil {
-		app.precommiter(app.deliverState.ctx)
-	}
-
 	// empty/reset the deliver state
 	app.deliverState = nil
 

baseapp/abci_test.go

@@ -625,33 +625,6 @@ func TestBaseApp_Commit(t *testing.T) {
 	require.Equal(t, true, wasCommiterCalled)
 }
 
-func TestBaseApp_Precommit(t *testing.T) {
-	db := dbm.NewMemDB()
-	name := t.Name()
-	logger := defaultLogger()
-
-	cp := &tmproto.ConsensusParams{
-		Block: &tmproto.BlockParams{
-			MaxGas: 5000000,
-		},
-	}
-
-	app := baseapp.NewBaseApp(name, logger, db, nil)
-	app.SetParamStore(&paramStore{db: dbm.NewMemDB()})
-	app.InitChain(abci.RequestInitChain{
-		ConsensusParams: cp,
-	})
-
-	wasPrecommiterCalled := false
-	app.SetPrecommiter(func(ctx sdk.Context) {
-		wasPrecommiterCalled = true
-	})
-	app.Seal()
-
-	app.Commit()
-	require.Equal(t, true, wasPrecommiterCalled)
-}
-
 func TestABCI_CheckTx(t *testing.T) {
 	// This ante handler reads the key and checks that the value matches the
 	// current counter. This ensures changes to the KVStore persist across
@@ -1387,6 +1360,7 @@ func TestCommiterCalledWithCheckState(t *testing.T) {
 
 	wasCommiterCalled := false
 	app.SetCommiter(func(ctx sdk.Context) {
+		// Make sure context is for next block
 		require.Equal(t, true, ctx.IsCheckTx())
 		wasCommiterCalled = true
 	})
@@ -1397,28 +1371,6 @@ func TestCommiterCalledWithCheckState(t *testing.T) {
 	require.Equal(t, true, wasCommiterCalled)
 }
 
-// Verifies that the Precommiter is called with the deliverState.
-func TestPrecommiterCalledWithDeliverState(t *testing.T) {
-	t.Parallel()
-
-	logger := defaultLogger()
-	db := dbm.NewMemDB()
-	name := t.Name()
-	app := baseapp.NewBaseApp(name, logger, db, nil)
-
-	wasPrecommiterCalled := false
-	app.SetPrecommiter(func(ctx sdk.Context) {
-		require.Equal(t, false, ctx.IsCheckTx())
-		require.Equal(t, false, ctx.IsReCheckTx())
-		wasPrecommiterCalled = true
-	})
-
-	app.BeginBlock(abci.RequestBeginBlock{Header: tmproto.Header{Height: 1}})
-	app.Commit()
-
-	require.Equal(t, true, wasPrecommiterCalled)
-}
-
 func TestABCI_Proposal_HappyPath(t *testing.T) {
 	anteKey := []byte("ante-key")
 	pool := mempool.NewSenderNonceMempool()

baseapp/baseapp.go

@@ -71,7 +71,6 @@ type BaseApp struct { //nolint: maligned
 	prepareProposal sdk.PrepareProposalHandler // the handler which runs on ABCI PrepareProposal
 	endBlocker      sdk.EndBlocker             // logic to run after all txs, and to determine valset changes
 	commiter        sdk.Commiter               // logic to run during commit
-	precommiter     sdk.Precommiter            // logic to run during commit using the deliverState
 	addrPeerFilter  sdk.PeerFilter             // filter peers by address and port
 	idPeerFilter    sdk.PeerFilter             // filter peers by node ID
 	fauxMerkleMode  bool                       // if true, IAVL MountStores uses MountStoresDB for simulation speed.

baseapp/baseapp_test.go

@@ -391,9 +391,6 @@ func TestBaseAppOptionSeal(t *testing.T) {
 	require.Panics(t, func() {
 		suite.baseApp.SetCommiter(nil)
 	})
-	require.Panics(t, func() {
-		suite.baseApp.SetPrecommiter(nil)
-	})
 	require.Panics(t, func() {
 		suite.baseApp.SetAnteHandler(nil)
 	})

baseapp/options.go

@@ -175,14 +175,6 @@ func (app *BaseApp) SetCommiter(commiter sdk.Commiter) {
 	app.commiter = commiter
 }
 
-func (app *BaseApp) SetPrecommiter(precommiter sdk.Precommiter) {
-	if app.sealed {
-		panic("SetPrecommiter() on sealed BaseApp")
-	}
-
-	app.precommiter = precommiter
-}
-
 func (app *BaseApp) SetAnteHandler(ah sdk.AnteHandler) {
 	if app.sealed {
 		panic("SetAnteHandler() on sealed BaseApp")

types/abci.go

@@ -23,9 +23,6 @@ type EndBlocker func(ctx Context, req abci.RequestEndBlock) (abci.ResponseEndBlo
 // branched for the new block.
 type Commiter func(ctx Context)
 
-// Precommiter runs code during commit before the `deliverState` is reset.
-type Precommiter func(ctx Context)
-
 // PeerFilter responds to p2p filtering queries from Tendermint
 type PeerFilter func(info string) abci.ResponseQuery
 

types/module/module.go

@@ -218,12 +218,6 @@ type CommitAppModule interface {
 	Commit(sdk.Context)
 }
 
-// PreommitAppModule is an extension interface that contains information about the AppModule and Precommit.
-type PrecommitAppModule interface {
-	AppModule
-	Precommit(sdk.Context)
-}
-
 // GenesisOnlyAppModule is an AppModule that only has import/export functionality
 type GenesisOnlyAppModule struct {
 	AppModuleGenesis
@@ -271,7 +265,6 @@ type Manager struct {
 	OrderBeginBlockers []string
 	OrderEndBlockers   []string
 	OrderCommiters     []string
-	OrderPrecommiters  []string
 	OrderMigrations    []string
 }
 
@@ -290,7 +283,6 @@ func NewManager(modules ...AppModule) *Manager {
 		OrderExportGenesis: modulesStr,
 		OrderBeginBlockers: modulesStr,
 		OrderCommiters:     modulesStr,
-		OrderPrecommiters:  modulesStr,
 		OrderEndBlockers:   modulesStr,
 	}
 }
@@ -361,11 +353,6 @@ func (m *Manager) SetOrderCommiters(moduleNames ...string) {
 	m.OrderCommiters = moduleNames
 }
 
-// SetOrderPrecommiters sets the order of set precommiter calls
-func (m *Manager) SetOrderPrecommiters(moduleNames ...string) {
-	m.OrderPrecommiters = moduleNames
-}
-
 // SetOrderEndBlockers sets the order of set end-blocker calls
 func (m *Manager) SetOrderEndBlockers(moduleNames ...string) {
 	m.assertNoForgottenModules("SetOrderEndBlockers", moduleNames,
@@ -743,17 +730,6 @@ func (m *Manager) Commit(ctx sdk.Context) {
 	}
 }
 
-// Precommit performs precommit functionality for all modules.
-func (m *Manager) Precommit(ctx sdk.Context) {
-	for _, moduleName := range m.OrderPrecommiters {
-		module, ok := m.Modules[moduleName].(PrecommitAppModule)
-		if !ok {
-			continue
-		}
-		module.Precommit(ctx)
-	}
-}
-
 // GetVersionMap gets consensus version from all modules
 func (m *Manager) GetVersionMap() VersionMap {
 	vermap := make(VersionMap)

types/module/module_test.go

@@ -132,10 +132,6 @@ func TestManagerOrderSetters(t *testing.T) {
 	require.Equal(t, []string{"module1", "module2"}, mm.OrderCommiters)
 	mm.SetOrderCommiters("module2", "module1")
 	require.Equal(t, []string{"module2", "module1"}, mm.OrderCommiters)
-
-	require.Equal(t, []string{"module1", "module2"}, mm.OrderPrecommiters)
-	mm.SetOrderPrecommiters("module2", "module1")
-	require.Equal(t, []string{"module2", "module1"}, mm.OrderPrecommiters)
 }
 
 func TestManager_RegisterInvariants(t *testing.T) {
@@ -511,23 +507,6 @@ func TestManager_Commit(t *testing.T) {
 	mm.Commit(sdk.Context{})
 }
 
-func TestManager_Precommit(t *testing.T) {
-	mockCtrl := gomock.NewController(t)
-	t.Cleanup(mockCtrl.Finish)
-
-	mockAppModule1 := mock.NewMockPrecommitAppModule(mockCtrl)
-	mockAppModule2 := mock.NewMockPrecommitAppModule(mockCtrl)
-	mockAppModule1.EXPECT().Name().Times(2).Return("module1")
-	mockAppModule2.EXPECT().Name().Times(2).Return("module2")
-	mm := module.NewManager(mockAppModule1, mockAppModule2)
-	require.NotNil(t, mm)
-	require.Equal(t, 2, len(mm.Modules))
-
-	mockAppModule1.EXPECT().Precommit(gomock.Any()).Times(1)
-	mockAppModule2.EXPECT().Precommit(gomock.Any()).Times(1)
-	mm.Precommit(sdk.Context{})
-}
-
 // MockCoreAppModule allows us to test functions like DefaultGenesis
 type MockCoreAppModule struct{}