fix curio test with ffiselect

itests/curio_test.go

@@ -5,6 +5,7 @@ import (
 	"encoding/base64"
 	"flag"
 	"fmt"
+	"github.com/filecoin-project/lotus/lib/ffiselect"
 	"net"
 	"os"
 	"path"
@@ -99,6 +100,7 @@ func TestCurioHappyPath(t *testing.T) {
 		kit.LatestActorsAt(-1),
 		kit.WithSectorIndexDB(),
 		kit.PresealSectors(32),
+		kit.ThroughRPC(),
 	)
 
 	esemble.Start()
@@ -293,6 +295,8 @@ func createCliContext(dir string) (*cli.Context, error) {
 }
 
 func ConstructCurioTest(ctx context.Context, t *testing.T, dir string, db *harmonydb.DB, full v1api.FullNode, maddr address.Address, cfg *config.CurioConfig) (api.Curio, func(), jsonrpc.ClientCloser, <-chan struct{}) {
+	ffiselect.IsTest = true
+
 	cctx, err := createCliContext(dir)
 	require.NoError(t, err)
 

lib/ffiselect/ffiselect.go

@@ -22,6 +22,7 @@ import (
 	"github.com/filecoin-project/lotus/lib/ffiselect/ffidirect"
 )
 
+var IsTest = false
 var IsCuda = build.IsOpencl != "1"
 
 // Get all devices from ffi
@@ -60,6 +61,10 @@ func call(logctx []any, fn string, args ...interface{}) ([]interface{}, error) {
 		ch <- dOrdinal
 	}()
 
+	if IsTest {
+		return callTest(logctx, fn, args...)
+	}
+
 	p, err := os.Executable()
 	if err != nil {
 		return nil, err

lib/ffiselect/testffi.go

@@ -0,0 +1,27 @@
+package ffiselect
+
+import (
+	"reflect"
+
+	"github.com/samber/lo"
+	"golang.org/x/xerrors"
+
+	"github.com/filecoin-project/lotus/lib/ffiselect/ffidirect"
+)
+
+func callTest(logctx []any, fn string, rawargs ...interface{}) ([]interface{}, error) {
+	args := lo.Map(rawargs, func(arg any, i int) reflect.Value {
+		return reflect.ValueOf(arg)
+	})
+
+	resAry := reflect.ValueOf(ffidirect.FFI{}).MethodByName(fn).Call(args)
+	res := lo.Map(resAry, func(res reflect.Value, i int) any {
+		return res.Interface()
+	})
+
+	if res[len(res)-1].(ffidirect.ErrorString) != "" {
+		return nil, xerrors.Errorf("callTest error: %s", res[len(res)-1].(ffidirect.ErrorString))
+	}
+
+	return res, nil
+}

lib/harmony/harmonydb/harmonydb.go

@@ -279,6 +279,8 @@ func (db *DB) upgrade() error {
 			return err
 		}
 
+		logger.Infow("Upgrading", "file", name, "size", len(file))
+
 		for _, s := range parseSQLStatements(string(file)) { // Implement the changes.
 			if len(strings.TrimSpace(s)) == 0 {
 				continue