From 86b274a223787b302ac99cadf27139cb00e661d3 Mon Sep 17 00:00:00 2001 From: Olaoluwa Osuntokun Date: Fri, 27 Nov 2015 00:52:14 -0600 Subject: [PATCH] reservation iD embedded in ChannelReservation no need to pass in --- wallet/reservation.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wallet/reservation.go b/wallet/reservation.go index 88d6b6c2..59ce6bee 100644 --- a/wallet/reservation.go +++ b/wallet/reservation.go @@ -92,11 +92,11 @@ func (r *ChannelReservation) TheirFunds() ([]*wire.TxIn, []*wire.TxOut, *btcec.P } // CompleteFundingReservation... -func (r *ChannelReservation) CompleteReservation(reservationID uint64, theirSigs [][]byte) error { +func (r *ChannelReservation) CompleteReservation(theirSigs [][]byte) error { errChan := make(chan error, 1) r.wallet.msgChan <- &addCounterPartySigsMsg{ - pendingFundingID: reservationID, + pendingFundingID: r.reservationID, theirSigs: theirSigs, err: errChan, } @@ -113,10 +113,10 @@ func (r *ChannelReservation) FinalFundingTx() *btcutil.Tx { // RequestFundingReserveCancellation... // TODO(roasbeef): also return mutated state? -func (r *ChannelReservation) Cancel(reservationID uint64) { +func (r *ChannelReservation) Cancel() { doneChan := make(chan struct{}, 1) r.wallet.msgChan <- &fundingReserveCancelMsg{ - pendingFundingID: reservationID, + pendingFundingID: r.reservationID, done: doneChan, }