Merge pull request #56 from ellemouton/grpc-client

multi: grpc client conn

Author: guggero

cmd/wasm-client/lnd_conn.go

@@ -30,7 +30,9 @@ func mailboxRPCConnection(mailboxServer, pairingPhrase string,
 	)
 
 	ctx := context.Background()
-	transportConn, err := mailbox.NewClient(ctx, connData)
+	transportConn, err := mailbox.NewWebsocketsClient(
+		ctx, mailboxServer, connData,
+	)
 	if err != nil {
 		return nil, nil, err
 	}

itest/client_harness.go

@@ -12,10 +12,13 @@ import (
 	"github.com/lightninglabs/lightning-node-connect/mailbox"
 	"github.com/lightningnetwork/lnd/keychain"
 	"google.golang.org/grpc"
+	"google.golang.org/grpc/credentials"
 )
 
 type clientHarness struct {
 	serverAddr string
+	grpcClient bool
+	tlsConfig  *tls.Config
 
 	grpcConn   *grpc.ClientConn
 	clientConn mockrpc.MockServiceClient
@@ -28,15 +31,24 @@ type clientHarness struct {
 	cancel func()
 }
 
-func newClientHarness(serverAddress string, entropy []byte) (*clientHarness,
-	error) {
+func newClientHarness(serverAddress string, entropy []byte, insecure,
+	grpcClient bool) (*clientHarness, error) {
 
 	privKey, err := btcec.NewPrivateKey()
 	if err != nil {
 		return nil, err
 	}
 
+	tlsConfig := &tls.Config{}
+	if insecure {
+		tlsConfig = &tls.Config{
+			InsecureSkipVerify: true,
+		}
+	}
+
 	return &clientHarness{
+		tlsConfig:         tlsConfig,
+		grpcClient:        grpcClient,
 		serverAddr:        serverAddress,
 		passphraseEntropy: entropy,
 		localStatic:       &keychain.PrivKeyECDH{PrivKey: privKey},
@@ -62,16 +74,27 @@ func (c *clientHarness) start() error {
 		},
 	)
 
-	transportConn, err := mailbox.NewClient(ctx, connData)
+	var err error
+	if c.grpcClient {
+		c.client, err = mailbox.NewGrpcClient(
+			ctx, c.serverAddr, connData,
+			grpc.WithTransportCredentials(
+				credentials.NewTLS(c.tlsConfig),
+			),
+		)
+	} else {
+		c.client, err = mailbox.NewWebsocketsClient(
+			ctx, c.serverAddr, connData,
+		)
+	}
 	if err != nil {
 		return err
 	}
-	c.client = transportConn
 
 	noiseConn := mailbox.NewNoiseGrpcConn(connData)
 
 	dialOpts := []grpc.DialOption{
-		grpc.WithContextDialer(transportConn.Dial),
+		grpc.WithContextDialer(c.client.Dial),
 		grpc.WithTransportCredentials(noiseConn),
 		grpc.WithPerRPCCredentials(noiseConn),
 		grpc.WithDefaultCallOptions(

itest/connection_test.go

@@ -46,7 +46,6 @@ func testHashmailServerReconnect(t *harnessTest) {
 
 	// Shut down hashmail server
 	require.NoError(t.t, t.hmserver.stop())
-	t.t.Logf("")
 
 	// Check that the client and server status are updated appropriately.
 	assertServerStatus(t, mailbox.ServerStatusNotConnected)

itest/integration_test.go

@@ -1,96 +1,61 @@
 package itest
 
 import (
+	"fmt"
 	"testing"
 )
 
-const testnetMailbox = "mailbox.testnet.lightningcluster.com:443"
-
 // TestLightningNodeConnect runs the itests against a local mailbox instance.
 func TestLightningNodeConnect(t *testing.T) {
 	// If no tests are registered, then we can exit early.
 	if len(testCases) == 0 {
 		t.Skip("integration tests not selected")
 	}
 
-	ht := newHarnessTest(t, nil, nil, nil)
-	ht.setupLogging()
+	setupLogging(t)
+
+	testConfigs := []*testConfig{
+		{stagingMailbox: false, grpcClientConn: false},
+		{stagingMailbox: false, grpcClientConn: true},
+		{stagingMailbox: true, grpcClientConn: false},
+		{stagingMailbox: true, grpcClientConn: true},
+	}
 
 	t.Logf("Running %v integration tests", len(testCases))
 	for _, testCase := range testCases {
 
 		testCase := testCase
+		for _, config := range testConfigs {
+			config := config
 
-		success := t.Run(testCase.name, func(t1 *testing.T) {
-			clientHarness, serverHarness, hashmailHarness := setupHarnesses(t1)
-
-			ht := newHarnessTest(
-				t1, clientHarness, serverHarness,
-				hashmailHarness,
-			)
-
-			// Now we have everything to run the test case.
-			ht.RunTestCase(testCase)
-
-			// Shut down both client, server and hashmail server
-			// to remove all state.
-			err := ht.shutdown()
-			if err != nil {
-				t1.Fatalf("error shutting down harness: %v",
-					err)
+			if config.stagingMailbox && testCase.localMailboxOnly {
+				continue
 			}
-		})
-
-		// Close at the first failure. Mimic behavior of original test
-		// framework.
-		if !success {
-			break
-		}
-	}
-}
-
-// TestLightningNodeConnectTestnetMailbox runs the itests using the mailbox
-// running in the LL testnet environment.
-func TestLightningNodeConnectTestnetMailbox(t *testing.T) {
-	// If no tests are registered, then we can exit early.
-	if len(stagingMailboxTests) == 0 {
-		t.Skip("integration tests not selected")
-	}
 
-	ht := newHarnessTest(t, nil, nil, nil)
-	ht.setupLogging()
-
-	t.Logf("Running %v integration tests", len(stagingMailboxTests))
-	for _, testCase := range stagingMailboxTests {
-
-		testCase := testCase
-
-		success := t.Run(testCase.name, func(t1 *testing.T) {
-			clientHarness, serverHarness :=
-				setupClientAndServerHarnesses(
-					t1, testnetMailbox, false,
-				)
-
-			ht := newHarnessTest(
-				t1, clientHarness, serverHarness, nil,
-			)
-
-			// Now we have everything to run the test case.
-			ht.RunTestCase(testCase)
-
-			// Shut down both client, server and hashmail server
-			// to remove all state.
-			err := ht.shutdown()
-			if err != nil {
-				t1.Fatalf("error shutting down harness: %v",
-					err)
+			name := fmt.Sprintf("%s(stagingMailbox:%t,"+
+				"grpcClientConn:%t)", testCase.name,
+				config.stagingMailbox, config.grpcClientConn)
+
+			success := t.Run(name, func(t1 *testing.T) {
+				ht := newHarnessTest(t1, config)
+
+				// Now we have everything to run the test case.
+				ht.RunTestCase(testCase)
+
+				// Shut down both client, server and hashmail
+				// server to remove all state.
+				err := ht.shutdown()
+				if err != nil {
+					t1.Fatalf("error shutting down "+
+						"harness: %v", err)
+				}
+			})
+
+			// Close at the first failure. Mimic behavior of
+			// original test framework.
+			if !success {
+				break
 			}
-		})
-
-		// Close at the first failure. Mimic behavior of original test
-		// framework.
-		if !success {
-			break
 		}
 	}
 }