cmd/era: properly close era files

This commit is contained in:
lightclient@protonmail.com 2023-05-23 13:25:24 +02:00 committed by lightclient
parent d6cc601921
commit 6c4747fe60
No known key found for this signature in database
GPG key ID: 75C916AFEE20183E

View file

@ -111,22 +111,20 @@ func block(ctx *cli.Context) error {
if err != nil { if err != nil {
return fmt.Errorf("invalid block number: %w", err) return fmt.Errorf("invalid block number: %w", err)
} }
f, err := open(ctx, num/uint64(ctx.Int(eraSizeFlag.Name))) f, err := open(ctx, num/uint64(ctx.Int(eraSizeFlag.Name)))
if err != nil { if err != nil {
return fmt.Errorf("error opening era: %w", err) return fmt.Errorf("error opening era: %w", err)
} }
defer f.Close()
r, err := era.NewReader(f) r, err := era.NewReader(f)
if err != nil { if err != nil {
return fmt.Errorf("error making era reader: %w", err) return fmt.Errorf("error making era reader: %w", err)
} }
// Read block with number. // Read block with number.
block, err := r.ReadBlock(num) block, err := r.ReadBlock(num)
if err != nil { if err != nil {
return fmt.Errorf("error reading era: %w", err) return fmt.Errorf("error reading era: %w", err)
} }
// Convert block to JSON and print. // Convert block to JSON and print.
val, err := ethapi.RPCMarshalBlock(block, ctx.Bool(txsFlag.Name), ctx.Bool(txsFlag.Name), params.MainnetChainConfig) val, err := ethapi.RPCMarshalBlock(block, ctx.Bool(txsFlag.Name), ctx.Bool(txsFlag.Name), params.MainnetChainConfig)
if err != nil { if err != nil {
@ -150,6 +148,7 @@ func info(ctx *cli.Context) error {
if err != nil { if err != nil {
return err return err
} }
defer f.Close()
r, err := era.NewReader(f) r, err := era.NewReader(f)
if err != nil { if err != nil {
return fmt.Errorf("error creating era reader: %w", err) return fmt.Errorf("error creating era reader: %w", err)