feat(ffi): Remove explicit garbage collection call

ffi/firewood.go

@@ -448,8 +448,6 @@ func (db *Database) Close(ctx context.Context) error {
 		return nil
 	}
 
-	go runtime.GC()
-
 	done := make(chan struct{})
 	go func() {
 		db.outstandingHandles.Wait()

ffi/firewood_test.go

@@ -156,7 +156,16 @@ func newTestDatabase(tb testing.TB, opts ...Option) *Database {
 	db, err := newDatabase(tb.TempDir(), opts...)
 	r.NoError(err)
 	tb.Cleanup(func() {
-		r.NoError(db.Close(oneSecCtx(tb)))
+		err := db.Close(oneSecCtx(tb))
+		if errors.Is(err, ErrActiveKeepAliveHandles) {
+			// force a GC to clean up dangling handles that are preventing the
+			// database from closing, then try again. Intentionally not looping
+			// since a subsequent attempt is unlikely to succeed if the first
+			// one didn't.
+			runtime.GC()
+			err = db.Close(oneSecCtx(tb))
+		}
+		r.NoError(err)
 	})
 	return db
 }

ffi/tests/eth/eth_compatibility_test.go

@@ -6,10 +6,14 @@ package eth
 import (
 	"context"
 	"encoding/binary"
+	"errors"
 	"math/rand"
+	"runtime"
 	"slices"
 	"testing"
+	"time"
 
+	"github.com/ava-labs/firewood-go-ethhash/ffi"
 	firewood "github.com/ava-labs/firewood-go-ethhash/ffi"
 	"github.com/ava-labs/libevm/common"
 	"github.com/ava-labs/libevm/core/rawdb"
@@ -62,13 +66,33 @@ type merkleTriePair struct {
 	pendingFwdBatch  []firewood.BatchOp
 }
 
+// oneSecCtx returns `tb.Context()` with a 1-second timeout added. Any existing
+// cancellation on `tb.Context()` is removed, which allows this function to be
+// used inside a `tb.Cleanup()`
+func oneSecCtx(tb testing.TB) context.Context {
+	ctx := context.WithoutCancel(tb.Context())
+	ctx, cancel := context.WithTimeout(ctx, time.Second)
+	tb.Cleanup(cancel)
+	return ctx
+}
+
 func newFirewoodDB(t *testing.T) *firewood.Database {
 	t.Helper()
+	r := require.New(t)
 
 	db, err := firewood.New(t.TempDir(), firewood.EthereumNodeHashing)
-	require.NoError(t, err, "firewood.New()")
+	r.NoError(err, "firewood.New()")
 	t.Cleanup(func() {
-		require.NoErrorf(t, db.Close(context.Background()), "%T.Close()", db)
+		err := db.Close(oneSecCtx(t))
+		if errors.Is(err, ffi.ErrActiveKeepAliveHandles) {
+			// force a GC to clean up dangling handles that are preventing the
+			// database from closing, then try again. Intentionally not looping
+			// since a subsequent attempt is unlikely to succeed if the first
+			// one didn't.
+			runtime.GC()
+			err = db.Close(oneSecCtx(t))
+		}
+		r.NoError(err, "%T.Close()", db)
 	})
 	return db
 }

ffi/tests/firewood/merkle_compatibility_test.go

@@ -5,12 +5,16 @@ package firewood
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"math/rand"
 	"path/filepath"
+	"runtime"
 	"slices"
 	"testing"
+	"time"
 
+	"github.com/ava-labs/firewood-go/ffi"
 	firewood "github.com/ava-labs/firewood-go/ffi"
 
 	"github.com/ava-labs/avalanchego/database"
@@ -50,14 +54,34 @@ var stepMap = map[byte]string{
 	commitProposal:           "commitProposal",
 }
 
+// oneSecCtx returns `tb.Context()` with a 1-second timeout added. Any existing
+// cancellation on `tb.Context()` is removed, which allows this function to be
+// used inside a `tb.Cleanup()`
+func oneSecCtx(tb testing.TB) context.Context {
+	ctx := context.WithoutCancel(tb.Context())
+	ctx, cancel := context.WithTimeout(ctx, time.Second)
+	tb.Cleanup(cancel)
+	return ctx
+}
+
 func newTestFirewoodDatabase(t *testing.T) *firewood.Database {
 	t.Helper()
+	r := require.New(t)
 
 	dbFile := filepath.Join(t.TempDir(), "test.db")
 	db, err := newFirewoodDatabase(dbFile)
-	require.NoError(t, err)
+	r.NoError(err, "firewood.New()")
 	t.Cleanup(func() {
-		require.NoError(t, db.Close(context.Background())) //nolint:usetesting // t.Context() will already be cancelled
+		err := db.Close(oneSecCtx(t))
+		if errors.Is(err, ffi.ErrActiveKeepAliveHandles) {
+			// force a GC to clean up dangling handles that are preventing the
+			// database from closing, then try again. Intentionally not looping
+			// since a subsequent attempt is unlikely to succeed if the first
+			// one didn't.
+			runtime.GC()
+			err = db.Close(oneSecCtx(t))
+		}
+		r.NoError(err, "%T.Close()", db)
 	})
 	return db
 }