commit

erigon-lib/common/customfs/customfs.go

@@ -41,17 +41,18 @@ func underlyingErrorIs(err, target error) bool {
 	// underlyingError only unwraps the specific error-wrapping types
 	// that it historically did, not all errors implementing Unwrap().
 	err = underlyingError(err)
-	if err == target {
+	if errors.Is(err, target) {
 		return true
 	}
 	// To preserve prior behavior, only examine syscall errors.
-	e, ok := err.(syscallErrorType)
+	var e syscallErrorType
+	ok := errors.As(err, &e)
 	return ok && e.Is(target)
 }
 
 // underlyingError returns the underlying error for known os error types.
 func underlyingError(err error) error {
-	switch err := err.(type) {
+	switch err := err.(type) { //nolint
 	case *os.PathError:
 		return err.Err
 	case *os.LinkError:
@@ -80,21 +81,10 @@ func genericReadFrom(f *CustomFile, r io.Reader) (int64, error) {
 	return io.Copy(fileWithoutReadFrom{CustomFile: f}, r)
 }
 
-// noReadFrom can be embedded alongside another type to
-// hide the ReadFrom method of that other type.
-type noReadFrom struct{}
-
-// ReadFrom hides another ReadFrom method.
-// It should never be called.
-func (noReadFrom) ReadFrom(io.Reader) (int64, error) {
-	panic("can't happen")
-}
-
 // fileWithoutReadFrom implements all the methods of *File other
 // than ReadFrom. This is used to permit ReadFrom to call io.Copy
 // without leading to a recursive call to ReadFrom.
 type fileWithoutReadFrom struct {
-	noReadFrom
 	*CustomFile
 }
 
@@ -254,7 +244,7 @@ func (fs *CustomFileSystem) ReadFile(name string) ([]byte, error) {
 		n, err := f.Read(data[len(data):cap(data)])
 		data = data[:len(data)+n]
 		if err != nil {
-			if err == io.EOF {
+			if errors.Is(err, io.EOF) {
 				err = nil
 			}
 			return data, err

erigon-lib/state/aggregator_test.go

@@ -1106,6 +1106,7 @@ func testDbAndAggregatorv3(t *testing.T, aggStep uint64) (kv.RwDB, *Aggregator)
 		err := customfs.CFS.RemoveAll(tmpName)
 		require.NoError(err)
 		err = os.RemoveAll(tmpName)
+		require.NoError(err)
 	})
 	logger := log.New()
 	db := mdbx.NewMDBX(logger).InMem(dirs.Chaindata).GrowthStep(32 * datasize.MB).MapSize(2 * datasize.GB).WithTableCfg(func(defaultBuckets kv.TableCfg) kv.TableCfg {