Skip to content

Commit 5232812

Browse files
chattonchatton
committed
chore: propagating context
1 parent 43d5043 commit 5232812

18 files changed

+306
-304
lines changed

‎block/internal/cache/bench_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@ func benchSetupStore(b *testing.B, n int, txsPer int, chainID string) store.Stor
4040
if err != nil {
4141
b.Fatal(err)
4242
}
43-
if err := batch.SaveBlockData(h, d, &types.Signature{}); err != nil {
43+
if err := batch.SaveBlockData(ctx, h, d, &types.Signature{}); err != nil {
4444
b.Fatal(err)
4545
}
46-
if err := batch.SetHeight(uint64(i)); err != nil {
46+
if err := batch.SetHeight(ctx, uint64(i)); err != nil {
4747
b.Fatal(err)
4848
}
49-
if err := batch.Commit(); err != nil {
49+
if err := batch.Commit(ctx); err != nil {
5050
b.Fatal(err)
5151
}
5252
}

‎block/internal/cache/manager_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -169,11 +169,11 @@ func TestPendingHeadersAndData_Flow(t *testing.T) {
169169
}{{h1, d1}, {h2, d2}, {h3, d3}} {
170170
batch, err := st.NewBatch(ctx)
171171
require.NoError(t, err)
172-
err = batch.SaveBlockData(pair.h, pair.d, &types.Signature{})
172+
err = batch.SaveBlockData(ctx, pair.h, pair.d, &types.Signature{})
173173
require.NoError(t, err)
174-
err = batch.SetHeight(uint64(i + 1))
174+
err = batch.SetHeight(ctx, uint64(i+1))
175175
require.NoError(t, err)
176-
err = batch.Commit()
176+
err = batch.Commit(ctx)
177177
require.NoError(t, err)
178178
}
179179

‎block/internal/cache/pending_base_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ func TestPendingBase_PersistLastSubmitted(t *testing.T) {
6060
// store height 3 to make numPending meaningful
6161
batch, err := st.NewBatch(ctx)
6262
require.NoError(t, err)
63-
require.NoError(t, batch.SetHeight(3))
64-
require.NoError(t, batch.Commit())
63+
require.NoError(t, batch.SetHeight(ctx, 3))
64+
require.NoError(t, batch.Commit(ctx))
6565
assert.Equal(t, uint64(3), ph.NumPendingHeaders())
6666

6767
// set last submitted higher and ensure metadata is written

‎block/internal/cache/pending_data_test.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ func TestPendingData_BasicFlow(t *testing.T) {
2929
}{{h1, d1}, {h2, d2}, {h3, d3}} {
3030
batch, err := store.NewBatch(ctx)
3131
require.NoError(t, err)
32-
require.NoError(t, batch.SaveBlockData(p.h, p.d, &types.Signature{}))
33-
require.NoError(t, batch.SetHeight(uint64(i+1)))
34-
require.NoError(t, batch.Commit())
32+
require.NoError(t, batch.SaveBlockData(ctx, p.h, p.d, &types.Signature{}))
33+
require.NoError(t, batch.SetHeight(ctx, uint64(i+1)))
34+
require.NoError(t, batch.Commit(ctx))
3535
}
3636

3737
pendingData, err := NewPendingData(store, zerolog.Nop())
@@ -74,8 +74,8 @@ func TestPendingData_InitFromMetadata(t *testing.T) {
7474
// store height is 3
7575
batch, err := store.NewBatch(ctx)
7676
require.NoError(t, err)
77-
require.NoError(t, batch.SetHeight(3))
78-
require.NoError(t, batch.Commit())
77+
require.NoError(t, batch.SetHeight(ctx, 3))
78+
require.NoError(t, batch.Commit(ctx))
7979

8080
pendingData, err := NewPendingData(store, zerolog.Nop())
8181
require.NoError(t, err)
@@ -90,8 +90,8 @@ func TestPendingData_GetPending_PropagatesFetchError(t *testing.T) {
9090
// Set height to 1 but do not save any block data
9191
batch, err := store.NewBatch(ctx)
9292
require.NoError(t, err)
93-
require.NoError(t, batch.SetHeight(1))
94-
require.NoError(t, batch.Commit())
93+
require.NoError(t, batch.SetHeight(ctx, 1))
94+
require.NoError(t, batch.Commit(ctx))
9595

9696
pendingData, err := NewPendingData(store, zerolog.Nop())
9797
require.NoError(t, err)

‎block/internal/cache/pending_headers_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ func TestPendingHeaders_BasicFlow(t *testing.T) {
2929
}{{h1, d1}, {h2, d2}, {h3, d3}} {
3030
batch, err := store.NewBatch(ctx)
3131
require.NoError(t, err)
32-
require.NoError(t, batch.SaveBlockData(p.h, p.d, &types.Signature{}))
33-
require.NoError(t, batch.SetHeight(uint64(i+1)))
34-
require.NoError(t, batch.Commit())
32+
require.NoError(t, batch.SaveBlockData(ctx, p.h, p.d, &types.Signature{}))
33+
require.NoError(t, batch.SetHeight(ctx, uint64(i+1)))
34+
require.NoError(t, batch.Commit(ctx))
3535
}
3636

3737
pendingHeaders, err := NewPendingHeaders(store, zerolog.Nop())
@@ -72,9 +72,9 @@ func TestPendingHeaders_EmptyWhenUpToDate(t *testing.T) {
7272
h, d := types.GetRandomBlock(1, 1, "ph-up")
7373
batch, err := store.NewBatch(ctx)
7474
require.NoError(t, err)
75-
require.NoError(t, batch.SaveBlockData(h, d, &types.Signature{}))
76-
require.NoError(t, batch.SetHeight(1))
77-
require.NoError(t, batch.Commit())
75+
require.NoError(t, batch.SaveBlockData(ctx, h, d, &types.Signature{}))
76+
require.NoError(t, batch.SetHeight(ctx, 1))
77+
require.NoError(t, batch.Commit(ctx))
7878

7979
pendingHeaders, err := NewPendingHeaders(store, zerolog.Nop())
8080
require.NoError(t, err)

‎block/internal/executing/executor.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -224,13 +224,13 @@ func (e *Executor) initializeState() error {
224224
if err != nil {
225225
return fmt.Errorf("failed to create batch: %w", err)
226226
}
227-
if err := batch.SetHeight(state.LastBlockHeight); err != nil {
227+
if err := batch.SetHeight(e.ctx, state.LastBlockHeight); err != nil {
228228
return fmt.Errorf("failed to set store height: %w", err)
229229
}
230-
if err := batch.UpdateState(state); err != nil {
230+
if err := batch.UpdateState(e.ctx, state); err != nil {
231231
return fmt.Errorf("failed to update state: %w", err)
232232
}
233-
if err := batch.Commit(); err != nil {
233+
if err := batch.Commit(e.ctx); err != nil {
234234
return fmt.Errorf("failed to commit batch: %w", err)
235235
}
236236

@@ -389,10 +389,10 @@ func (e *Executor) ProduceBlock(ctx context.Context) error {
389389
if err != nil {
390390
return fmt.Errorf("failed to create batch for early save: %w", err)
391391
}
392-
if err = batch.SaveBlockData(header, data, &types.Signature{}); err != nil {
392+
if err = batch.SaveBlockData(ctx, header, data, &types.Signature{}); err != nil {
393393
return fmt.Errorf("failed to save block data: %w", err)
394394
}
395-
if err = batch.Commit(); err != nil {
395+
if err = batch.Commit(ctx); err != nil {
396396
return fmt.Errorf("failed to commit early save batch: %w", err)
397397
}
398398
}
@@ -433,19 +433,19 @@ func (e *Executor) ProduceBlock(ctx context.Context) error {
433433
return fmt.Errorf("failed to create batch: %w", err)
434434
}
435435

436-
if err := batch.SaveBlockData(header, data, &signature); err != nil {
436+
if err := batch.SaveBlockData(ctx, header, data, &signature); err != nil {
437437
return fmt.Errorf("failed to save block: %w", err)
438438
}
439439

440-
if err := batch.SetHeight(newHeight); err != nil {
440+
if err := batch.SetHeight(ctx, newHeight); err != nil {
441441
return fmt.Errorf("failed to update store height: %w", err)
442442
}
443443

444-
if err := batch.UpdateState(newState); err != nil {
444+
if err := batch.UpdateState(ctx, newState); err != nil {
445445
return fmt.Errorf("failed to update state: %w", err)
446446
}
447447

448-
if err := batch.Commit(); err != nil {
448+
if err := batch.Commit(ctx); err != nil {
449449
return fmt.Errorf("failed to commit batch: %w", err)
450450
}
451451

‎block/internal/executing/executor_restart_test.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,11 +156,12 @@ func TestExecutor_RestartUsesPendingHeader(t *testing.T) {
156156
pendingHeader.DataHash = pendingData.DACommitment()
157157

158158
// Save pending block data (this is what would happen during a crash)
159-
batch, err := memStore.NewBatch(context.Background())
159+
ctx := context.Background()
160+
batch, err := memStore.NewBatch(ctx)
160161
require.NoError(t, err)
161-
err = batch.SaveBlockData(pendingHeader, pendingData, &types.Signature{})
162+
err = batch.SaveBlockData(ctx, pendingHeader, pendingData, &types.Signature{})
162163
require.NoError(t, err)
163-
err = batch.Commit()
164+
err = batch.Commit(ctx)
164165
require.NoError(t, err)
165166

166167
// Stop first executor (simulating crash/restart)

‎block/internal/submitting/da_submitter_integration_test.go‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -71,18 +71,19 @@ func TestDASubmitter_SubmitHeadersAndData_MarksInclusionAndUpdatesLastSubmitted(
7171
sig2t := types.Signature(sig2)
7272

7373
// Save block 1
74-
batch1, err := st.NewBatch(context.Background())
74+
ctx := context.Background()
75+
batch1, err := st.NewBatch(ctx)
7576
require.NoError(t, err)
76-
require.NoError(t, batch1.SaveBlockData(hdr1, data1, &sig1t))
77-
require.NoError(t, batch1.SetHeight(1))
78-
require.NoError(t, batch1.Commit())
77+
require.NoError(t, batch1.SaveBlockData(ctx, hdr1, data1, &sig1t))
78+
require.NoError(t, batch1.SetHeight(ctx, 1))
79+
require.NoError(t, batch1.Commit(ctx))
7980

8081
// Save block 2
81-
batch2, err := st.NewBatch(context.Background())
82+
batch2, err := st.NewBatch(ctx)
8283
require.NoError(t, err)
83-
require.NoError(t, batch2.SaveBlockData(hdr2, data2, &sig2t))
84-
require.NoError(t, batch2.SetHeight(2))
85-
require.NoError(t, batch2.Commit())
84+
require.NoError(t, batch2.SaveBlockData(ctx, hdr2, data2, &sig2t))
85+
require.NoError(t, batch2.SetHeight(ctx, 2))
86+
require.NoError(t, batch2.Commit(ctx))
8687

8788
// Mock DA client
8889
client := mocks.NewMockClient(t)

‎block/internal/submitting/da_submitter_test.go‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -201,16 +201,16 @@ func TestDASubmitter_SubmitHeaders_Success(t *testing.T) {
201201
// Save block 1
202202
batch1, err := st.NewBatch(ctx)
203203
require.NoError(t, err)
204-
require.NoError(t, batch1.SaveBlockData(header1, data1, &sig1))
205-
require.NoError(t, batch1.SetHeight(1))
206-
require.NoError(t, batch1.Commit())
204+
require.NoError(t, batch1.SaveBlockData(ctx, header1, data1, &sig1))
205+
require.NoError(t, batch1.SetHeight(ctx, 1))
206+
require.NoError(t, batch1.Commit(ctx))
207207

208208
// Save block 2
209209
batch2, err := st.NewBatch(ctx)
210210
require.NoError(t, err)
211-
require.NoError(t, batch2.SaveBlockData(header2, data2, &sig2))
212-
require.NoError(t, batch2.SetHeight(2))
213-
require.NoError(t, batch2.Commit())
211+
require.NoError(t, batch2.SaveBlockData(ctx, header2, data2, &sig2))
212+
require.NoError(t, batch2.SetHeight(ctx, 2))
213+
require.NoError(t, batch2.Commit(ctx))
214214

215215
// Get headers from cache and submit
216216
headers, marshalledHeaders, err := cm.GetPendingHeaders(ctx)
@@ -318,16 +318,16 @@ func TestDASubmitter_SubmitData_Success(t *testing.T) {
318318
// Save block 1
319319
batch1, err := st.NewBatch(ctx)
320320
require.NoError(t, err)
321-
require.NoError(t, batch1.SaveBlockData(header1, data1, &sig1))
322-
require.NoError(t, batch1.SetHeight(1))
323-
require.NoError(t, batch1.Commit())
321+
require.NoError(t, batch1.SaveBlockData(ctx, header1, data1, &sig1))
322+
require.NoError(t, batch1.SetHeight(ctx, 1))
323+
require.NoError(t, batch1.Commit(ctx))
324324

325325
// Save block 2
326326
batch2, err := st.NewBatch(ctx)
327327
require.NoError(t, err)
328-
require.NoError(t, batch2.SaveBlockData(header2, data2, &sig2))
329-
require.NoError(t, batch2.SetHeight(2))
330-
require.NoError(t, batch2.Commit())
328+
require.NoError(t, batch2.SaveBlockData(ctx, header2, data2, &sig2))
329+
require.NoError(t, batch2.SetHeight(ctx, 2))
330+
require.NoError(t, batch2.Commit(ctx))
331331

332332
// Get data from cache and submit
333333
signedDataList, marshalledData, err := cm.GetPendingData(ctx)
@@ -378,9 +378,9 @@ func TestDASubmitter_SubmitData_SkipsEmptyData(t *testing.T) {
378378
sig := types.Signature([]byte("sig"))
379379
batch, err := st.NewBatch(ctx)
380380
require.NoError(t, err)
381-
require.NoError(t, batch.SaveBlockData(header, emptyData, &sig))
382-
require.NoError(t, batch.SetHeight(1))
383-
require.NoError(t, batch.Commit())
381+
require.NoError(t, batch.SaveBlockData(ctx, header, emptyData, &sig))
382+
require.NoError(t, batch.SetHeight(ctx, 1))
383+
require.NoError(t, batch.Commit(ctx))
384384

385385
// Get data from cache and submit - should succeed but skip empty data
386386
// Get data from cache and submit
@@ -439,9 +439,9 @@ func TestDASubmitter_SubmitData_NilSigner(t *testing.T) {
439439
sig := types.Signature([]byte("sig"))
440440
batch, err := st.NewBatch(ctx)
441441
require.NoError(t, err)
442-
require.NoError(t, batch.SaveBlockData(header, data, &sig))
443-
require.NoError(t, batch.SetHeight(1))
444-
require.NoError(t, batch.Commit())
442+
require.NoError(t, batch.SaveBlockData(ctx, header, data, &sig))
443+
require.NoError(t, batch.SetHeight(ctx, 1))
444+
require.NoError(t, batch.Commit(ctx))
445445

446446
// Get data from cache and submit with nil signer - should fail
447447
signedDataList, marshalledData, err := cm.GetPendingData(ctx)

‎block/internal/submitting/submitter_test.go‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ func TestSubmitter_IsHeightDAIncluded(t *testing.T) {
111111
cm, st := newTestCacheAndStore(t)
112112
batch, err := st.NewBatch(ctx)
113113
require.NoError(t, err)
114-
require.NoError(t, batch.SetHeight(5))
115-
require.NoError(t, batch.Commit())
114+
require.NoError(t, batch.SetHeight(ctx, 5))
115+
require.NoError(t, batch.Commit(ctx))
116116

117117
s := &Submitter{store: st, cache: cm, logger: zerolog.Nop()}
118118
s.ctx = ctx
@@ -265,16 +265,16 @@ func TestSubmitter_processDAInclusionLoop_advances(t *testing.T) {
265265
// Save block 1
266266
batch1, err := st.NewBatch(ctx)
267267
require.NoError(t, err)
268-
require.NoError(t, batch1.SaveBlockData(h1, d1, &sig))
269-
require.NoError(t, batch1.SetHeight(1))
270-
require.NoError(t, batch1.Commit())
268+
require.NoError(t, batch1.SaveBlockData(ctx, h1, d1, &sig))
269+
require.NoError(t, batch1.SetHeight(ctx, 1))
270+
require.NoError(t, batch1.Commit(ctx))
271271

272272
// Save block 2
273273
batch2, err := st.NewBatch(ctx)
274274
require.NoError(t, err)
275-
require.NoError(t, batch2.SaveBlockData(h2, d2, &sig))
276-
require.NoError(t, batch2.SetHeight(2))
277-
require.NoError(t, batch2.Commit())
275+
require.NoError(t, batch2.SaveBlockData(ctx, h2, d2, &sig))
276+
require.NoError(t, batch2.SetHeight(ctx, 2))
277+
require.NoError(t, batch2.Commit(ctx))
278278

279279
cm.SetHeaderDAIncluded(h1.Hash().String(), 100, 1)
280280
cm.SetDataDAIncluded(d1.DACommitment().String(), 100, 1)
@@ -380,10 +380,10 @@ func TestSubmitter_daSubmissionLoop(t *testing.T) {
380380
// Store the blocks
381381
batch, err := st.NewBatch(ctx)
382382
require.NoError(t, err)
383-
require.NoError(t, batch.SaveBlockData(h1, d1, &types.Signature{}))
384-
require.NoError(t, batch.SaveBlockData(h2, d2, &types.Signature{}))
385-
require.NoError(t, batch.SetHeight(2))
386-
require.NoError(t, batch.Commit())
383+
require.NoError(t, batch.SaveBlockData(ctx, h1, d1, &types.Signature{}))
384+
require.NoError(t, batch.SaveBlockData(ctx, h2, d2, &types.Signature{}))
385+
require.NoError(t, batch.SetHeight(ctx, 2))
386+
require.NoError(t, batch.Commit(ctx))
387387

388388
// Start and wait for calls
389389
require.NoError(t, s.Start(ctx))
@@ -481,9 +481,9 @@ func TestSubmitter_CacheClearedOnHeightInclusion(t *testing.T) {
481481
for _, block := range blocks {
482482
batch, err := st.NewBatch(ctx)
483483
require.NoError(t, err)
484-
require.NoError(t, batch.SaveBlockData(block.header, block.data, &sig))
485-
require.NoError(t, batch.SetHeight(block.height))
486-
require.NoError(t, batch.Commit())
484+
require.NoError(t, batch.SaveBlockData(ctx, block.header, block.data, &sig))
485+
require.NoError(t, batch.SetHeight(ctx, block.height))
486+
require.NoError(t, batch.Commit(ctx))
487487
}
488488

489489
// Set up cache with headers and data seen for all heights

0 commit comments

Comments
 (0)