projects
/
rust-lightning
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename SocketAddress from NetAddress
[rust-lightning]
/
lightning
/
src
/
ln
/
mod.rs
diff --git
a/lightning/src/ln/mod.rs
b/lightning/src/ln/mod.rs
index 340213c515070aa719de95cef2e062e5c82158bc..bacb9e86c791bf61dee44246751c4f85c0e0f366 100644
(file)
--- a/
lightning/src/ln/mod.rs
+++ b/
lightning/src/ln/mod.rs
@@
-13,6
+13,7
@@
#[macro_use]
pub mod functional_test_utils;
#[macro_use]
pub mod functional_test_utils;
+pub mod channel_id;
pub mod channelmanager;
pub mod inbound_payment;
pub mod msgs;
pub mod channelmanager;
pub mod inbound_payment;
pub mod msgs;
@@
-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 self::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;
@@
-72,17
+76,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)]
+#[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)]
+#[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::*;