Skip to content

Commit 9ab9857

Browse files
authored
chore(customrawdb): unexport customrawdb.NewSyncPerformedIterator (#4450)
Signed-off-by: Tsvetan Dimitrov (tsvetan.dimitrov@avalabs.org)
1 parent 7b62f89 commit 9ab9857

File tree

2 files changed

+14
-16
lines changed

2 files changed

+14
-16
lines changed

vms/evm/sync/customrawdb/sync_progress.go

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -180,15 +180,9 @@ func WriteSyncPerformed(db ethdb.KeyValueWriter, blockNumber uint64) error {
180180
return db.Put(bytes, nil)
181181
}
182182

183-
// NewSyncPerformedIterator returns an iterator over all block numbers the VM
184-
// has state synced to.
185-
func NewSyncPerformedIterator(db ethdb.Iteratee) ethdb.Iterator {
186-
return rawdb.NewKeyLengthIterator(db.NewIterator(syncPerformedPrefix, nil), syncPerformedKeyLength)
187-
}
188-
189183
// GetLatestSyncPerformed returns the latest block number state synced performed to.
190184
func GetLatestSyncPerformed(db ethdb.Iteratee) (uint64, error) {
191-
it := NewSyncPerformedIterator(db)
185+
it := newSyncPerformedIterator(db)
192186
defer it.Release()
193187

194188
var latestSyncPerformed uint64
@@ -201,6 +195,18 @@ func GetLatestSyncPerformed(db ethdb.Iteratee) (uint64, error) {
201195
return latestSyncPerformed, it.Error()
202196
}
203197

198+
// newSyncPerformedIterator returns an iterator over all block numbers the VM
199+
// has state synced to.
200+
func newSyncPerformedIterator(db ethdb.Iteratee) ethdb.Iterator {
201+
return rawdb.NewKeyLengthIterator(db.NewIterator(syncPerformedPrefix, nil), syncPerformedKeyLength)
202+
}
203+
204+
// parseSyncPerformedKey returns the block number from keys returned by
205+
// NewSyncPerformedIterator. It panics if the key is shorter than `syncPerformedKeyLength`.
206+
func parseSyncPerformedKey(key []byte) uint64 {
207+
return binary.BigEndian.Uint64(key[len(syncPerformedPrefix):])
208+
}
209+
204210
// clearPrefix removes all keys in db that begin with prefix and match an
205211
// expected key length. `keyLen` must include the length of the prefix.
206212
func clearPrefix(db ethdb.KeyValueStore, prefix []byte, keyLen int) error {
@@ -230,11 +236,3 @@ func clearPrefix(db ethdb.KeyValueStore, prefix []byte, keyLen int) error {
230236
}
231237
return batch.Write()
232238
}
233-
234-
// parseSyncPerformedKey returns the block number from keys the iterator returned
235-
// from NewSyncPerformedIterator. It assumes the key has the syncPerformedPrefix
236-
// followed by an 8-byte big-endian block number, and panics if the key is shorter
237-
// than len(syncPerformedPrefix)+wrappers.LongLen.
238-
func parseSyncPerformedKey(key []byte) uint64 {
239-
return binary.BigEndian.Uint64(key[len(syncPerformedPrefix):])
240-
}

vms/evm/sync/customrawdb/sync_progress_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ func TestSyncPerformedAndLatest(t *testing.T) {
185185
require.NoError(t, WriteSyncPerformed(db, 15))
186186

187187
// Iterator yields all
188-
vals := mapIterator(t, NewSyncPerformedIterator(db), parseSyncPerformedKey)
188+
vals := mapIterator(t, newSyncPerformedIterator(db), parseSyncPerformedKey)
189189

190190
require.Equal(t, []uint64{10, 15, 20}, vals)
191191

0 commit comments

Comments
 (0)