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

internal/era: unexport things

Browse source
This commit is contained in:
Martin Holst Swende 2023-05-29 21:13:39 +02:00 committed by lightclient
parent 1000755740
commit 008ed82224
No known key found for this signature in database
GPG key ID: 75C916AFEE20183E
2 changed files with 21 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
internal/era/era.go
View file

@ -147,17 +147,6 @@ func (r *Reader) Read() (*types.Block, types.Receipts, error) {
return block, receipts, nil return block, receipts, nil
} }
func skipN(r *Reader, off int64, n int) (int64, error) {
for i := 0; i < n; i++ {
length, err := r.e.LengthAt(off)
if err != nil {
return off, err
}
off += length
}
return off, nil
}
// readBlob reads an entry of data. // readBlob reads an entry of data.
func (r *Reader) readEntry(n uint64, skip int) (*e2store.Entry, error) { func (r *Reader) readEntry(n uint64, skip int) (*e2store.Entry, error) {
if n < r.metadata.start || r.metadata.start+r.metadata.count < n { if n < r.metadata.start || r.metadata.start+r.metadata.count < n {
@ -169,8 +158,12 @@ func (r *Reader) readEntry(n uint64, skip int) (*e2store.Entry, error) {
return nil, fmt.Errorf("error reading block offset: %w", err) return nil, fmt.Errorf("error reading block offset: %w", err)
} }
// Skip to the requested entry. // Skip to the requested entry.
if off, err = skipN(r, off, skip); err != nil { for i := 0; i < skip; i++ {
return nil, err if length, err := r.e.LengthAt(off); err != nil {
return nil, err
} else {
off += length
}
} }
// Read entry. // Read entry.
var entry e2store.Entry var entry e2store.Entry
@ -180,8 +173,8 @@ func (r *Reader) readEntry(n uint64, skip int) (*e2store.Entry, error) {
return &entry, nil return &entry, nil
} }
// ReadHeader reads the header number n RLP. // readHeaderRLP reads the header number n RLP.
func (r *Reader) ReadHeaderRLP(n uint64) ([]byte, error) { func (r *Reader) readHeaderRLP(n uint64) ([]byte, error) {
e, err := r.readEntry(n, 0) e, err := r.readEntry(n, 0)
if err != nil { if err != nil {
return nil, err return nil, err
@ -192,8 +185,8 @@ func (r *Reader) ReadHeaderRLP(n uint64) ([]byte, error) {
return io.ReadAll(snappy.NewReader(bytes.NewReader(e.Value))) return io.ReadAll(snappy.NewReader(bytes.NewReader(e.Value)))
} }
// ReadBodyRLP reads the block body number n RLP. // readBodyRLP reads the block body number n RLP.
func (r *Reader) ReadBodyRLP(n uint64) ([]byte, error) { func (r *Reader) readBodyRLP(n uint64) ([]byte, error) {
e, err := r.readEntry(n, 1) e, err := r.readEntry(n, 1)
if err != nil { if err != nil {
return nil, err return nil, err
@ -204,8 +197,8 @@ func (r *Reader) ReadBodyRLP(n uint64) ([]byte, error) {
return io.ReadAll(snappy.NewReader(bytes.NewReader(e.Value))) return io.ReadAll(snappy.NewReader(bytes.NewReader(e.Value)))
} }
// ReadReceiptsRLP reads the receipts RLP associated with number n. // readReceiptsRLP reads the receipts RLP associated with number n.
func (r *Reader) ReadReceiptsRLP(n uint64) ([]byte, error) { func (r *Reader) readReceiptsRLP(n uint64) ([]byte, error) {
e, err := r.readEntry(n, 2) e, err := r.readEntry(n, 2)
if err != nil { if err != nil {
return nil, err return nil, err
@ -216,8 +209,8 @@ func (r *Reader) ReadReceiptsRLP(n uint64) ([]byte, error) {
return io.ReadAll(snappy.NewReader(bytes.NewReader(e.Value))) return io.ReadAll(snappy.NewReader(bytes.NewReader(e.Value)))
} }
// ReadTotalDifficulty reads the total difficulty of block number n. // readTotalDifficulty reads the total difficulty of block number n.
func (r *Reader) ReadTotalDifficulty(n uint64) (*big.Int, error) { func (r *Reader) readTotalDifficulty(n uint64) (*big.Int, error) {
e, err := r.readEntry(n, 3) e, err := r.readEntry(n, 3)
if err != nil { if err != nil {
return nil, err return nil, err
@ -230,7 +223,7 @@ func (r *Reader) ReadTotalDifficulty(n uint64) (*big.Int, error) {
// ReadHeader reads the header number n. // ReadHeader reads the header number n.
func (r *Reader) ReadHeader(n uint64) (*types.Header, error) { func (r *Reader) ReadHeader(n uint64) (*types.Header, error) {
h, err := r.ReadHeaderRLP(n) h, err := r.readHeaderRLP(n)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -247,7 +240,7 @@ func (r *Reader) ReadBlock(n uint64) (*types.Block, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
b, err := r.ReadBodyRLP(n) b, err := r.readBodyRLP(n)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -266,7 +259,7 @@ func (r *Reader) ReadBlockAndReceipts(n uint64) (*types.Block, types.Receipts, e
return nil, nil, err return nil, nil, err
} }
// Read receipts. // Read receipts.
rr, err := r.ReadReceiptsRLP(n) rr, err := r.readReceiptsRLP(n)
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err
} }

8
internal/era/era_test.go
View file

@ -77,7 +77,7 @@ func TestEra1Builder(t *testing.T) {
} }
for i := uint64(0); i < uint64(len(chain.headers)); i++ { for i := uint64(0); i < uint64(len(chain.headers)); i++ {
// Check headers. // Check headers.
header, err := r.ReadHeaderRLP(i) header, err := r.readHeaderRLP(i)
if err != nil { if err != nil {
t.Fatalf("error reading from era1: %v", err) t.Fatalf("error reading from era1: %v", err)
} }
@ -86,7 +86,7 @@ func TestEra1Builder(t *testing.T) {
} }
// Check bodies. // Check bodies.
body, err := r.ReadBodyRLP(i) body, err := r.readBodyRLP(i)
if err != nil { if err != nil {
t.Fatalf("error reading from era1: %v", err) t.Fatalf("error reading from era1: %v", err)
} }
@ -95,7 +95,7 @@ func TestEra1Builder(t *testing.T) {
} }
// Check receipts. // Check receipts.
receipts, err := r.ReadReceiptsRLP(i) receipts, err := r.readReceiptsRLP(i)
if err != nil { if err != nil {
t.Fatalf("error reading from era1: %v", err) t.Fatalf("error reading from era1: %v", err)
} }
@ -104,7 +104,7 @@ func TestEra1Builder(t *testing.T) {
} }
// Check total difficulty. // Check total difficulty.
td, err := r.ReadTotalDifficulty(i) td, err := r.readTotalDifficulty(i)
if err != nil { if err != nil {
t.Fatalf("error reading from era1: %v", err) t.Fatalf("error reading from era1: %v", err)
} }