reservation iD embedded in ChannelReservation no need to pass in

This commit is contained in:
Olaoluwa Osuntokun 2015-11-27 00:52:14 -06:00
parent 40a515b3db
commit 86b274a223

View File

@ -92,11 +92,11 @@ func (r *ChannelReservation) TheirFunds() ([]*wire.TxIn, []*wire.TxOut, *btcec.P
} }
// CompleteFundingReservation... // CompleteFundingReservation...
func (r *ChannelReservation) CompleteReservation(reservationID uint64, theirSigs [][]byte) error { func (r *ChannelReservation) CompleteReservation(theirSigs [][]byte) error {
errChan := make(chan error, 1) errChan := make(chan error, 1)
r.wallet.msgChan <- &addCounterPartySigsMsg{ r.wallet.msgChan <- &addCounterPartySigsMsg{
pendingFundingID: reservationID, pendingFundingID: r.reservationID,
theirSigs: theirSigs, theirSigs: theirSigs,
err: errChan, err: errChan,
} }
@ -113,10 +113,10 @@ func (r *ChannelReservation) FinalFundingTx() *btcutil.Tx {
// RequestFundingReserveCancellation... // RequestFundingReserveCancellation...
// TODO(roasbeef): also return mutated state? // TODO(roasbeef): also return mutated state?
func (r *ChannelReservation) Cancel(reservationID uint64) { func (r *ChannelReservation) Cancel() {
doneChan := make(chan struct{}, 1) doneChan := make(chan struct{}, 1)
r.wallet.msgChan <- &fundingReserveCancelMsg{ r.wallet.msgChan <- &fundingReserveCancelMsg{
pendingFundingID: reservationID, pendingFundingID: r.reservationID,
done: doneChan, done: doneChan,
} }