Skip to content

Commit c24f901

Browse files
committed
updates
1 parent 89db6f9 commit c24f901

2 files changed

Lines changed: 12 additions & 20 deletions

File tree

pkg/store/cached_store.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ func (cs *CachedStore) Rollback(ctx context.Context, height uint64, aggregator b
239239
}
240240

241241
// PruneBlocks wraps the underlying store's PruneBlocks and invalidates caches
242-
// up to the heigh that we purne
242+
// up to the height that we prune
243243
func (cs *CachedStore) PruneBlocks(ctx context.Context, height uint64) error {
244244
if err := cs.Store.PruneBlocks(ctx, height); err != nil {
245245
return err

pkg/store/cached_store_test.go

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -320,38 +320,30 @@ func TestCachedStore_AsyncDeleteMetadata(t *testing.T) {
320320
func TestCachedStore_Close_FlushesPendingWrites(t *testing.T) {
321321
ctx := context.Background()
322322

323-
kv, err := NewTestInMemoryKVStore()
323+
dir := t.TempDir()
324+
kv, err := NewDefaultKVStore(dir, "", "test-db")
324325
require.NoError(t, err)
325326

326327
base := New(kv)
327-
328-
writeCh := make(chan asyncWriteOp, asyncWriteBufferSize)
329-
done := make(chan struct{})
330-
331-
cs := &CachedStore{
332-
Store: base,
333-
writeCh: writeCh,
334-
done: done,
335-
logger: zerolog.Nop(),
336-
}
337-
338-
cs.startWriteLoop()
328+
cs, err := NewCachedStore(base)
329+
require.NoError(t, err)
339330

340331
const n = 100
341332
for i := range n {
342333
k := fmt.Sprintf("key-%d", i)
343334
require.NoError(t, cs.SetMetadata(ctx, k, []byte(k)))
344335
}
345336

346-
cs.stopMu.Lock()
347-
cs.stopped = true
348-
close(writeCh)
349-
cs.stopMu.Unlock()
350-
<-done
337+
require.NoError(t, cs.Close())
338+
339+
kv2, err := NewDefaultKVStore(dir, "", "test-db")
340+
require.NoError(t, err)
341+
t.Cleanup(func() { kv2.Close() })
342+
reopened := New(kv2)
351343

352344
for i := range n {
353345
k := fmt.Sprintf("key-%d", i)
354-
v, err := base.GetMetadata(ctx, k)
346+
v, err := reopened.GetMetadata(ctx, k)
355347
require.NoError(t, err)
356348
require.Equal(t, []byte(k), v)
357349
}

0 commit comments

Comments
 (0)