Resolve conflicts

Author: alpe

block/internal/executing/executor.go

@@ -296,7 +296,6 @@ func (e *Executor) initializeState() error {
 
 	// Sync execution layer to the target height (Raft height if behind, local height otherwise)
 	execReplayer := common.NewReplayer(e.store, e.exec, e.genesis, e.logger)
-	syncTargetHeight := state.LastBlockHeight
 	if err := execReplayer.SyncToHeight(e.ctx, syncTargetHeight); err != nil {
 		e.sendCriticalError(fmt.Errorf("failed to sync execution layer: %w", err))
 		return fmt.Errorf("failed to sync execution layer: %w", err)

block/internal/submitting/submitter.go

@@ -195,7 +195,6 @@ func (s *Submitter) daSubmissionLoop() {
 					s.logger.Debug().Time("t", time.Now()).Uint64("headers", headersNb).Msg("Header submission in progress")
 					s.wg.Add(1)
 					go func() {
-						defer s.wg.Done()
 						defer func() {
 							s.headerSubmissionMtx.Unlock()
 							s.logger.Debug().Time("t", time.Now()).Uint64("headers", headersNb).Msg("Header submission completed")
@@ -256,7 +255,6 @@ func (s *Submitter) daSubmissionLoop() {
 					s.logger.Debug().Time("t", time.Now()).Uint64("data", dataNb).Msg("Data submission in progress")
 					s.wg.Add(1)
 					go func() {
-						defer s.wg.Done()
 						defer func() {
 							s.dataSubmissionMtx.Unlock()
 							s.logger.Debug().Time("t", time.Now()).Uint64("data", dataNb).Msg("Data submission completed")

block/internal/syncing/syncer_test.go

@@ -625,13 +625,6 @@ func TestSyncer_InitializeState_CallsReplayer(t *testing.T) {
 	// Setup execution layer to be in sync
 	mockExec.On("GetLatestHeight", mock.Anything).Return(storeHeight, nil)
 
-	// Mock batch operations
-	mockBatch := new(testmocks.MockBatch)
-	mockBatch.On("SetHeight", storeHeight).Return(nil)
-	mockBatch.On("UpdateState", mock.Anything).Return(nil)
-	mockBatch.On("Commit").Return(nil)
-	mockStore.EXPECT().NewBatch(mock.Anything).Return(mockBatch, nil)
-
 	syncer := &Syncer{
 		store:             mockStore,
 		exec:              mockExec,