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

funding: ensure reservations are cancelled if error'd at final stage

Browse Source
This commit is contained in:
Olaoluwa Osuntokun 2017-02-24 16:21:52 -08:00
parent 2d703d458d
commit cef81a6adf
No known key found for this signature in database
GPG Key ID: 9CC5B105D03521A2
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fundingmanager.go
View File

@ -504,7 +504,6 @@ func (f *fundingManager) handleFundingRequest(fmsg *fundingRequestMsg) {
// attempt may be rejected. Note that since we're on the responding // attempt may be rejected. Note that since we're on the responding
// side of a single funder workflow, we don't commit any funds to the // side of a single funder workflow, we don't commit any funds to the
// channel ourselves. // channel ourselves.
// TODO(roasbeef): passing num confs 1 is irrelevant here, make signed?
// 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,
@ -519,9 +518,9 @@ func (f *fundingManager) handleFundingRequest(fmsg *fundingRequestMsg) {
reservation.SetTheirDustLimit(theirDustlimit) reservation.SetTheirDustLimit(theirDustlimit)
// Once the reservation has been created successfully, we add it to this // Once the reservation has been created successfully, we add it to
// peers map of pending reservations to track this particular reservation // this peers map of pending reservations to track this particular
// until either abort or completion. // reservation until either abort or completion.
f.resMtx.Lock() f.resMtx.Lock()
if _, ok := f.activeReservations[peerIDKey]; !ok { if _, ok := f.activeReservations[peerIDKey]; !ok {
f.activeReservations[peerIDKey] = make(pendingChannels) f.activeReservations[peerIDKey] = make(pendingChannels)
@ -810,6 +809,10 @@ func (f *fundingManager) handleFundingSignComplete(fmsg *fundingSignCompleteMsg)
if err != nil { if err != nil {
fndgLog.Errorf("unable to complete reservation sign complete: %v", err) fndgLog.Errorf("unable to complete reservation sign complete: %v", err)
resCtx.err <- err resCtx.err <- err
if _, err := f.cancelReservationCtx(peerKey, chanID); err != nil {
fndgLog.Errorf("unable to cancel reservation: %v", err)
}
return return
} }