From 24efbb46c3101b5c18e7cc43fb47d3802ca8230a Mon Sep 17 00:00:00 2001
From: Olaoluwa Osuntokun <laolu32@gmail.com>
Date: Wed, 16 Dec 2015 14:40:44 -0600
Subject: [PATCH] wallet/reservation: Cancel needs to return an error

---
 wallet/reservation.go | 8 ++++----
 wallet/wallet.go      | 5 +----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/wallet/reservation.go b/wallet/reservation.go
index 03a0edee..ad36a04b 100644
--- a/wallet/reservation.go
+++ b/wallet/reservation.go
@@ -117,14 +117,14 @@ func (r *ChannelReservation) FinalFundingTx() *btcutil.Tx {
 
 // RequestFundingReserveCancellation...
 // TODO(roasbeef): also return mutated state?
-func (r *ChannelReservation) Cancel() {
-	doneChan := make(chan struct{}, 1)
+func (r *ChannelReservation) Cancel() error {
+	errChan := make(chan error, 1)
 	r.wallet.msgChan <- &fundingReserveCancelMsg{
 		pendingFundingID: r.reservationID,
-		done:             doneChan,
+		err:              errChan,
 	}
 
-	<-doneChan
+	return <-errChan
 }
 
 // WaitForChannelOpen...
diff --git a/wallet/wallet.go b/wallet/wallet.go
index 24330105..2b69b2df 100644
--- a/wallet/wallet.go
+++ b/wallet/wallet.go
@@ -87,8 +87,7 @@ type fundingReserveCancelMsg struct {
 	pendingFundingID uint64
 
 	// Buffered, used for optionally synchronization.
-	err  chan error    // Buffered
-	done chan struct{} // Buffered
+	err chan error // Buffered
 }
 
 // addCounterPartySigsMsg...
@@ -430,7 +429,6 @@ func (l *LightningWallet) handleFundingCancelRequest(req *fundingReserveCancelMs
 	if !ok {
 		// TODO(roasbeef): make new error, "unkown funding state" or something
 		req.err <- fmt.Errorf("attempted to cancel non-existant funding state")
-		req.done <- struct{}{}
 		return
 	}
 
@@ -452,7 +450,6 @@ func (l *LightningWallet) handleFundingCancelRequest(req *fundingReserveCancelMs
 	delete(l.fundingLimbo, req.pendingFundingID)
 
 	req.err <- nil
-	req.done <- struct{}{}
 }
 
 // handleFundingCounterPartyFunds...