projects
/
rust-lightning
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Limit external claim feerate bumps
[rust-lightning]
/
lightning
/
src
/
ln
/
mod.rs
diff --git
a/lightning/src/ln/mod.rs
b/lightning/src/ln/mod.rs
index 3a0efd38690946cd5a7f48da324449d52f13fe2c..beefd2d463b3ed2b938c6f82fdabef63757adccd 100644
(file)
--- a/
lightning/src/ln/mod.rs
+++ b/
lightning/src/ln/mod.rs
@@
-20,6
+20,7
@@
pub mod peer_handler;
pub mod chan_utils;
pub mod features;
pub mod script;
pub mod chan_utils;
pub mod features;
pub mod script;
+mod channel_id;
#[cfg(fuzzing)]
pub mod peer_channel_encryptor;
#[cfg(fuzzing)]
pub mod peer_channel_encryptor;
@@
-31,6
+32,9
@@
pub mod channel;
#[cfg(not(fuzzing))]
pub(crate) mod channel;
#[cfg(not(fuzzing))]
pub(crate) mod channel;
+// Re-export ChannelId
+pub use channel_id::ChannelId;
+
pub(crate) mod onion_utils;
mod outbound_payment;
pub mod wire;
pub(crate) mod onion_utils;
mod outbound_payment;
pub mod wire;
@@
-39,6
+43,9
@@
pub mod wire;
// without the node parameter being mut. This is incorrect, and thus newer rustcs will complain
// about an unnecessary mut. Thus, we silence the unused_mut warning in two test modules below.
// without the node parameter being mut. This is incorrect, and thus newer rustcs will complain
// about an unnecessary mut. Thus, we silence the unused_mut warning in two test modules below.
+#[cfg(test)]
+#[allow(unused_mut)]
+mod blinded_payment_tests;
#[cfg(test)]
#[allow(unused_mut)]
mod functional_tests;
#[cfg(test)]
#[allow(unused_mut)]
mod functional_tests;
@@
-72,19
+79,31
@@
pub use self::peer_channel_encryptor::LN_MAX_MSG_LEN;
/// payment_hash type, use to cross-lock hop
///
/// This is not exported to bindings users as we just use [u8; 32] directly
/// payment_hash type, use to cross-lock hop
///
/// This is not exported to bindings users as we just use [u8; 32] directly
-#[derive(Hash, Copy, Clone, PartialEq, Eq, Debug)]
-#[cfg_attr(test, derive(PartialOrd, Ord))]
+#[derive(Hash, Copy, Clone, PartialEq, Eq, Debug, Ord, PartialOrd)]
pub struct PaymentHash(pub [u8; 32]);
pub struct PaymentHash(pub [u8; 32]);
+
+impl core::fmt::Display for PaymentHash {
+ fn fmt(&self, f: &mut core::fmt::Formatter) -> core::fmt::Result {
+ crate::util::logger::DebugBytes(&self.0).fmt(f)
+ }
+}
+
/// payment_preimage type, use to route payment between hop
///
/// This is not exported to bindings users as we just use [u8; 32] directly
/// payment_preimage type, use to route payment between hop
///
/// This is not exported to bindings users as we just use [u8; 32] directly
-#[derive(Hash, Copy, Clone, PartialEq, Eq, Debug)]
-#[cfg_attr(test, derive(PartialOrd, Ord))]
+#[derive(Hash, Copy, Clone, PartialEq, Eq, Debug, Ord, PartialOrd)]
pub struct PaymentPreimage(pub [u8; 32]);
pub struct PaymentPreimage(pub [u8; 32]);
+
+impl core::fmt::Display for PaymentPreimage {
+ fn fmt(&self, f: &mut core::fmt::Formatter) -> core::fmt::Result {
+ crate::util::logger::DebugBytes(&self.0).fmt(f)
+ }
+}
+
/// payment_secret type, use to authenticate sender to the receiver and tie MPP HTLCs together
///
/// This is not exported to bindings users as we just use [u8; 32] directly
/// payment_secret type, use to authenticate sender to the receiver and tie MPP HTLCs together
///
/// This is not exported to bindings users as we just use [u8; 32] directly
-#[derive(Hash, Copy, Clone, PartialEq, Eq, Debug)]
+#[derive(Hash, Copy, Clone, PartialEq, Eq, Debug
, Ord, PartialOrd
)]
pub struct PaymentSecret(pub [u8; 32]);
use crate::prelude::*;
pub struct PaymentSecret(pub [u8; 32]);
use crate::prelude::*;