From dfd14d53a5a6ea48b3c35d00968b3d869a881277 Mon Sep 17 00:00:00 2001
From: Olaoluwa Osuntokun <laolu32@gmail.com>
Date: Fri, 27 Nov 2015 00:50:17 -0600
Subject: [PATCH] fill in some forgotten error paths

---
 wallet/wallet.go | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/wallet/wallet.go b/wallet/wallet.go
index 7d4f70cc..43c4517e 100644
--- a/wallet/wallet.go
+++ b/wallet/wallet.go
@@ -241,6 +241,7 @@ func (l *LightningWallet) Start() error {
 	l.wallet.Start(rpcc)
 
 	l.wg.Add(1)
+	// TODO(roasbeef): multiple request handlers?
 	go l.requestHandler()
 
 	return nil
@@ -318,6 +319,7 @@ func (l *LightningWallet) handleFundingReserveRequest(req *initFundingReserveMsg
 	unspentOutputs, err := l.wallet.ListUnspent(6, maxConfs, nil)
 	if err != nil {
 		req.err <- err
+		req.resp <- nil
 		return
 	}
 
@@ -325,6 +327,7 @@ func (l *LightningWallet) handleFundingReserveRequest(req *initFundingReserveMsg
 	coins, err := outputsToCoins(unspentOutputs)
 	if err != nil {
 		req.err <- err
+		req.resp <- nil
 		return
 	}
 
@@ -340,6 +343,11 @@ func (l *LightningWallet) handleFundingReserveRequest(req *initFundingReserveMsg
 		MinChangeAmount: 10000,
 	}
 	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
 	// 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)
 		if err != nil {
 			req.err <- err
+			req.resp <- nil
 			return
 		}
 
@@ -377,6 +386,7 @@ func (l *LightningWallet) handleFundingReserveRequest(req *initFundingReserveMsg
 	multiSigKey, err := l.getNextMultiSigKey()
 	if err != nil {
 		req.err <- err
+		req.resp <- nil
 		return
 	}
 
@@ -385,6 +395,7 @@ func (l *LightningWallet) handleFundingReserveRequest(req *initFundingReserveMsg
 	// Funding reservation request succesfully handled. The funding inputs
 	// will be marked as unavailable until the reservation is either
 	// completed, or cancecled.
+	req.resp <- partialState
 	req.err <- nil
 }