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

fundingmgr: fix logging message, correct column line wrap violation

Browse Source
This commit is contained in:
Olaoluwa Osuntokun 2017-03-24 16:12:05 -07:00
parent c9511da22f
commit 86a0b2f886
No known key found for this signature in database
GPG Key ID: 9CC5B105D03521A2
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
fundingmanager.go
View File

@ -492,18 +492,18 @@ func (f *fundingManager) handleFundingRequest(fmsg *fundingRequestMsg) {
delay := msg.CsvDelay delay := msg.CsvDelay
// TODO(roasbeef): error if funding flow already ongoing // TODO(roasbeef): error if funding flow already ongoing
fndgLog.Infof("Recv'd fundingRequest(amt=%v, delay=%v, pendingId=%v) "+ fndgLog.Infof("Recv'd fundingRequest(amt=%v, push=%v, delay=%v, "+
"from peer(%x)", amt, msg.PushSatoshis, delay, msg.ChannelID, "pendingId=%v) from peer(%x)", amt, msg.PushSatoshis, delay,
fmsg.peerAddress.IdentityKey.SerializeCompressed()) msg.ChannelID, fmsg.peerAddress.IdentityKey.SerializeCompressed())
ourDustLimit := lnwallet.DefaultDustLimit() ourDustLimit := lnwallet.DefaultDustLimit()
theirDustlimit := msg.DustLimit theirDustlimit := msg.DustLimit
// Attempt to initialize a reservation within the wallet. If the wallet // Attempt to initialize a reservation within the wallet. If the wallet
// has insufficient resources to create the channel, then the reservation // has insufficient resources to create the channel, then the
// attempt may be rejected. Note that since we're on the responding // reservation attempt may be rejected. Note that since we're on the
// side of a single funder workflow, we don't commit any funds to the // responding side of a single funder workflow, we don't commit any
// channel ourselves. // funds to the channel ourselves.
// TODO(roasbeef): assuming this was an inbound connection, replace // TODO(roasbeef): assuming this was an inbound connection, replace
// port with default advertised port // port with default advertised port
reservation, err := f.cfg.Wallet.InitChannelReservation(amt, 0, reservation, err := f.cfg.Wallet.InitChannelReservation(amt, 0,
@ -541,7 +541,8 @@ func (f *fundingManager) handleFundingRequest(fmsg *fundingRequestMsg) {
// With our portion of the reservation initialized, process the // With our portion of the reservation initialized, process the
// initiators contribution to the channel. // initiators contribution to the channel.
_, addrs, _, err := txscript.ExtractPkScriptAddrs(msg.DeliveryPkScript, activeNetParams.Params) _, addrs, _, err := txscript.ExtractPkScriptAddrs(msg.DeliveryPkScript,
activeNetParams.Params)
if err != nil { if err != nil {
fndgLog.Errorf("Unable to extract addresses from script: %v", err) fndgLog.Errorf("Unable to extract addresses from script: %v", err)
cancelReservation() cancelReservation()