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

lnwallet: AddHTLC now returns log index of created log entry

Browse Source
This commit is contained in:
Olaoluwa Osuntokun 2016-07-16 18:01:58 -07:00
parent 2a57f9182a
commit 2c303a1879
No known key found for this signature in database
GPG Key ID: 9CC5B105D03521A2
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lnwallet/channel.go
View File

@ -998,7 +998,7 @@ func (lc *LightningChannel) ExtendRevocationWindow() (*lnwire.CommitRevocation,
// AddPayment adds a new HTLC to either the local or remote HTLC log depending
// on the value of 'incoming'.
func (lc *LightningChannel) AddHTLC(htlc *lnwire.HTLCAddRequest, incoming bool) error {
func (lc *LightningChannel) AddHTLC(htlc *lnwire.HTLCAddRequest, incoming bool) uint32 {
pd := &PaymentDescriptor{
entryType: Add,
RHash: PaymentHash(htlc.RedemptionHashes[0]),
@ -1019,7 +1019,7 @@ func (lc *LightningChannel) AddHTLC(htlc *lnwire.HTLCAddRequest, incoming bool)
pd.Index = index
lc.stateUpdateLog.PushBack(pd)
return nil
return index
}
// SettleHTLC attempts to settle an existing outstanding HTLC with an htlc

8
lnwallet/channel_test.go
View File

@ -225,15 +225,11 @@ func TestSimpleAddSettleWorkflow(t *testing.T) {
// First Alice adds the outgoing HTLC to her local channel's state
// update log.
if err := aliceChannel.AddHTLC(htlc, false); err != nil {
t.Fatalf("unable to add htlc to alice's channel: %v", err)
}
aliceChannel.AddHTLC(htlc, false)
// Then Alice sends this wire message over to Bob who also adds this
// htlc to his local state update log.
if err := bobChannel.AddHTLC(htlc, true); err != nil {
t.Fatalf("unable to add htlc bob's channel: %v", err)
}
bobChannel.AddHTLC(htlc, true)
// Next alice commits this change by sending a signature message.
aliceSig, bobLogIndex, err := aliceChannel.SignNextCommitment()