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

Merge pull request #1709 from Empact/noisedial

Browse Source 
Move noiseDial from config.go to server.go
This commit is contained in:
Olaoluwa Osuntokun 2018-08-09 21:43:37 -07:00 committed by GitHub
commit 61f5b3e3f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
config.go
View File

@ -19,10 +19,8 @@ import (
"strings" "strings"
"time" "time"
"github.com/btcsuite/btcd/btcec"
"github.com/btcsuite/btcutil" "github.com/btcsuite/btcutil"
flags "github.com/jessevdk/go-flags" flags "github.com/jessevdk/go-flags"
"github.com/lightningnetwork/lnd/brontide"
"github.com/lightningnetwork/lnd/htlcswitch/hodl" "github.com/lightningnetwork/lnd/htlcswitch/hodl"
"github.com/lightningnetwork/lnd/lncfg" "github.com/lightningnetwork/lnd/lncfg"
"github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/lnwire"
@ -1030,15 +1028,6 @@ func supportedSubsystems() []string {
return subsystems return subsystems
} }
// noiseDial is a factory function which creates a connmgr compliant dialing
// function by returning a closure which includes the server's identity key.
func noiseDial(idPriv *btcec.PrivateKey) func(net.Addr) (net.Conn, error) {
return func(a net.Addr) (net.Conn, error) {
lnAddr := a.(*lnwire.NetAddress)
return brontide.Dial(idPriv, lnAddr, cfg.net.Dial)
}
}
func parseRPCParams(cConfig *chainConfig, nodeConfig interface{}, net chainCode, func parseRPCParams(cConfig *chainConfig, nodeConfig interface{}, net chainCode,
funcName string) error { funcName string) error {

9
server.go
View File

@ -207,6 +207,15 @@ func parseAddr(address string) (net.Addr, error) {
return cfg.net.ResolveTCPAddr("tcp", hostPort) return cfg.net.ResolveTCPAddr("tcp", hostPort)
} }
// noiseDial is a factory function which creates a connmgr compliant dialing
// function by returning a closure which includes the server's identity key.
func noiseDial(idPriv *btcec.PrivateKey) func(net.Addr) (net.Conn, error) {
return func(a net.Addr) (net.Conn, error) {
lnAddr := a.(*lnwire.NetAddress)
return brontide.Dial(idPriv, lnAddr, cfg.net.Dial)
}
}
// newServer creates a new instance of the server which is to listen using the // newServer creates a new instance of the server which is to listen using the
// passed listener address. // passed listener address.
func newServer(listenAddrs []net.Addr, chanDB *channeldb.DB, cc *chainControl, func newServer(listenAddrs []net.Addr, chanDB *channeldb.DB, cc *chainControl,