akovalenko/lnd.xprv
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

lntest+make: build w/ watchtowerrpc tag, add grpc client to harness

Browse Source
This commit is contained in:
Conner Fromknecht 2019-06-20 16:55:13 -07:00
parent ccb2b29b93
commit f7da87acc4
No known key found for this signature in database
GPG Key ID: E7D737B67FA592C7
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lntest/node.go
View File

@ -25,6 +25,7 @@ import (
"github.com/lightningnetwork/lnd/lnrpc/invoicesrpc" "github.com/lightningnetwork/lnd/lnrpc/invoicesrpc"
"github.com/lightningnetwork/lnd/lnrpc/routerrpc" "github.com/lightningnetwork/lnd/lnrpc/routerrpc"
"github.com/lightningnetwork/lnd/lnrpc/walletrpc" "github.com/lightningnetwork/lnd/lnrpc/walletrpc"
"github.com/lightningnetwork/lnd/lnrpc/watchtowerrpc"
"github.com/lightningnetwork/lnd/macaroons" "github.com/lightningnetwork/lnd/macaroons"
"golang.org/x/net/context" "golang.org/x/net/context"
"google.golang.org/grpc" "google.golang.org/grpc"
@ -250,10 +251,11 @@ type HarnessNode struct {
invoicesrpc.InvoicesClient invoicesrpc.InvoicesClient
// RouterClient and WalletKitClient cannot be embedded, because a name // RouterClient, WalletKitClient, WatchtowerClient cannot be embedded,
// collision would occur with LightningClient. // because a name collision would occur with LightningClient.
RouterClient routerrpc.RouterClient RouterClient routerrpc.RouterClient
WalletKitClient walletrpc.WalletKitClient WalletKitClient walletrpc.WalletKitClient
WatchtowerClient watchtowerrpc.WatchtowerClient
} }
// Assert *HarnessNode implements the lnrpc.LightningClient interface. // Assert *HarnessNode implements the lnrpc.LightningClient interface.
@ -515,6 +517,7 @@ func (hn *HarnessNode) initLightningClient(conn *grpc.ClientConn) error {
hn.InvoicesClient = invoicesrpc.NewInvoicesClient(conn) hn.InvoicesClient = invoicesrpc.NewInvoicesClient(conn)
hn.RouterClient = routerrpc.NewRouterClient(conn) hn.RouterClient = routerrpc.NewRouterClient(conn)
hn.WalletKitClient = walletrpc.NewWalletKitClient(conn) hn.WalletKitClient = walletrpc.NewWalletKitClient(conn)
hn.WatchtowerClient = watchtowerrpc.NewWatchtowerClient(conn)
// Set the harness node's pubkey to what the node claims in GetInfo. // Set the harness node's pubkey to what the node claims in GetInfo.
err := hn.FetchNodeInfo() err := hn.FetchNodeInfo()
@ -717,6 +720,7 @@ func (hn *HarnessNode) stop() error {
hn.processExit = nil hn.processExit = nil
hn.LightningClient = nil hn.LightningClient = nil
hn.WalletUnlockerClient = nil hn.WalletUnlockerClient = nil
hn.WatchtowerClient = nil
return nil return nil
} }

2
make/testing_flags.mk
View File

@ -56,7 +56,7 @@ endif
# Construct the integration test command with the added build flags. # Construct the integration test command with the added build flags.
ITEST_TAGS := $(DEV_TAGS) rpctest chainrpc walletrpc signrpc invoicesrpc autopilotrpc routerrpc ITEST_TAGS := $(DEV_TAGS) rpctest chainrpc walletrpc signrpc invoicesrpc autopilotrpc routerrpc watchtowerrpc
# Default to btcd backend if not set. # Default to btcd backend if not set.
ifneq ($(backend),) ifneq ($(backend),)