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

fill in some forgotten error paths

Browse Source
This commit is contained in:
Olaoluwa Osuntokun 2015-11-27 00:50:17 -06:00
parent 11179bf5c0
commit dfd14d53a5
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
wallet/wallet.go
View File

@ -241,6 +241,7 @@ func (l *LightningWallet) Start() error {
l.wallet.Start(rpcc) l.wallet.Start(rpcc)
l.wg.Add(1) l.wg.Add(1)
// TODO(roasbeef): multiple request handlers?
go l.requestHandler() go l.requestHandler()
return nil return nil
@ -318,6 +319,7 @@ func (l *LightningWallet) handleFundingReserveRequest(req *initFundingReserveMsg
unspentOutputs, err := l.wallet.ListUnspent(6, maxConfs, nil) unspentOutputs, err := l.wallet.ListUnspent(6, maxConfs, nil)
if err != nil { if err != nil {
req.err <- err req.err <- err
req.resp <- nil
return return
} }
@ -325,6 +327,7 @@ func (l *LightningWallet) handleFundingReserveRequest(req *initFundingReserveMsg
coins, err := outputsToCoins(unspentOutputs) coins, err := outputsToCoins(unspentOutputs)
if err != nil { if err != nil {
req.err <- err req.err <- err
req.resp <- nil
return return
} }
@ -340,6 +343,11 @@ func (l *LightningWallet) handleFundingReserveRequest(req *initFundingReserveMsg
MinChangeAmount: 10000, MinChangeAmount: 10000,
} }
selectedCoins, err := selector.CoinSelect(req.fundingAmount, coins) selectedCoins, err := selector.CoinSelect(req.fundingAmount, coins)
if err != nil {
req.err <- err
req.resp <- nil
return
}
// Lock the selected coins. These coins are now "reserved", this // Lock the selected coins. These coins are now "reserved", this
// prevents concurrent funding requests from referring to and this // prevents concurrent funding requests from referring to and this
@ -365,6 +373,7 @@ func (l *LightningWallet) handleFundingReserveRequest(req *initFundingReserveMsg
changeAddr, err := l.wallet.NewChangeAddress(waddrmgr.DefaultAccountNum) changeAddr, err := l.wallet.NewChangeAddress(waddrmgr.DefaultAccountNum)
if err != nil { if err != nil {
req.err <- err req.err <- err
req.resp <- nil
return return
} }
@ -377,6 +386,7 @@ func (l *LightningWallet) handleFundingReserveRequest(req *initFundingReserveMsg
multiSigKey, err := l.getNextMultiSigKey() multiSigKey, err := l.getNextMultiSigKey()
if err != nil { if err != nil {
req.err <- err req.err <- err
req.resp <- nil
return return
} }
@ -385,6 +395,7 @@ func (l *LightningWallet) handleFundingReserveRequest(req *initFundingReserveMsg
// Funding reservation request succesfully handled. The funding inputs // Funding reservation request succesfully handled. The funding inputs
// will be marked as unavailable until the reservation is either // will be marked as unavailable until the reservation is either
// completed, or cancecled. // completed, or cancecled.
req.resp <- partialState
req.err <- nil req.err <- nil
} }