From 57181703c1a4498717b902af103cfe959ce530d9 Mon Sep 17 00:00:00 2001
From: Randy Grok <@faulttolerance.net>
Date: Tue, 26 Nov 2024 16:25:26 +0100
Subject: [PATCH] fix merge errors

---
 server/v2/cometbft/abci_test.go |  6 +++---
 server/v2/cometbft/server.go    | 10 ++++++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/server/v2/cometbft/abci_test.go b/server/v2/cometbft/abci_test.go
index 2f3d0b9de728..d1ffc547c114 100644
--- a/server/v2/cometbft/abci_test.go
+++ b/server/v2/cometbft/abci_test.go
@@ -2,7 +2,6 @@ package cometbft
 
 import (
 	"context"
-	"cosmossdk.io/server/v2/cometbft/oe"
 	"crypto/sha256"
 	"encoding/json"
 	"errors"
@@ -12,6 +11,7 @@ import (
 	"testing"
 	"time"
 
+	"cosmossdk.io/server/v2/cometbft/oe"
 	abciproto "github.com/cometbft/cometbft/api/cometbft/abci/v1"
 	v1 "github.com/cometbft/cometbft/api/cometbft/types/v1"
 	"github.com/cosmos/gogoproto/proto"
@@ -729,6 +729,7 @@ func assertStoreLatestVersion(t *testing.T, store types.Store, target uint64) {
 
 func TestOptimisticExecution(t *testing.T) {
 	c := setUpConsensus(t, 100_000, mempool.NoOpMempool[mock.Tx]{})
+
 	// Set up handlers
 	c.processProposalHandler = DefaultServerOptions[mock.Tx]().ProcessProposalHandler
 
@@ -738,8 +739,7 @@ func TestOptimisticExecution(t *testing.T) {
 		calledTimes++
 		return nil, errors.New("test error")
 	}
-
-	c.SetOptimisticExecution(oe.NewOptimisticExecution(log.NewNopLogger(), optimisticMockFunc))
+	c.optimisticExec = oe.NewOptimisticExecution(log.NewNopLogger(), optimisticMockFunc)
 
 	_, err := c.InitChain(context.Background(), &abciproto.InitChainRequest{
 		Time:          time.Now(),
diff --git a/server/v2/cometbft/server.go b/server/v2/cometbft/server.go
index f96309c1a8a5..6567e01caef0 100644
--- a/server/v2/cometbft/server.go
+++ b/server/v2/cometbft/server.go
@@ -165,7 +165,7 @@ func New[T transaction.Tx](
 		}
 	}
 
-	srv.Consensus = &consensus[T]{
+	c := &consensus[T]{
 		appName:                appName,
 		version:                getCometBFTServerVersion(),
 		app:                    app,
@@ -191,9 +191,15 @@ func New[T transaction.Tx](
 		getProtoRegistry:       sync.OnceValues(gogoproto.MergedRegistry),
 		addrPeerFilter:         srv.serverOptions.AddrPeerFilter,
 		idPeerFilter:           srv.serverOptions.IdPeerFilter,
-		optimisticExec:         oe.NewOptimisticExecution(logger, consensus.internalFinalizeBlock),
 	}
 
+	c.optimisticExec = oe.NewOptimisticExecution(
+		logger,
+		c.internalFinalizeBlock,
+	)
+
+	srv.Consensus = c
+
 	return srv, nil
 }