mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-07-24 13:46:43 +00:00
cmd/workload: fixed double file.Close() calls
This commit is contained in:
parent
567c7e5ec5
commit
e50eab9e39
3 changed files with 2 additions and 6 deletions
|
|
@ -162,7 +162,6 @@ func (s *filterTestSuite) loadQueries() error {
|
|||
if err != nil {
|
||||
return fmt.Errorf("can't open filterQueryFile: %v", err)
|
||||
}
|
||||
defer file.Close()
|
||||
}
|
||||
defer file.Close()
|
||||
|
||||
|
|
|
|||
|
|
@ -61,7 +61,6 @@ func (s *historyTestSuite) loadTests() error {
|
|||
if err != nil {
|
||||
return fmt.Errorf("can't open historyTestFile: %v", err)
|
||||
}
|
||||
defer file.Close()
|
||||
}
|
||||
defer file.Close()
|
||||
if err := json.NewDecoder(file).Decode(&s.tests); err != nil {
|
||||
|
|
|
|||
|
|
@ -57,9 +57,7 @@ func newTraceTestSuite(cfg testConfig, ctx *cli.Context) *traceTestSuite {
|
|||
|
||||
func (s *traceTestSuite) loadTests() error {
|
||||
file, err := s.cfg.fsys.Open(s.cfg.traceTestFile)
|
||||
if err == nil {
|
||||
defer file.Close()
|
||||
} else {
|
||||
if err != nil {
|
||||
// If not found in embedded FS, try to load it from disk
|
||||
if !os.IsNotExist(err) {
|
||||
return err
|
||||
|
|
@ -68,8 +66,8 @@ func (s *traceTestSuite) loadTests() error {
|
|||
if err != nil {
|
||||
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 {
|
||||
return fmt.Errorf("invalid JSON in %s: %v", s.cfg.traceTestFile, err)
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue