FFISelect improvements (#70)

* fixed it

* simpler

lib/ffiselect/ffi_test.go

@@ -0,0 +1,16 @@
+package ffiselect
+
+import (
+	"context"
+	"testing"
+
+	"github.com/ipfs/go-cid"
+	"github.com/stretchr/testify/require"
+)
+
+func TestSelf(t *testing.T) {
+	testCID := cid.NewCidV1(1, []byte("test"))
+	cid, err := FFISelect.SelfTest(context.Background(), 12345678, testCID)
+	require.NoError(t, err)
+	require.Equal(t, testCID, cid)
+}

lib/ffiselect/ffiselect.go

@@ -6,6 +6,7 @@ import (
 	"io"
 	"os"
 	"os/exec"
+	"reflect"
 	"strconv"
 	"strings"
 
@@ -19,6 +20,7 @@ import (
 	"github.com/filecoin-project/go-state-types/proof"
 
 	"github.com/filecoin-project/curio/build"
+	"github.com/filecoin-project/curio/lib/ffiselect/ffidirect"
 
 	"github.com/filecoin-project/lotus/storage/sealer/storiface"
 )
@@ -42,28 +44,29 @@ func init() {
 	if err != nil {
 		panic(err)
 	}
-	if len(devices) == 0 {
-		ch = make(chan string, 1)
-		ch <- "0"
-	} else {
+	if len(devices) > 1 {
+		_, err := jsonrpc.NewCustomClient("FFI", []interface{}{&FFISelect}, call)
+		if err != nil {
+			panic(err)
+		}
 		ch = make(chan string, len(devices))
 		for i := 0; i < len(devices); i++ {
 			ch <- strconv.Itoa(i)
 		}
+	} else { // direct call for single device case.
+		ffiSelect := reflect.ValueOf(&FFISelect).Elem()
+		ffiDirectValue := reflect.ValueOf(ffidirect.FFI{})
+		ffiDirectType := ffiDirectValue.Type()
+
+		for i := 0; i < ffiDirectType.NumMethod(); i++ {
+			f := ffiSelect.FieldByName(ffiDirectType.Method(i).Name)
+			f.Set(reflect.MakeFunc(f.Type(), func(args []reflect.Value) []reflect.Value {
+				return ffiDirectValue.Method(i).Call(args[1:]) // avoid sending ctx
+			}))
+		}
 	}
 }
 
-type ValErr struct {
-	Val []interface{}
-	Err string
-}
-
-// This is not the one you're looking for.
-type FFICall struct {
-	Fn   string
-	Args []interface{}
-}
-
 func subStrInSet(set []string, sub string) bool {
 	return lo.Reduce(set, func(agg bool, item string, _ int) bool { return agg || strings.Contains(item, sub) }, false)
 }
@@ -174,12 +177,3 @@ var FFISelect struct {
 
 	SelfTest func(ctx context.Context, val1 int, val2 cid.Cid) (cid.Cid, error)
 }
-
-// //////////////////////////
-
-func init() {
-	_, err := jsonrpc.NewCustomClient("FFI", []interface{}{&FFISelect}, call)
-	if err != nil {
-		panic(err)
-	}
-}