Resolve merge conflicts

Author: alpe

block/internal/syncing/syncer.go

@@ -207,7 +207,7 @@ func (s *Syncer) Start(ctx context.Context) error {
 	s.asyncDARetriever = NewAsyncDARetriever(s.daRetriever, s.heightInCh, s.logger)
 	s.asyncDARetriever.Start(s.ctx)
 	s.fiRetriever = da.NewForcedInclusionRetriever(s.daClient, s.logger, s.config, s.genesis.DAStartHeight, s.genesis.DAEpochForcedInclusion)
-	s.p2pHandler = NewP2PHandler(s.headerStore.Store(), s.dataStore.Store(), s.cache, s.genesis, s.logger)
+	s.p2pHandler = NewP2PHandler(s.headerStore, s.dataStore, s.cache, s.genesis, s.logger)
 	if currentHeight, err := s.store.Height(s.ctx); err != nil {
 		s.logger.Error().Err(err).Msg("failed to set initial processed height for p2p handler")
 	} else {

block/internal/syncing/syncer_test.go

@@ -769,7 +769,7 @@ func TestProcessHeightEvent_TriggersAsyncDARetrieval(t *testing.T) {
 	require.NoError(t, batch.SetHeight(1))
 	require.NoError(t, batch.Commit())
 
-	s.processHeightEvent(&evt)
+	s.processHeightEvent(t.Context(), &evt)
 
 	// Verify that the request was queued in the async retriever
 	select {