projects
/
rust-lightning
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Do not remove Outbound Channel immediately when peer disconnects
[rust-lightning]
/
lightning
/
src
/
ln
/
channel_id.rs
diff --git
a/lightning/src/ln/channel_id.rs
b/lightning/src/ln/channel_id.rs
index cdbcd302929c70b1a2a5c59dd51da2d22df39e2e..19003961ff1a52bced58e52622dd59add517bfed 100644
(file)
--- a/
lightning/src/ln/channel_id.rs
+++ b/
lightning/src/ln/channel_id.rs
@@
-9,14
+9,13
@@
//! ChannelId definition.
//! ChannelId definition.
+use crate::chain::transaction::OutPoint;
+use crate::io;
use crate::ln::msgs::DecodeError;
use crate::sign::EntropySource;
use crate::util::ser::{Readable, Writeable, Writer};
use crate::ln::msgs::DecodeError;
use crate::sign::EntropySource;
use crate::util::ser::{Readable, Writeable, Writer};
-use bitcoin::hashes::hex::ToHex;
-
-use crate::io;
-use crate::prelude::*;
+use bitcoin::hashes::Hash as _;
use core::fmt;
use core::ops::Deref;
use core::fmt;
use core::ops::Deref;
@@
-43,6
+42,11
@@
impl ChannelId {
Self(res)
}
Self(res)
}
+ /// Create _v1_ channel ID from a funding tx outpoint
+ pub fn v1_from_funding_outpoint(outpoint: OutPoint) -> Self {
+ Self::v1_from_funding_txid(outpoint.txid.as_byte_array(), outpoint.index)
+ }
+
/// Create a _temporary_ channel ID randomly, based on an entropy source.
pub fn temporary_from_entropy_source<ES: Deref>(entropy_source: &ES) -> Self
where ES::Target: EntropySource {
/// Create a _temporary_ channel ID randomly, based on an entropy source.
pub fn temporary_from_entropy_source<ES: Deref>(entropy_source: &ES) -> Self
where ES::Target: EntropySource {
@@
-79,12
+83,6
@@
impl Readable for ChannelId {
}
}
}
}
-impl ToHex for ChannelId {
- fn to_hex(&self) -> String {
- self.0.to_hex()
- }
-}
-
impl fmt::Display for ChannelId {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
crate::util::logger::DebugBytes(&self.0).fmt(f)
impl fmt::Display for ChannelId {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
crate::util::logger::DebugBytes(&self.0).fmt(f)
@@
-93,17
+91,18
@@
impl fmt::Display for ChannelId {
#[cfg(test)]
mod tests {
#[cfg(test)]
mod tests {
+ use hex::DisplayHex;
+
use crate::ln::ChannelId;
use crate::util::ser::{Readable, Writeable};
use crate::util::test_utils;
use crate::ln::ChannelId;
use crate::util::ser::{Readable, Writeable};
use crate::util::test_utils;
- use bitcoin::hashes::hex::ToHex;
use crate::prelude::*;
use crate::io;
#[test]
fn test_channel_id_v1_from_funding_txid() {
let channel_id = ChannelId::v1_from_funding_txid(&[2; 32], 1);
use crate::prelude::*;
use crate::io;
#[test]
fn test_channel_id_v1_from_funding_txid() {
let channel_id = ChannelId::v1_from_funding_txid(&[2; 32], 1);
- assert_eq!(channel_id.
to_hex
(), "0202020202020202020202020202020202020202020202020202020202020203");
+ assert_eq!(channel_id.
0.as_hex().to_string
(), "0202020202020202020202020202020202020202020202020202020202020203");
}
#[test]
}
#[test]