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

brontide: Make dialer parameter in brontide.Dial non-optional

Browse Source
This commit is contained in:
MeshCollider 2018-01-23 18:38:58 +13:00 committed by Olaoluwa Osuntokun
parent 69f207e23f
commit 945be73bca
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
brontide/conn.go
View File

@ -33,17 +33,11 @@ var _ net.Conn = (*Conn)(nil)
// public key. In the case of a handshake failure, the connection is closed and
// a non-nil error is returned.
func Dial(localPriv *btcec.PrivateKey, netAddr *lnwire.NetAddress,
dialer ...func(string, string) (net.Conn, error)) (*Conn, error) {
dialer func(string, string) (net.Conn, error)) (*Conn, error) {
ipAddr := netAddr.Address.String()
var conn net.Conn
var err error
if dialer == nil {
// A dial function WAS NOT passed in.
conn, err = net.Dial("tcp", ipAddr)
} else {
// A dial function WAS passed in so we use it instead.
conn, err = dialer[0]("tcp", ipAddr)
}
conn, err = dialer("tcp", ipAddr)
if err != nil {
return nil, err
}

2
brontide/noise_test.go
View File

@ -47,7 +47,7 @@ func establishTestConnection() (net.Conn, net.Conn, func(), error) {
conErrChan := make(chan error, 1)
connChan := make(chan net.Conn, 1)
go func() {
conn, err := Dial(remotePriv, netAddr)
conn, err := Dial(remotePriv, netAddr, net.Dial)
conErrChan <- err
connChan <- conn