Skip to content

Commit 72b0cce

Browse files
authored
chore(store): small DeleteTo updates (#279)
Small updates after recent merges.
1 parent b914cfe commit 72b0cce

File tree

1 file changed

+4
-12
lines changed

1 file changed

+4
-12
lines changed

store/store.go

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -314,19 +314,15 @@ func (s *Store[H]) DeleteTo(ctx context.Context, to uint64) error {
314314
from = (*tailPtr).Height()
315315
}
316316
if from >= to {
317+
log.Debugf("header/store: attempt to delete empty range(%d, %d)", from, to)
317318
return nil
318319
}
319320
if headPtr := s.contiguousHead.Load(); headPtr != nil {
320321
if height := (*headPtr).Height(); to > height {
321-
return fmt.Errorf("header/store: higher then head (%d vs %d)", to, height)
322+
return fmt.Errorf("header/store: 'to' is higher then head (%d vs %d)", to, height)
322323
}
323324
}
324325

325-
if from >= to {
326-
log.Debugw("header/store: attempt to delete empty range(%d, %d)", from, to)
327-
return nil
328-
}
329-
330326
if err := s.deleteRange(ctx, from, to); err != nil {
331327
return fmt.Errorf("header/store: delete to height %d: %w", to, err)
332328
}
@@ -396,12 +392,8 @@ func (s *Store[H]) updateTail(
396392
return zero, err
397393
}
398394

399-
b, err := newTail.Hash().MarshalJSON()
400-
if err != nil {
401-
return zero, err
402-
}
403-
if err := batch.Put(ctx, tailKey, b); err != nil {
404-
return zero, err
395+
if err := writeHeaderHashTo(ctx, batch, newTail, tailKey); err != nil {
396+
return zero, fmt.Errorf("put tail in batch: %w", err)
405397
}
406398
return newTail, nil
407399
}

0 commit comments

Comments
 (0)