Change rpc package name

This commit is contained in:
Yaacov Akiba Slama
2019-07-17 17:51:57 +03:00
parent 1cd9ecac5c
commit 5e48f77ab3

View File

@@ -9,7 +9,7 @@ import (
"os" "os"
"strings" "strings"
lspd "lspd/rpc" lspdrpc "github.com/breez/lspd/rpc"
"github.com/btcsuite/btcd/chaincfg/chainhash" "github.com/btcsuite/btcd/chaincfg/chainhash"
"github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lnrpc"
@@ -30,16 +30,16 @@ var (
openChannelReqGroup singleflight.Group openChannelReqGroup singleflight.Group
) )
func (s *server) CanOpenChannel(ctx context.Context, in *lspd.CanOpenChannelRequest) (*lspd.CanOpenChannelReply, error) { func (s *server) CanOpenChannel(ctx context.Context, in *lspdrpc.CanOpenChannelRequest) (*lspdrpc.CanOpenChannelReply, error) {
return &lspd.CanOpenChannelReply{ return &lspdrpc.CanOpenChannelReply{
Addr: &lspd.LightningAddress{ Addr: &lspdrpc.LightningAddress{
Pubkey: os.Getenv("NODE_PUBKEY"), Pubkey: os.Getenv("NODE_PUBKEY"),
Host: os.Getenv("NODE_HOST"), Host: os.Getenv("NODE_HOST"),
}, },
}, nil }, nil
} }
func (s *server) OpenChannel(ctx context.Context, in *lspd.OpenChannelRequest) (*lspd.OpenChannelReply, error) { func (s *server) OpenChannel(ctx context.Context, in *lspdrpc.OpenChannelRequest) (*lspdrpc.OpenChannelReply, error) {
r, err, _ := openChannelReqGroup.Do(in.Pubkey, func() (interface{}, error) { r, err, _ := openChannelReqGroup.Do(in.Pubkey, func() (interface{}, error) {
clientCtx := metadata.AppendToOutgoingContext(context.Background(), "macaroon", os.Getenv("LND_MACAROON_HEX")) clientCtx := metadata.AppendToOutgoingContext(context.Background(), "macaroon", os.Getenv("LND_MACAROON_HEX"))
nodeChannels, err := getNodeChannels(in.Pubkey) nodeChannels, err := getNodeChannels(in.Pubkey)
@@ -75,13 +75,13 @@ func (s *server) OpenChannel(ctx context.Context, in *lspd.OpenChannelRequest) (
txidStr = txid.String() txidStr = txid.String()
} }
} }
return &lspd.OpenChannelReply{TxHash: txidStr}, nil return &lspdrpc.OpenChannelReply{TxHash: txidStr}, nil
}) })
if err != nil { if err != nil {
return nil, err return nil, err
} }
return r.(*lspd.OpenChannelReply), err return r.(*lspdrpc.OpenChannelReply), err
} }
func getNodeChannels(nodeID string) ([]*lnrpc.Channel, error) { func getNodeChannels(nodeID string) ([]*lnrpc.Channel, error) {
@@ -136,7 +136,7 @@ func main() {
client = lnrpc.NewLightningClient(conn) client = lnrpc.NewLightningClient(conn)
s := grpc.NewServer() s := grpc.NewServer()
lspd.RegisterChannelOpenerServer(s, &server{}) lspdrpc.RegisterChannelOpenerServer(s, &server{})
if err := s.Serve(lis); err != nil { if err := s.Serve(lis); err != nil {
log.Fatalf("failed to serve: %v", err) log.Fatalf("failed to serve: %v", err)
} }