roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

cmd/evm: fix dump after state-test exec (#28650)

Browse Source 
The dump after state-test didn't work, the problem was an error, "Already committed", which was silently ignored. 

This change re-initialises the state, so the dumping works again.
This commit is contained in:
Martin HS 2023-12-08 11:06:01 +01:00 committed by GitHub
parent 5a45e7a631
commit 1048e2d6a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cmd/evm/staterunner.go
View File

@ -100,19 +100,20 @@ func runStateTest(fname string, cfg vm.Config, jsonOut, dump bool) error {
for _, st := range test.Subtests() { for _, st := range test.Subtests() {
// Run the test and aggregate the result // Run the test and aggregate the result
result := &StatetestResult{Name: key, Fork: st.Fork, Pass: true} result := &StatetestResult{Name: key, Fork: st.Fork, Pass: true}
test.Run(st, cfg, false, rawdb.HashScheme, func(err error, snaps *snapshot.Tree, state *state.StateDB) { test.Run(st, cfg, false, rawdb.HashScheme, func(err error, snaps *snapshot.Tree, statedb *state.StateDB) {
if state != nil { var root common.Hash
root := state.IntermediateRoot(false) if statedb != nil {
root = statedb.IntermediateRoot(false)
result.Root = &root result.Root = &root
if jsonOut { if jsonOut {
fmt.Fprintf(os.Stderr, "{\"stateRoot\": \"%#x\"}\n", root) fmt.Fprintf(os.Stderr, "{\"stateRoot\": \"%#x\"}\n", root)
} }
} if dump { // Dump any state to aid debugging
// Dump any state to aid debugging cpy, _ := state.New(root, statedb.Database(), nil)
if dump { dump := cpy.RawDump(nil)
dump := state.RawDump(nil)
result.State = &dump result.State = &dump
} }
}
if err != nil { if err != nil {
// Test failed, mark as so // Test failed, mark as so
result.Pass, result.Error = false, err.Error() result.Pass, result.Error = false, err.Error()

1
core/state/dump.go
View File

@ -129,6 +129,7 @@ func (s *StateDB) DumpToCollector(c DumpCollector, conf *DumpConfig) (nextKey []
trieIt, err := s.trie.NodeIterator(conf.Start) trieIt, err := s.trie.NodeIterator(conf.Start)
if err != nil { if err != nil {
log.Error("Trie dumping error", "err", err)
return nil return nil
} }
it := trie.NewIterator(trieIt) it := trie.NewIterator(trieIt)