Skip to content

Commit df4891d

Browse files
committed
fix lint
1 parent 3cfb408 commit df4891d

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

engine/verification/verifier/verifiers.go

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package verifier
22

33
import (
4+
"errors"
45
"fmt"
56

67
"github.com/rs/zerolog"
@@ -76,15 +77,15 @@ func VerifyRange(
7677
from, to uint64,
7778
chainID flow.ChainID,
7879
protocolDataDir string, chunkDataPackDir string,
79-
) error {
80+
) (err error) {
8081
closer, storages, chunkDataPacks, state, verifier, err := initStorages(chainID, protocolDataDir, chunkDataPackDir)
8182
if err != nil {
8283
return fmt.Errorf("could not init storages: %w", err)
8384
}
8485
defer func() {
85-
err := closer()
86-
if err != nil {
87-
log.Error().Err(err).Msg("failed to close storages")
86+
closerErr := closer()
87+
if closerErr != nil {
88+
err = errors.Join(err, closerErr)
8889
}
8990
}()
9091

@@ -132,12 +133,12 @@ func initStorages(chainID flow.ChainID, dataDir string, chunkDataPackDir string)
132133

133134
verifier := makeVerifier(log.Logger, chainID, storages.Headers)
134135
closer := func() error {
135-
var dbErr, chunkDataPackDBErr error
136-
136+
var dbErr, chunkDataPackDBErr error
137+
137138
if err := db.Close(); err != nil {
138139
dbErr = fmt.Errorf("failed to close protocol db: %w", err)
139140
}
140-
141+
141142
if err := chunkDataPackDB.Close(); err != nil {
142143
chunkDataPackDBErr = fmt.Errorf("failed to close chunk data pack db: %w", err)
143144
}

0 commit comments

Comments
 (0)