From b995dbd90751c9c3c76060a241bfd9f8a3683cb8 Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Mon, 18 Nov 2024 14:32:03 +0100 Subject: [PATCH] remove scrums of previous app closer --- server/v2/cometbft/abci.go | 3 --- server/v2/cometbft/abci_test.go | 2 +- server/v2/cometbft/server.go | 1 - 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/server/v2/cometbft/abci.go b/server/v2/cometbft/abci.go index 1b64ec60874c..42f34565c8bf 100644 --- a/server/v2/cometbft/abci.go +++ b/server/v2/cometbft/abci.go @@ -48,7 +48,6 @@ type Consensus[T transaction.Tx] struct { logger log.Logger appName, version string app appmanager.AppManager[T] - appCloser func() error txCodec transaction.Codec[T] store types.Store streaming streaming.Manager @@ -83,7 +82,6 @@ func NewConsensus[T transaction.Tx]( logger log.Logger, appName string, app appmanager.AppManager[T], - appCloser func() error, mp mempool.Mempool[T], indexedEvents map[string]struct{}, queryHandlersMap map[string]appmodulev2.Handler, @@ -96,7 +94,6 @@ func NewConsensus[T transaction.Tx]( appName: appName, version: getCometBFTServerVersion(), app: app, - appCloser: appCloser, cfg: cfg, store: store, logger: logger, diff --git a/server/v2/cometbft/abci_test.go b/server/v2/cometbft/abci_test.go index 85433d426cfe..ab29139da33e 100644 --- a/server/v2/cometbft/abci_test.go +++ b/server/v2/cometbft/abci_test.go @@ -699,7 +699,7 @@ func setUpConsensus(t *testing.T, gasLimit uint64, mempool mempool.Mempool[mock. nil, ) - return NewConsensus[mock.Tx](log.NewNopLogger(), "testing-app", am, func() error { return nil }, + return NewConsensus[mock.Tx](log.NewNopLogger(), "testing-app", am, mempool, map[string]struct{}{}, nil, mockStore, Config{AppTomlConfig: DefaultAppTomlConfig()}, mock.TxCodec{}, "test") } diff --git a/server/v2/cometbft/server.go b/server/v2/cometbft/server.go index 55f80f69ed3a..a8269317fad7 100644 --- a/server/v2/cometbft/server.go +++ b/server/v2/cometbft/server.go @@ -116,7 +116,6 @@ func New[T transaction.Tx]( logger, appName, appManager, - nil, srv.serverOptions.Mempool(cfg), indexEvents, queryHandlers,