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

cmd/workload: fixed double file.Close() calls

Browse source
This commit is contained in:
zsfelfoldi 2025-07-02 13:19:48 +02:00
parent 567c7e5ec5
commit e50eab9e39
3 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cmd/workload/filtertest.go
View file

@ -162,7 +162,6 @@ func (s *filterTestSuite) loadQueries() error {
if err != nil { if err != nil {
return fmt.Errorf("can't open filterQueryFile: %v", err) return fmt.Errorf("can't open filterQueryFile: %v", err)
} }
defer file.Close()
} }
defer file.Close() defer file.Close()

1
cmd/workload/historytest.go
View file

@ -61,7 +61,6 @@ func (s *historyTestSuite) loadTests() error {
if err != nil { if err != nil {
return fmt.Errorf("can't open historyTestFile: %v", err) return fmt.Errorf("can't open historyTestFile: %v", err)
} }
defer file.Close()
} }
defer file.Close() defer file.Close()
if err := json.NewDecoder(file).Decode(&s.tests); err != nil { if err := json.NewDecoder(file).Decode(&s.tests); err != nil {

6
cmd/workload/tracetest.go
View file

@ -57,9 +57,7 @@ func newTraceTestSuite(cfg testConfig, ctx *cli.Context) *traceTestSuite {
func (s *traceTestSuite) loadTests() error { func (s *traceTestSuite) loadTests() error {
file, err := s.cfg.fsys.Open(s.cfg.traceTestFile) file, err := s.cfg.fsys.Open(s.cfg.traceTestFile)
if err == nil { if err != nil {
defer file.Close()
} else {
// If not found in embedded FS, try to load it from disk // If not found in embedded FS, try to load it from disk
if !os.IsNotExist(err) { if !os.IsNotExist(err) {
return err return err
@ -68,8 +66,8 @@ func (s *traceTestSuite) loadTests() error {
if err != nil { if err != nil {
return fmt.Errorf("can't open traceTestFile: %v", err) return fmt.Errorf("can't open traceTestFile: %v", err)
} }
defer file.Close()
} }
defer file.Close()
if err := json.NewDecoder(file).Decode(&s.tests); err != nil { if err := json.NewDecoder(file).Decode(&s.tests); err != nil {
return fmt.Errorf("invalid JSON in %s: %v", s.cfg.traceTestFile, err) return fmt.Errorf("invalid JSON in %s: %v", s.cfg.traceTestFile, err)
} }