projects / rust-lightning / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 790d26f 9d33249)
Merge pull request #1811 from valentinewallace/2022-10-chanman-router
authorMatt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Thu, 3 Nov 2022 23:43:03 +0000 (23:43 +0000)
committerGitHub <noreply@github.com>
Thu, 3 Nov 2022 23:43:03 +0000 (23:43 +0000)
Move `InflightHtlcs` and `Router` trait into `ChannelManager`

1  2 
lightning-invoice/src/payment.rs patch | diff1 | diff2 | blob | history
lightning-invoice/src/utils.rs patch | diff1 | diff2 | blob | history
lightning/src/routing/router.rs patch | diff1 | diff2 | blob | history

diff --cc lightning-invoice/src/payment.rs
Simple merge
diff --cc lightning-invoice/src/utils.rs
Simple merge
diff --cc lightning/src/routing/router.rs
Simple merge
Personal fork of Rust-Lightning. Upstream is https://github.com/rust-bitcoin/rust-lightning