]> git.bitcoin.ninja Git - rust-lightning/commitdiff
Merge pull request #459 from ariard/2020-01-fix-htlc-height-timer
authorMatt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Sat, 25 Jan 2020 22:11:27 +0000 (22:11 +0000)
committerGitHub <noreply@github.com>
Sat, 25 Jan 2020 22:11:27 +0000 (22:11 +0000)
Fix bumping timer for claiming revoked HTLC outputs

1  2 
lightning/src/ln/channelmonitor.rs
lightning/src/ln/functional_tests.rs

Simple merge
Simple merge