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

Fixing test

Browse source
This commit is contained in:
shahafn 2025-03-24 02:24:38 +02:00
parent d7258a9300
commit 29dcafefa8
1 changed files with 35 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
eth/tracers/internal/tracetest/erc7562_tracer_test.go
View file

@ -53,35 +53,36 @@ type contractSizeWithOpcode struct {
Opcode vm.OpCode `json:"opcode"` Opcode vm.OpCode `json:"opcode"`
} }
// callFrameWithOpcodes is the result of a erc7562Tracer run. // erc7562Trace is the result of a erc7562Tracer run.
type callFrameWithOpcodes struct { type erc7562Trace struct {
From common.Address `json:"from"` From common.Address `json:"from"`
Gas uint64 `json:"gas"` Gas *hexutil.Uint64 `json:"gas"`
GasUsed uint64 `json:"gasUsed"` GasUsed *hexutil.Uint64 `json:"gasUsed"`
To *common.Address `json:"to,omitempty" rlp:"optional"` To *common.Address `json:"to,omitempty" rlp:"optional"`
Input []byte `json:"input" rlp:"optional"` Input hexutil.Bytes `json:"input" rlp:"optional"`
Output []byte `json:"output,omitempty" rlp:"optional"` Output hexutil.Bytes `json:"output,omitempty" rlp:"optional"`
Error string `json:"error,omitempty" rlp:"optional"` Error string `json:"error,omitempty" rlp:"optional"`
RevertReason string `json:"revertReason,omitempty"` RevertReason string `json:"revertReason,omitempty"`
Logs []callLog `json:"logs,omitempty" rlp:"optional"` Logs []callLog `json:"logs,omitempty" rlp:"optional"`
Value *big.Int `json:"value,omitempty" rlp:"optional"` Value *hexutil.Big `json:"value,omitempty" rlp:"optional"`
revertedSnapshot bool revertedSnapshot bool
AccessedSlots accessedSlots `json:"accessedSlots"` AccessedSlots accessedSlots `json:"accessedSlots"`
ExtCodeAccessInfo []common.Address `json:"extCodeAccessInfo"` ExtCodeAccessInfo []common.Address `json:"extCodeAccessInfo"`
UsedOpcodes map[vm.OpCode]uint64 `json:"usedOpcodes"` UsedOpcodes map[vm.OpCode]uint64 `json:"usedOpcodes"`
ContractSize map[common.Address]*contractSizeWithOpcode `json:"contractSize"` ContractSize map[common.Address]*contractSizeWithOpcode `json:"contractSize"`
OutOfGas bool `json:"outOfGas"` OutOfGas bool `json:"outOfGas"`
Calls []callFrameWithOpcodes `json:"calls,omitempty" rlp:"optional"` Calls []erc7562Trace `json:"calls,omitempty" rlp:"optional"`
Keccak []hexutil.Bytes `json:"keccak"`
Type string `json:"type"`
} }
// erc7562TracerTest defines a single test to check the erc7562 tracer against. // erc7562TracerTest defines a single test to check the erc7562 tracer against.
type erc7562TracerTest struct { type erc7562TracerTest struct {
Genesis *core.Genesis `json:"genesis"` Genesis *core.Genesis `json:"genesis"`
Context *callContext `json:"context"` Context *callContext `json:"context"`
Input string `json:"input"` Input string `json:"input"`
TracerConfig json.RawMessage `json:"tracerConfig"` TracerConfig json.RawMessage `json:"tracerConfig"`
Result *callFrameWithOpcodes `json:"result"` Result *erc7562Trace `json:"result"`
} }
func TestErc7562Tracer(t *testing.T) { func TestErc7562Tracer(t *testing.T) {
@ -147,9 +148,23 @@ func TestErc7562Tracer(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("failed to marshal test: %v", err) t.Fatalf("failed to marshal test: %v", err)
} }
if string(want) != string(res) { if string(want) != string(res) {
t.Fatalf("trace mismatch\n have: %v\n want: %v\n", string(res), string(want)) t.Fatalf("trace mismatch\n have: %v\n want: %v\n", string(res), string(want))
} }
// Compare JSON ignoring key order by unmarshalling both into interfaces.
//var got, expected interface{}
//if err := json.Unmarshal(res, &got); err != nil {
// t.Fatalf("failed to unmarshal result: %v", err)
//}
//if err := json.Unmarshal(want, &expected); err != nil {
// t.Fatalf("failed to unmarshal expected result: %v", err)
//}
//if !reflect.DeepEqual(got, expected) {
// t.Fatalf("trace mismatch\n have: %v\n want: %v\n", got, expected)
//}
// Sanity check: compare top call's gas used against vm result // Sanity check: compare top call's gas used against vm result
type simpleResult struct { type simpleResult struct {
GasUsed hexutil.Uint64 GasUsed hexutil.Uint64