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,cmd/utils: fix lint issues

Browse source
This commit is contained in:
lightclient@protonmail.com 2023-06-05 15:29:03 +02:00 committed by lightclient
parent af6837f249
commit 64513d7d3d
No known key found for this signature in database
GPG key ID: 75C916AFEE20183E
4 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cmd/utils/history_test.go
View file

@ -157,7 +157,6 @@ func TestHistoryImportAndExport(t *testing.T) {
t.Fatalf("receipt root %d mismatch: want %s, got %s", n, want.ReceiptHash(), got) t.Fatalf("receipt root %d mismatch: want %s, got %s", n, want.ReceiptHash(), got)
} }
} }
return
}() }()
} }

3
internal/era/e2store/e2store_test.go
View file

@ -26,7 +26,7 @@ import (
) )
func TestEncode(t *testing.T) { func TestEncode(t *testing.T) {
for _, tt := range []struct { for _, test := range []struct {
entries []Entry entries []Entry
want string want string
name string name string
@ -50,6 +50,7 @@ func TestEncode(t *testing.T) {
want: "2a00020000000000beef0900040000000000abcdabcd", want: "2a00020000000000beef0900040000000000abcdabcd",
}, },
} { } {
tt := test
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {
t.Parallel() t.Parallel()
var ( var (

6
internal/era/era.go
View file

@ -143,6 +143,10 @@ func (e *Era) GetBlockByNumber(num uint64) (*types.Block, error) {
return nil, err return nil, err
} }
off += int64(n) off += int64(n)
r, _, err = newSnappyReader(e.s, off)
if err != nil {
return nil, err
}
var body types.Body var body types.Body
if err := rlp.Decode(r, &body); err != nil { if err := rlp.Decode(r, &body); err != nil {
return nil, err return nil, err
@ -193,7 +197,7 @@ func (e *Era) InitialTD() (*big.Int, error) {
} }
// Read total difficulty after first block. // Read total difficulty after first block.
if r, n, err = newReader(e.s, off); err != nil { if r, _, err = newReader(e.s, off); err != nil {
return nil, err return nil, err
} }
if err := rlp.Decode(r, rawTd); err != nil { if err := rlp.Decode(r, rawTd); err != nil {

9
internal/era/iterator.go
View file

@ -101,10 +101,9 @@ func (it *Iterator) TotalDifficulty() (*big.Int, error) {
// RawIterator reads an RLP-encode Era1 entries. // RawIterator reads an RLP-encode Era1 entries.
type RawIterator struct { type RawIterator struct {
e *Era // backing Era1 e *Era // backing Era1
curOffset int64 // offset of current block next uint64 // next block to read
next uint64 // next block to read err error // last error
err error // last error
Header io.Reader Header io.Reader
Body io.Reader Body io.Reader
@ -143,7 +142,7 @@ func (it *RawIterator) Next() bool {
return true return true
} }
off += int64(n) off += int64(n)
if it.TotalDifficulty, n, it.err = newReader(it.e.s, off); it.err != nil { if it.TotalDifficulty, _, it.err = newReader(it.e.s, off); it.err != nil {
return true return true
} }
it.next += 1 it.next += 1