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

server: replace nodeSigner in main with netann.NodeSigner

Browse Source
This commit is contained in:
Conner Fromknecht 2019-01-08 16:18:39 -08:00
parent 30441871d3
commit 32041e703b
No known key found for this signature in database
GPG Key ID: E7D737B67FA592C7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server.go
View File

@ -37,6 +37,7 @@ import (
"github.com/lightningnetwork/lnd/lnwallet" "github.com/lightningnetwork/lnd/lnwallet"
"github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/lnwire"
"github.com/lightningnetwork/lnd/nat" "github.com/lightningnetwork/lnd/nat"
"github.com/lightningnetwork/lnd/netann"
"github.com/lightningnetwork/lnd/routing" "github.com/lightningnetwork/lnd/routing"
"github.com/lightningnetwork/lnd/sweep" "github.com/lightningnetwork/lnd/sweep"
"github.com/lightningnetwork/lnd/ticker" "github.com/lightningnetwork/lnd/ticker"
@ -87,7 +88,7 @@ type server struct {
// nodeSigner is an implementation of the MessageSigner implementation // nodeSigner is an implementation of the MessageSigner implementation
// that's backed by the identity private key of the running lnd node. // that's backed by the identity private key of the running lnd node.
nodeSigner *nodeSigner nodeSigner *netann.NodeSigner
// listenAddrs is the list of addresses the server is currently // listenAddrs is the list of addresses the server is currently
// listening on. // listening on.
@ -269,7 +270,7 @@ func newServer(listenAddrs []net.Addr, chanDB *channeldb.DB, cc *chainControl,
invoices: newInvoiceRegistry(chanDB), invoices: newInvoiceRegistry(chanDB),
identityPriv: privKey, identityPriv: privKey,
nodeSigner: newNodeSigner(privKey), nodeSigner: netann.NewNodeSigner(privKey),
listenAddrs: listenAddrs, listenAddrs: listenAddrs,
@ -757,7 +758,6 @@ func newServer(listenAddrs []net.Addr, chanDB *channeldb.DB, cc *chainControl,
maxRemoteDelay = maxLtcRemoteDelay maxRemoteDelay = maxLtcRemoteDelay
} }
nodeSigner := newNodeSigner(privKey)
var chanIDSeed [32]byte var chanIDSeed [32]byte
if _, err := rand.Read(chanIDSeed[:]); err != nil { if _, err := rand.Read(chanIDSeed[:]); err != nil {
return nil, err return nil, err
@ -772,7 +772,7 @@ func newServer(listenAddrs []net.Addr, chanDB *channeldb.DB, cc *chainControl,
msg []byte) (*btcec.Signature, error) { msg []byte) (*btcec.Signature, error) {
if pubKey.IsEqual(privKey.PubKey()) { if pubKey.IsEqual(privKey.PubKey()) {
return nodeSigner.SignMessage(pubKey, msg) return s.nodeSigner.SignMessage(pubKey, msg)
} }
return cc.msgSigner.SignMessage(pubKey, msg) return cc.msgSigner.SignMessage(pubKey, msg)