From 668d686a6fd6189de2626204187860c5b57aa0cf Mon Sep 17 00:00:00 2001 From: ws Date: Wed, 30 Oct 2024 04:25:41 +0000 Subject: [PATCH] Fix geth panic --- ethtest/test_case_splitter.go | 12 ++++++------ utils/statedb.go | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ethtest/test_case_splitter.go b/ethtest/test_case_splitter.go index 3cf7d48eb..b707c5a95 100644 --- a/ethtest/test_case_splitter.go +++ b/ethtest/test_case_splitter.go @@ -49,15 +49,15 @@ func NewTestCaseSplitter(cfg *utils.Config) (*TestCaseSplitter, error) { }, nil } -func sortForks(log logger.Logger, fork string) (forks []string) { - fork = utils.ToTitleCase(fork) - if fork == "All" { +func sortForks(log logger.Logger, cfgFork string) (forks []string) { + cfgFork = utils.ToTitleCase(cfgFork) + if cfgFork == "All" { forks = maps.Keys(usableForks) } else { - if _, ok := usableForks[fork]; !ok { - log.Warningf("Unknown name fork name %v, removing", fork) + if _, ok := usableForks[cfgFork]; !ok { + log.Warningf("Unknown name fork name %v, removing", cfgFork) } else { - forks = append(forks, fork) + forks = append(forks, cfgFork) } } return forks diff --git a/utils/statedb.go b/utils/statedb.go index 7244b7c0a..21ff6f2f2 100644 --- a/utils/statedb.go +++ b/utils/statedb.go @@ -224,7 +224,7 @@ func makeStateDBVariant( case "memory": return state.MakeEmptyGethInMemoryStateDB(variant) case "geth": - chainCfg, err := cfg.GetChainConfig(cfg.Fork) + chainCfg, err := cfg.GetChainConfig("") if err != nil { return nil, fmt.Errorf("cannot get chain config: %w", err) }