Skip to content

Commit f631efd

Browse files
committed
Refactor DA retrieval logic into daRetriever struct
Move pending event management and DA processing from Manager to a new daRetriever type. Update tests and loops to use daRetriever. Remove blocking waitForHeight logic from store retriever.
1 parent 45bc78b commit f631efd

6 files changed

Lines changed: 128 additions & 151 deletions

File tree

block/manager.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -164,11 +164,6 @@ type Manager struct {
164164
// namespaceMigrationCompleted tracks whether we have completed the migration
165165
// from legacy namespace to separate header/data namespaces
166166
namespaceMigrationCompleted *atomic.Bool
167-
168-
// pendingSyncEvents stores height events that are waiting for their prerequisite height
169-
pendingSyncEvents map[uint64][]NewHeightEvent
170-
// pendingMutex protects access to pendingEvents
171-
pendingMutex sync.RWMutex
172167
}
173168

174169
// getInitialState tries to load lastState from Store, and if it's not available it reads genesis.
@@ -405,7 +400,6 @@ func NewManager(
405400
syncNodeSignaturePayloadProvider: managerOpts.SyncNodeSignatureBytesProvider,
406401
validatorHasherProvider: managerOpts.ValidatorHasherProvider,
407402
namespaceMigrationCompleted: &atomic.Bool{},
408-
pendingSyncEvents: make(map[uint64][]NewHeightEvent),
409403
}
410404

411405
// initialize da included height

block/namespace_test.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ func TestProcessNextDAHeaderAndData_MixedResults(t *testing.T) {
137137
DataNamespace: "test-data",
138138
}
139139
manager, mockDA, _, cancel := setupManagerForNamespaceTest(t, daConfig)
140+
daManager := newDARetriever(manager)
140141
defer cancel()
141142

142143
// Mark migration as completed to skip legacy namespace check
@@ -171,7 +172,7 @@ func TestProcessNextDAHeaderAndData_MixedResults(t *testing.T) {
171172
}
172173

173174
ctx := context.Background()
174-
err := manager.processNextDAHeaderAndData(ctx)
175+
err := daManager.processNextDAHeaderAndData(ctx)
175176

176177
if tt.expectError {
177178
require.Error(t, err, "Expected error but got none")
@@ -241,6 +242,7 @@ func TestNamespaceMigration_Completion(t *testing.T) {
241242
DataNamespace: "test-data",
242243
}
243244
manager, mockDA, _, cancel := setupManagerForNamespaceTest(t, daConfig)
245+
daManager := newDARetriever(manager)
244246
defer cancel()
245247

246248
// Set initial migration state
@@ -314,7 +316,7 @@ func TestNamespaceMigration_Completion(t *testing.T) {
314316
// If migration should complete, expect persistence call
315317

316318
ctx := context.Background()
317-
err := manager.processNextDAHeaderAndData(ctx)
319+
err := daManager.processNextDAHeaderAndData(ctx)
318320

319321
require.NoError(t, err, "processNextDAHeaderAndData should not return error")
320322

@@ -454,6 +456,7 @@ func TestLegacyNamespaceDetection(t *testing.T) {
454456

455457
// Test actual behavior in fetchBlobs
456458
manager, mockDA, _, cancel := setupManagerForNamespaceTest(t, daConfig)
459+
daManager := newDARetriever(manager)
457460
defer cancel()
458461

459462
// Start with migration not completed
@@ -530,7 +533,7 @@ func TestLegacyNamespaceDetection(t *testing.T) {
530533
}
531534

532535
ctx := context.Background()
533-
err := manager.processNextDAHeaderAndData(ctx)
536+
err := daManager.processNextDAHeaderAndData(ctx)
534537

535538
// Should succeed with no data found (returns nil on StatusNotFound)
536539
require.NoError(t, err)

0 commit comments

Comments
 (0)