projects
/
rust-lightning
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
afdcd1c
e99e6ab
)
Merge pull request #2485 from optout21/channel-id-4struct1
author
Matt Corallo
<649246+TheBlueMatt@users.noreply.github.com>
Sun, 27 Aug 2023 05:18:00 +0000
(
05:18
+0000)
committer
GitHub
<noreply@github.com>
Sun, 27 Aug 2023 05:18:00 +0000
(
05:18
+0000)
Introduce new ChannelId struct
1
2
lightning/src/ln/channelmanager.rs
patch
|
diff1
|
diff2
|
blob
|
history
lightning/src/ln/functional_test_utils.rs
patch
|
diff1
|
diff2
|
blob
|
history
lightning/src/ln/functional_tests.rs
patch
|
diff1
|
diff2
|
blob
|
history
lightning/src/ln/payment_tests.rs
patch
|
diff1
|
diff2
|
blob
|
history
lightning/src/routing/router.rs
patch
|
diff1
|
diff2
|
blob
|
history
lightning/src/util/test_utils.rs
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lightning/src/ln/channelmanager.rs
Simple merge
diff --cc
lightning/src/ln/functional_test_utils.rs
Simple merge
diff --cc
lightning/src/ln/functional_tests.rs
Simple merge
diff --cc
lightning/src/ln/payment_tests.rs
Simple merge
diff --cc
lightning/src/routing/router.rs
index db19738a5de71f05565287eb7c2f2465755e5012,f9d8b014bf52124b6099a2a5b5eed1fbfa88df1f..79d54e22d6755896ee1c4ead6be0804413178a47
---
1
/
lightning/src/routing/router.rs
---
2
/
lightning/src/routing/router.rs
+++ b/
lightning/src/routing/router.rs
@@@
-6845,8
-6881,8
+6846,9
@@@
pub(crate) mod bench_utils
use bitcoin::secp256k1::{PublicKey, Secp256k1, SecretKey};
use crate::chain::transaction::OutPoint;
+ use crate::routing::scoring::ScoreUpdate;
use crate::sign::{EntropySource, KeysManager};
+ use crate::ln::ChannelId;
use crate::ln::channelmanager::{self, ChannelCounterparty, ChannelDetails};
use crate::ln::features::Bolt11InvoiceFeatures;
use crate::routing::gossip::NetworkGraph;
diff --cc
lightning/src/util/test_utils.rs
Simple merge