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

peer: fix peer API usage due to incomplete cherry-pick

Browse Source
This commit is contained in:
Olaoluwa Osuntokun 2017-06-05 19:40:43 -07:00
parent 91d4e6a377
commit d202b730eb
No known key found for this signature in database
GPG Key ID: 9CC5B105D03521A2
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
peer.go
View File

@ -955,7 +955,7 @@ func (p *peer) handleShutdownResponse(msg *lnwire.Shutdown) []byte {
} }
// Calculate an initial proposed fee rate for the close transaction. // Calculate an initial proposed fee rate for the close transaction.
feeRate := p.server.feeEstimator.EstimateFeePerWeight(1) * 1000 feeRate := p.server.cc.feeEstimator.EstimateFeePerWeight(1) * 1000
// TODO(roasbeef): actually perform fee negotiation here, only send sig // TODO(roasbeef): actually perform fee negotiation here, only send sig
// if we agree to fee // if we agree to fee
@ -1015,7 +1015,7 @@ func (p *peer) handleInitClosingSigned(req *htlcswitch.ChanClose, msg *lnwire.Cl
// //
// TODO(bvu): with a dynamic fee implementation, we will compare this // TODO(bvu): with a dynamic fee implementation, we will compare this
// to the fee proposed by the responder in their ClosingSigned message. // to the fee proposed by the responder in their ClosingSigned message.
feeRate := p.server.feeEstimator.EstimateFeePerWeight(1) * 1000 feeRate := p.server.cc.feeEstimator.EstimateFeePerWeight(1) * 1000
// We agree with the proposed channel close transaction and fee rate, // We agree with the proposed channel close transaction and fee rate,
// so generate our signature. // so generate our signature.
@ -1053,7 +1053,7 @@ func (p *peer) handleInitClosingSigned(req *htlcswitch.ChanClose, msg *lnwire.Cl
newLogClosure(func() string { newLogClosure(func() string {
return spew.Sdump(closeTx) return spew.Sdump(closeTx)
})) }))
if err := p.server.lnwallet.PublishTransaction(closeTx); err != nil { if err := p.server.cc.wallet.PublishTransaction(closeTx); err != nil {
peerLog.Errorf("channel close tx from "+ peerLog.Errorf("channel close tx from "+
"ChannelPoint(%v) rejected: %v", "ChannelPoint(%v) rejected: %v",
req.ChanPoint, err) req.ChanPoint, err)
@ -1108,8 +1108,8 @@ func (p *peer) handleInitClosingSigned(req *htlcswitch.ChanClose, msg *lnwire.Cl
// ChainNotifier once the closure transaction obtains a single // ChainNotifier once the closure transaction obtains a single
// confirmation. // confirmation.
notifier := p.server.cc.chainNotifier notifier := p.server.cc.chainNotifier
go waitForChanToClose(uint32(bestHeight), notifier, req.err, go waitForChanToClose(uint32(bestHeight), notifier, req.Err,
req.ChanPoint, closingTxid, func() { req.ChanPoint, &closingTxid, func() {
// First, we'll mark the database as being fully closed // First, we'll mark the database as being fully closed
// so we'll no longer watch for its ultimate closure // so we'll no longer watch for its ultimate closure
@ -1156,7 +1156,7 @@ func (p *peer) handleResponseClosingSigned(msg *lnwire.ClosingSigned,
// Calculate our expected fee rate. // Calculate our expected fee rate.
// TODO(roasbeef): should instead use the fee within the message // TODO(roasbeef): should instead use the fee within the message
feeRate := p.server.feeEstimator.EstimateFeePerWeight(1) * 1000 feeRate := p.server.cc.feeEstimator.EstimateFeePerWeight(1) * 1000
closeTx, err := channel.CompleteCooperativeClose(respSig, initSig, closeTx, err := channel.CompleteCooperativeClose(respSig, initSig,
feeRate) feeRate)
if err != nil { if err != nil {