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

fix tests

Browse source
This commit is contained in:
Jared Wasinger 2025-07-10 18:34:45 +09:00
parent b908564a47
commit ce381432a9
2 changed files with 11 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/types/bal/bal_encoding.go
View file

@ -63,6 +63,7 @@ func (e *BlockAccessList) Validate() error {
return nil return nil
} }
// Hash computes the keccak256 hash of the access list
func (e *BlockAccessList) Hash() common.Hash { func (e *BlockAccessList) Hash() common.Hash {
var enc bytes.Buffer var enc bytes.Buffer
err := e.EncodeRLP(&enc) err := e.EncodeRLP(&enc)

91
core/types/bal/bal_test.go
View file

@ -18,9 +18,6 @@ package bal
import ( import (
"bytes" "bytes"
"io/fs"
"os"
"path/filepath"
"reflect" "reflect"
"testing" "testing"
@ -29,31 +26,10 @@ import (
"github.com/holiman/uint256" "github.com/holiman/uint256"
) )
func equalBALs(a *ConstructionBlockAccessList, b *ConstructionBlockAccessList) bool { func equalBALs(a *BlockAccessList, b *BlockAccessList) bool {
if len(a.Accounts) != len(b.Accounts) { if !reflect.DeepEqual(a, b) {
return false return false
} }
for addr, aaA := range a.Accounts {
aaB, ok := b.Accounts[addr]
if !ok {
return false
}
if !reflect.DeepEqual(aaA.StorageWrites, aaB.StorageWrites) {
return false
}
if !reflect.DeepEqual(aaA.StorageReads, aaB.StorageReads) {
return false
}
if !reflect.DeepEqual(aaA.BalanceChanges, aaB.BalanceChanges) {
return false
}
if !reflect.DeepEqual(aaA.NonceChanges, aaB.NonceChanges) {
return false
}
if !reflect.DeepEqual(aaA.CodeChange, aaB.CodeChange) {
return false
}
}
return true return true
} }
@ -119,14 +95,14 @@ func TestBALEncoding(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("encoding failed: %v\n", err) t.Fatalf("encoding failed: %v\n", err)
} }
var dec ConstructionBlockAccessList var dec BlockAccessList
if err := dec.DecodeRLP(rlp.NewStream(bytes.NewReader(buf.Bytes()), 10000000)); err != nil { if err := dec.DecodeRLP(rlp.NewStream(bytes.NewReader(buf.Bytes()), 10000000)); err != nil {
t.Fatalf("decoding failed: %v\n", err) t.Fatalf("decoding failed: %v\n", err)
} }
if dec.Hash() != bal.Hash() { if dec.Hash() != bal.toEncodingObj().Hash() {
t.Fatalf("encoded block hash doesn't match decoded") t.Fatalf("encoded block hash doesn't match decoded")
} }
if !equalBALs(bal, &dec) { if !equalBALs(bal.toEncodingObj(), &dec) {
t.Fatal("decoded BAL doesn't match") t.Fatal("decoded BAL doesn't match")
} }
} }
@ -135,65 +111,18 @@ func TestBALEncoding(t *testing.T) {
func TestBALFullRLPEncoding(t *testing.T) { func TestBALFullRLPEncoding(t *testing.T) {
var buf bytes.Buffer var buf bytes.Buffer
bal := makeTestBAL() bal := makeTestBAL()
err := bal.EncodeFullRLP(&buf) err := bal.EncodeRLP(&buf)
if err != nil { if err != nil {
t.Fatalf("encoding failed: %v\n", err) t.Fatalf("encoding failed: %v\n", err)
} }
var dec ConstructionBlockAccessList var dec BlockAccessList
if err := dec.DecodeFullRLP(rlp.NewStream(bytes.NewReader(buf.Bytes()), 10000000)); err != nil { if err := dec.DecodeRLP(rlp.NewStream(bytes.NewReader(buf.Bytes()), 10000000)); err != nil {
t.Fatalf("decoding failed: %v\n", err) t.Fatalf("decoding failed: %v\n", err)
} }
if dec.Hash() != bal.Hash() { if dec.Hash() != bal.toEncodingObj().Hash() {
t.Fatalf("encoded block hash doesn't match decoded") t.Fatalf("encoded block hash doesn't match decoded")
} }
if !equalBALs(bal, &dec) { if !equalBALs(bal.toEncodingObj(), &dec) {
t.Fatal("decoded BAL doesn't match") t.Fatal("decoded BAL doesn't match")
} }
} }
// TestBALDecoding tests that a mainnet BAL produced by https://github.com/nerolation/eth-bal-analysis
// can be decoded.
func TestBALDecoding(t *testing.T) {
filepath.WalkDir("testdata/ssz", func(path string, d fs.DirEntry, err error) error {
if err != nil {
return err
}
if d.IsDir() {
return nil
}
data, err := os.ReadFile(path)
if err != nil {
t.Fatal(err)
}
var b ConstructionBlockAccessList
if err := b.decodeSSZ(data); err != nil {
t.Fatal(err)
}
return nil
})
}
func TestBALEncodeSizeDifference(t *testing.T) {
filepath.WalkDir("testdata/ssz", func(path string, d fs.DirEntry, err error) error {
if err != nil {
return err
}
if d.IsDir() {
return nil
}
data, err := os.ReadFile(path)
if err != nil {
t.Fatal(err)
}
var b ConstructionBlockAccessList
if err := b.decodeSSZ(data); err != nil {
t.Fatal(err)
}
var buf bytes.Buffer
if err := b.EncodeFullRLP(&buf); err != nil {
t.Fatal(err)
}
t.Logf("SSZ: %v, RLP: %v\n", common.StorageSize(len(data)), common.StorageSize(buf.Len()))
return nil
})
}