Add new error handling function for non defer context. Apply changes …

…requested in review

cmd/sonicd/app/launcher.go

@@ -202,10 +202,10 @@ func initApp() {
 		return nil
 	}
 
-	app.After = func(ctx *cli.Context) (err error) {
+	app.After = func(ctx *cli.Context) error {
 		debug.Exit()
-		caution.CloseAndReportError(&err, prompt.Stdin, "failed to reset terminal input") // Resets terminal mode.
-		return
+		// Close will resets terminal mode.
+		return caution.IfErrorAddContext(prompt.Stdin.Close(), "failed to reset terminal input")
 	}
 }
 

cmd/sonictool/app/genesis.go

@@ -1,6 +1,7 @@
 package app
 
 import (
+	"errors"
 	"fmt"
 	"os"
 	"strconv"
@@ -57,7 +58,7 @@ func gfileGenesisImport(ctx *cli.Context) (err error) {
 
 	genesisStore, genesisHashes, err := genesisstore.OpenGenesisStore(genesisReader)
 	if err != nil {
-		return fmt.Errorf("failed to read genesis file: %w", err)
+		return errors.Join(fmt.Errorf("failed to read genesis file: %w", err), genesisReader.Close())
 	}
 	defer caution.CloseAndReportError(&err, genesisStore, "failed to close the genesis store")
 	if err := genesis.IsGenesisTrusted(genesisStore, genesisHashes); err != nil {

cmd/sonictool/app/heal.go

@@ -112,7 +112,7 @@ func healLiveFromArchive(ctx context.Context, carmenLiveDir, carmenArchiveDir st
 	wg.Add(1)
 	go func() {
 		defer wg.Done()
-		defer caution.CloseAndReportError(&err, writer, "failed to close writer")
+		defer caution.CloseAndReportError(&exportErr, writer, "failed to close writer")
 		exportErr = mptio.ExportBlockFromArchive(ctx, mptio.NewLog(), carmenArchiveDir, bufWriter, uint64(recoveredBlock))
 		if exportErr == nil {
 			exportErr = bufWriter.Flush()

cmd/sonictool/app/sign_genesis.go

@@ -1,6 +1,7 @@
 package app
 
 import (
+	"errors"
 	"fmt"
 	"os"
 
@@ -59,18 +60,20 @@ func signGenesis(ctx *cli.Context) error {
 	return nil
 }
 
-func getGenesisHeaderHashes(genesisFile string) (ogenesis.Header, ogenesis.Hashes, error) {
+func getGenesisHeaderHashes(genesisFile string) (header ogenesis.Header, genesisHashes ogenesis.Hashes, err error) {
 	genesisReader, err := os.Open(genesisFile)
 	// note, genesisStore closes the reader, no need to defer close it here
 	if err != nil {
-		return ogenesis.Header{}, nil, fmt.Errorf("failed to open the genesis file: %w", err)
+		err = fmt.Errorf("failed to open the genesis file: %w", err)
+		return
 	}
 
 	genesisStore, genesisHashes, err := genesisstore.OpenGenesisStore(genesisReader)
 	if err != nil {
-		return ogenesis.Header{}, nil, fmt.Errorf("failed to read genesis file: %w", err)
+		err = errors.Join(fmt.Errorf("failed to read genesis file: %w", err), genesisReader.Close())
+		return
 	}
 	defer caution.CloseAndReportError(&err, genesisStore, "failed to close the genesis store")
-
-	return genesisStore.Header(), genesisHashes, nil
+	header = genesisStore.Header()
+	return
 }

cmd/sonictool/genesis/signature.go

@@ -114,7 +114,9 @@ func WriteSignatureIntoGenesisFile(header genesis.Header, signature []byte, file
 		return
 	}
 	_, err = writer.Flush()
-	err = fmt.Errorf("failed to flush genesis file: %w", err)
+	if err != nil {
+		err = fmt.Errorf("failed to flush genesis file: %w", err)
+	}
 	return
 }
 

debug/api.go

@@ -62,8 +62,9 @@ func (h *HandlerT) StartCPUProfile(file string) error {
 		return err
 	}
 	if err := pprof.StartCPUProfile(f); err != nil {
-		caution.CloseAndReportError(&err, f, "failed to close profile file")
-		return err
+		return errors.Join(
+			fmt.Errorf("failed to start CPU: %w", err),
+			caution.IfErrorAddContext(f.Close(), "failed to close CPU profile file"))
 	}
 	h.cpuW = f
 	h.cpuFile = file

debug/trace.go

@@ -21,6 +21,7 @@ package debug
 
 import (
 	"errors"
+	"fmt"
 	"os"
 	"runtime/trace"
 
@@ -40,8 +41,9 @@ func (h *HandlerT) StartGoTrace(file string) error {
 		return err
 	}
 	if err := trace.Start(f); err != nil {
-		caution.CloseAndReportError(&err, f, "failed to close trace file")
-		return err
+		return errors.Join(
+			fmt.Errorf("failed to start Go trace: %w", err),
+			caution.IfErrorAddContext(f.Close(), "failed to close trace file"))
 	}
 	h.traceW = f
 	h.traceFile = file

topicsdb/search_parallel.go

@@ -5,6 +5,7 @@ import (
 	"sync"
 
 	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/log"
 )
 
 type logHandler func(rec *logrec) (gonext bool, err error)
@@ -117,5 +118,7 @@ func (tt *index) scanPatternVariant(pos uint8, variant common.Hash, start uint64
 			break
 		}
 	}
-	onMatched(nil)
+	if _, err := onMatched(nil); err != nil {
+		log.Warn("searchParallel", "err", err)
+	}
 }

utils/caution/caution.go

@@ -67,3 +67,11 @@ func CloseAndReportError(err *error, closer io.Closer, message string) {
 		return closer.Close()
 	}, message)
 }
+
+// IfErrorAddContext adds a message to an error, if the error is not nil.
+func IfErrorAddContext(err error, message string) error {
+	if err == nil {
+		return nil
+	}
+	return fmt.Errorf("%s: %w", message, err)
+}

utils/caution/caution_test.go

@@ -66,3 +66,15 @@ func TestCloseAndReportError_UsagePatternPropagatesError(t *testing.T) {
 	gotError := testFun()
 	require.ErrorIs(t, gotError, expectedError)
 }
+
+func TestIfErrorAddContext_PropagatesNil(t *testing.T) {
+	if IfErrorAddContext(nil, "message") != nil {
+		t.Error("IfErrorAddContext should return nil when err is nil")
+	}
+}
+
+func TestIfErrorAddContext_AddsContextToError(t *testing.T) {
+	err := fmt.Errorf("someError")
+	errWithContext := IfErrorAddContext(err, "message")
+	require.ErrorContains(t, errWithContext, "message: someError")
+}

valkeystore/encryption/io.go

@@ -1,6 +1,7 @@
 package encryption
 
 import (
+	"errors"
 	"fmt"
 	"os"
 	"path/filepath"
@@ -23,10 +24,11 @@ func writeTemporaryKeyFile(file string, content []byte) (string, error) {
 	}
 
 	if _, err = f.Write(content); err != nil {
-		caution.CloseAndReportError(&err, f, "failed to close key file")
-		caution.ExecuteAndReportError(&err, func() error { return os.Remove(f.Name()) },
-			"failed to remove temporary key file")
-		return "", err
+		return "", errors.Join(
+			fmt.Errorf("failed to write key file: %w", err),
+			caution.IfErrorAddContext(f.Close(), "failed to close key file"),
+			caution.IfErrorAddContext(os.Remove(f.Name()), "failed to remove temporary key file"),
+		)
 	}
 
 	return f.Name(), f.Close()