forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

cmd/utils: better bytes buffer

Browse source
This commit is contained in:
lightclient@protonmail.com 2023-05-23 13:49:33 +02:00 committed by lightclient
parent b65db9db79
commit ca3d8bf717
No known key found for this signature in database
GPG key ID: 75C916AFEE20183E
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
cmd/utils/cmd.go
View file

@ -19,6 +19,7 @@ package utils
import ( import (
"bufio" "bufio"
"bytes"
"compress/gzip" "compress/gzip"
"crypto/sha256" "crypto/sha256"
"errors" "errors"
@ -263,7 +264,7 @@ func ImportHistory(chain *core.BlockChain, db ethdb.Database, dir string, networ
imported = 0 imported = 0
forker = core.NewForkChoice(chain, nil) forker = core.NewForkChoice(chain, nil)
h = sha256.New() h = sha256.New()
buf []byte buf = bytes.NewBuffer(nil)
) )
for i, filename := range entries { for i, filename := range entries {
err := func() error { err := func() error {
@ -277,11 +278,11 @@ func ImportHistory(chain *core.BlockChain, db ethdb.Database, dir string, networ
if _, err := io.Copy(h, f); err != nil { if _, err := io.Copy(h, f); err != nil {
return fmt.Errorf("unable to recalculate checksum: %w", err) return fmt.Errorf("unable to recalculate checksum: %w", err)
} }
if have, want := common.BytesToHash(h.Sum(buf)).Hex(), checksums[i]; have != want { if have, want := common.BytesToHash(h.Sum(buf.Bytes()[:])).Hex(), checksums[i]; have != want {
return fmt.Errorf("checksum mismatch: have %s, want %s", have, want) return fmt.Errorf("checksum mismatch: have %s, want %s", have, want)
} }
h.Reset() h.Reset()
buf = buf[:0] buf.Reset()
// Import all block data from Era1. // Import all block data from Era1.
r, err := era.NewReader(f) r, err := era.NewReader(f)
@ -413,7 +414,7 @@ func ExportHistory(bc *core.BlockChain, dir string, first, last, step uint64) er
start = time.Now() start = time.Now()
reported = time.Now() reported = time.Now()
h = sha256.New() h = sha256.New()
buf []byte buf = bytes.NewBuffer(nil)
checksums []string checksums []string
) )
for i := first; i <= last; i += step { for i := first; i <= last; i += step {
@ -460,9 +461,9 @@ func ExportHistory(bc *core.BlockChain, dir string, first, last, step uint64) er
if _, err := io.Copy(h, f); err != nil { if _, err := io.Copy(h, f); err != nil {
return fmt.Errorf("unable to calculate checksum: %w", err) return fmt.Errorf("unable to calculate checksum: %w", err)
} }
checksums = append(checksums, common.BytesToHash(h.Sum(buf)).Hex()) checksums = append(checksums, common.BytesToHash(h.Sum(buf.Bytes()[:])).Hex())
h.Reset() h.Reset()
buf = buf[:0] buf.Reset()
return nil return nil
}() }()
if err != nil { if err != nil {