forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-27 15:16:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix linting issues in dbcmd files

Browse source
This commit is contained in:
sivaratrisrinivas 2025-03-12 08:32:04 -05:00
parent 39765c1d92
commit cbd75d107a
2 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cmd/geth/dbcmd.go
View file

@ -1314,7 +1314,6 @@ func extractHeaders(ancientDb ethdb.AncientReader, headersFreezer *rawdb.Freezer
// Create a progress reporter // Create a progress reporter
log.Info("Starting to copy headers to temporary freezer", "count", mergeBlock) log.Info("Starting to copy headers to temporary freezer", "count", mergeBlock)
for i := uint64(0); i < mergeBlock; i += batchSize { for i := uint64(0); i < mergeBlock; i += batchSize {
end := i + batchSize end := i + batchSize
if end > mergeBlock { if end > mergeBlock {
@ -1372,7 +1371,6 @@ func reinsertHeaders(freezerDb ethdb.AncientStore, headersFreezer *rawdb.Freezer
_, err := freezerDb.ModifyAncients(func(op ethdb.AncientWriteOp) error { _, err := freezerDb.ModifyAncients(func(op ethdb.AncientWriteOp) error {
for j := i; j < end; j++ { for j := i; j < end; j++ {
log.Info("Completed copying headers back to main freezer", "count", mergeBlock)
// Read from temporary freezer // Read from temporary freezer
headerBytes, err := headersFreezer.Ancient(rawdb.ChainFreezerHeaderTable, j) headerBytes, err := headersFreezer.Ancient(rawdb.ChainFreezerHeaderTable, j)
if err != nil { if err != nil {
@ -1400,6 +1398,7 @@ func reinsertHeaders(freezerDb ethdb.AncientStore, headersFreezer *rawdb.Freezer
// Update progress // Update progress
} }
log.Info("Completed copying headers back to main freezer", "count", mergeBlock)
return nil return nil
} }

11
cmd/geth/dbcmd_test.go
View file

@ -33,10 +33,7 @@ import (
// in the truncate-freezer command. // in the truncate-freezer command.
func TestTruncateFreezerBatching(t *testing.T) { func TestTruncateFreezerBatching(t *testing.T) {
// Create a temporary directory for the test // Create a temporary directory for the test
datadir, err := os.MkdirTemp("", "geth-test-freezer-truncation-*") datadir := t.TempDir()
if err != nil {
t.Fatalf("Failed to create temporary directory: %v", err)
}
defer os.RemoveAll(datadir) defer os.RemoveAll(datadir)
// Create a freezer database // Create a freezer database
@ -100,11 +97,7 @@ func TestTruncateFreezerBatching(t *testing.T) {
rawdb.WriteHeadBlockHash(db, parentHash) rawdb.WriteHeadBlockHash(db, parentHash)
// Create a temporary directory for the headers freezer // Create a temporary directory for the headers freezer
tmpDir, err := os.MkdirTemp("", "geth-headers-freezer-*") tmpDir := t.TempDir()
if err != nil {
t.Fatalf("Failed to create temporary directory: %v", err)
}
defer os.RemoveAll(tmpDir)
// Create a new freezer for headers and hashes // Create a new freezer for headers and hashes
headersFreezer, err := rawdb.NewFreezer(tmpDir, "headers", false, 2*1000*1000*1000, map[string]bool{ headersFreezer, err := rawdb.NewFreezer(tmpDir, "headers", false, 2*1000*1000*1000, map[string]bool{