Skip to content

Add ChannelPending event#60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tnull merged 1 commit into from
Apr 20, 2023
Merged

Add ChannelPending event #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 44 additions & 9 deletions src/event.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,8 @@ use lightning::routing::gossip::NodeId;
use lightning::util::errors::APIError;
use lightning::util::ser::{Readable, ReadableArgs, Writeable, Writer};

use bitcoin::secp256k1::Secp256k1;
use bitcoin::secp256k1::{PublicKey, Secp256k1};
use bitcoin::OutPoint;
use rand::{thread_rng, Rng};
use std::collections::VecDeque;
use std::ops::Deref;
Expand DownExpand Up@@ -48,6 +49,19 @@ pub enum Event {
/// The value, in thousandths of a satoshi, that has been received.
amount_msat: u64,
},
/// A channel has been created and is pending confirmation on-chain.
ChannelPending {
/// The `channel_id` of the channel.
channel_id: [u8; 32],
/// The `user_channel_id` of the channel.
user_channel_id: u128,
/// The `temporary_channel_id` this channel used to be known by during channel establishment.
former_temporary_channel_id: [u8; 32],

@jkczyzjkczyzApr 19, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: Would opt to drop former as this seems to be implied by "temporary", FWIW.

@tnulltnullApr 20, 2023•
edited
Loading

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tend to disagree. The 'former' is there to clearly communicate that it's invalid by now.

/// The `node_id` of the channel counterparty.
counterparty_node_id: PublicKey,
/// The outpoint of the channel's funding transaction.
funding_txo: OutPoint,
},
/// A channel is ready to be used.
ChannelReady {
/// The `channel_id` of the channel.
Expand DownExpand Up@@ -79,7 +93,14 @@ impl_writeable_tlv_based_enum!(Event,
(0, channel_id, required),
(1, user_channel_id, required),
},
(4, ChannelClosed) => {
(4, ChannelPending) => {
Comment thread
tnull marked this conversation as resolved.
(0, channel_id, required),
(1, user_channel_id, required),
(2, former_temporary_channel_id, required),
(3, counterparty_node_id, required),
(4, funding_txo, required),
},
(5, ChannelClosed) => {
(0, channel_id, required),
(1, user_channel_id, required),
};
Expand DownExpand Up@@ -607,20 +628,34 @@ where
}
}
LdkEvent::ChannelPending {
channel_id: _,
user_channel_id: _,
former_temporary_channel_id: _,
counterparty_node_id: _,
funding_txo: _,
channel_id,
user_channel_id,
former_temporary_channel_id,
counterparty_node_id,
funding_txo,
} => {
// TODO!
log_info!(
self.logger,
"New channel {} with counterparty {} has been created and is pending confirmation on chain.",
hex_utils::to_string(&channel_id),
counterparty_node_id,
);
self.event_queue
.add_event(Event::ChannelPending {
channel_id,
user_channel_id,
former_temporary_channel_id: former_temporary_channel_id.unwrap(),
counterparty_node_id,
funding_txo,
})
.expect("Failed to push to event queue");
}
LdkEvent::ChannelReady {
channel_id, user_channel_id, counterparty_node_id, ..
} => {
log_info!(
self.logger,
"Channel {} with {} ready to be used.",
"Channel {} with counterparty {} ready to be used.",
hex_utils::to_string(&channel_id),
counterparty_node_id,
);
Expand Down
18 changes: 10 additions & 8 deletions src/test/functional_tests.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@ use crate::{Builder, Error, Event, PaymentDirection, PaymentStatus};

use bitcoin::Amount;

use std::time::Duration;
#[test]
fn channel_full_cycle() {
let (bitcoind, electrsd) = setup_bitcoind_and_electrsd();
Expand DownExpand Up@@ -36,13 +35,16 @@ fn channel_full_cycle() {
let node_b_addr = format!("{}@{}", node_b.node_id(), node_b.listening_address().unwrap());
node_a.connect_open_channel(&node_b_addr, 50000, true).unwrap();

let funding_txo = loop {
let details = node_a.list_channels();
expect_event!(node_a, ChannelPending);

if details.is_empty() || details[0].funding_txo.is_none() {
std::thread::sleep(Duration::from_secs(1));
} else {
break details[0].funding_txo.unwrap();
let funding_txo = match node_b.next_event() {
ref e @ Event::ChannelPending { funding_txo, .. } => {
println!("{} got event {:?}", std::stringify!(node_b), e);
node_b.event_handled();
funding_txo
}
ref e => {
panic!("{} got unexpected event!: {:?}", std::stringify!(node_b), e);
}
};

Expand DownExpand Up@@ -168,7 +170,7 @@ fn channel_full_cycle() {
expect_event!(node_a, ChannelClosed);
expect_event!(node_b, ChannelClosed);

wait_for_outpoint_spend(&electrsd, funding_txo.into_bitcoin_outpoint());
wait_for_outpoint_spend(&electrsd, funding_txo);

generate_blocks_and_wait(&bitcoind, &electrsd, 1);
node_a.sync_wallets().unwrap();
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Add `ChannelPending` event by tnull · Pull Request #60 · lightningdevkit/ldk-node · GitHub
Skip to content
Add ChannelPending event#60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tnull
merged 1 commit into

from

Apr 20, 2023
 Merged


Add ChannelPending event
#60
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


53 changes: 44 additions & 9 deletions
src/event.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,8 @@ use lightning::routing::gossip::NodeId;
use lightning::util::errors::APIError;
use lightning::util::ser::{Readable, ReadableArgs, Writeable, Writer};

use bitcoin::secp256k1::Secp256k1;
use bitcoin::secp256k1::{PublicKey, Secp256k1};
use bitcoin::OutPoint;
use rand::{thread_rng, Rng};
use std::collections::VecDeque;
use std::ops::Deref;
Expand DownExpand Up@@ -48,6 +49,19 @@ pub enum Event {
 /// The value, in thousandths of a satoshi, that has been received.
 amount_msat: u64,
	},
	/// A channel has been created and is pending confirmation on-chain.
	ChannelPending {
 /// The `channel_id` of the channel.
 channel_id: [u8; 32],
 /// The `user_channel_id` of the channel.
 user_channel_id: u128,
 /// The `temporary_channel_id` this channel used to be known by during channel establishment.
 former_temporary_channel_id: [u8; 32],
@jkczyzjkczyzApr 19, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: Would opt to drop former as this seems to be implied by "temporary", FWIW.
@tnulltnullApr 20, 2023•

edited

Loading

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tend to disagree. The 'former' is there to clearly communicate that it's invalid by now.
 /// The `node_id` of the channel counterparty.
 counterparty_node_id: PublicKey,
 /// The outpoint of the channel's funding transaction.
 funding_txo: OutPoint,
	},
	/// A channel is ready to be used.
	ChannelReady {
 /// The `channel_id` of the channel.
Expand DownExpand Up@@ -79,7 +93,14 @@ impl_writeable_tlv_based_enum!(Event,
 (0, channel_id, required),
 (1, user_channel_id, required),
	},
	(4, ChannelClosed) => {
	(4, ChannelPending) => {
Comment thread
tnull marked this conversation as resolved.

 (0, channel_id, required),
 (1, user_channel_id, required),
 (2, former_temporary_channel_id, required),
 (3, counterparty_node_id, required),
 (4, funding_txo, required),
	},
	(5, ChannelClosed) => {
 (0, channel_id, required),
 (1, user_channel_id, required),
	};
Expand DownExpand Up@@ -607,20 +628,34 @@ where
 }
 }
 LdkEvent::ChannelPending {
 channel_id: _,
 user_channel_id: _,
 former_temporary_channel_id: _,
 counterparty_node_id: _,
 funding_txo: _,
 channel_id,
 user_channel_id,
 former_temporary_channel_id,
 counterparty_node_id,
 funding_txo,
 } => {
 // TODO!
 log_info!(
 self.logger,
 "New channel {} with counterparty {} has been created and is pending confirmation on chain.",
 hex_utils::to_string(&channel_id),
 counterparty_node_id,
 );
 self.event_queue
 .add_event(Event::ChannelPending {
 channel_id,
 user_channel_id,
 former_temporary_channel_id: former_temporary_channel_id.unwrap(),
 counterparty_node_id,
 funding_txo,
 })
 .expect("Failed to push to event queue");
 }
 LdkEvent::ChannelReady {
 channel_id, user_channel_id, counterparty_node_id, ..
 } => {
 log_info!(
 self.logger,
 "Channel {} with {} ready to be used.",
 "Channel {} with counterparty {} ready to be used.",
 hex_utils::to_string(&channel_id),
 counterparty_node_id,
 );
Expand Down

18 changes: 10 additions & 8 deletions
src/test/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@ use crate::{Builder, Error, Event, PaymentDirection, PaymentStatus};

use bitcoin::Amount;

use std::time::Duration;
#[test]
fn channel_full_cycle() {
	let (bitcoind, electrsd) = setup_bitcoind_and_electrsd();
Expand DownExpand Up@@ -36,13 +35,16 @@ fn channel_full_cycle() {
	let node_b_addr = format!("{}@{}", node_b.node_id(), node_b.listening_address().unwrap());
	node_a.connect_open_channel(&node_b_addr, 50000, true).unwrap();

	let funding_txo = loop {
 let details = node_a.list_channels();
	expect_event!(node_a, ChannelPending);

 if details.is_empty() || details[0].funding_txo.is_none() {
 std::thread::sleep(Duration::from_secs(1));
 } else {
 break details[0].funding_txo.unwrap();
	let funding_txo = match node_b.next_event() {
 ref e @ Event::ChannelPending { funding_txo, .. } => {
 println!("{} got event {:?}", std::stringify!(node_b), e);
 node_b.event_handled();
 funding_txo
 }
 ref e => {
 panic!("{} got unexpected event!: {:?}", std::stringify!(node_b), e);
 }
	};

Expand DownExpand Up@@ -168,7 +170,7 @@ fn channel_full_cycle() {
	expect_event!(node_a, ChannelClosed);
	expect_event!(node_b, ChannelClosed);

	wait_for_outpoint_spend(&electrsd, funding_txo.into_bitcoin_outpoint());
	wait_for_outpoint_spend(&electrsd, funding_txo);

	generate_blocks_and_wait(&bitcoind, &electrsd, 1);
	node_a.sync_wallets().unwrap();
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Add `ChannelPending` event by tnull · Pull Request #60 · lightningdevkit/ldk-node · GitHub
Skip to content
Add ChannelPending event#60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tnull
merged 1 commit into

from

Apr 20, 2023
 Merged


Add ChannelPending event
#60
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


53 changes: 44 additions & 9 deletions
src/event.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,8 @@ use lightning::routing::gossip::NodeId;
use lightning::util::errors::APIError;
use lightning::util::ser::{Readable, ReadableArgs, Writeable, Writer};

use bitcoin::secp256k1::Secp256k1;
use bitcoin::secp256k1::{PublicKey, Secp256k1};
use bitcoin::OutPoint;
use rand::{thread_rng, Rng};
use std::collections::VecDeque;
use std::ops::Deref;
Expand DownExpand Up@@ -48,6 +49,19 @@ pub enum Event {
 /// The value, in thousandths of a satoshi, that has been received.
 amount_msat: u64,
	},
	/// A channel has been created and is pending confirmation on-chain.
	ChannelPending {
 /// The `channel_id` of the channel.
 channel_id: [u8; 32],
 /// The `user_channel_id` of the channel.
 user_channel_id: u128,
 /// The `temporary_channel_id` this channel used to be known by during channel establishment.
 former_temporary_channel_id: [u8; 32],
@jkczyzjkczyzApr 19, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: Would opt to drop former as this seems to be implied by "temporary", FWIW.
@tnulltnullApr 20, 2023•

edited

Loading

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tend to disagree. The 'former' is there to clearly communicate that it's invalid by now.
 /// The `node_id` of the channel counterparty.
 counterparty_node_id: PublicKey,
 /// The outpoint of the channel's funding transaction.
 funding_txo: OutPoint,
	},
	/// A channel is ready to be used.
	ChannelReady {
 /// The `channel_id` of the channel.
Expand DownExpand Up@@ -79,7 +93,14 @@ impl_writeable_tlv_based_enum!(Event,
 (0, channel_id, required),
 (1, user_channel_id, required),
	},
	(4, ChannelClosed) => {
	(4, ChannelPending) => {
Comment thread
tnull marked this conversation as resolved.

 (0, channel_id, required),
 (1, user_channel_id, required),
 (2, former_temporary_channel_id, required),
 (3, counterparty_node_id, required),
 (4, funding_txo, required),
	},
	(5, ChannelClosed) => {
 (0, channel_id, required),
 (1, user_channel_id, required),
	};
Expand DownExpand Up@@ -607,20 +628,34 @@ where
 }
 }
 LdkEvent::ChannelPending {
 channel_id: _,
 user_channel_id: _,
 former_temporary_channel_id: _,
 counterparty_node_id: _,
 funding_txo: _,
 channel_id,
 user_channel_id,
 former_temporary_channel_id,
 counterparty_node_id,
 funding_txo,
 } => {
 // TODO!
 log_info!(
 self.logger,
 "New channel {} with counterparty {} has been created and is pending confirmation on chain.",
 hex_utils::to_string(&channel_id),
 counterparty_node_id,
 );
 self.event_queue
 .add_event(Event::ChannelPending {
 channel_id,
 user_channel_id,
 former_temporary_channel_id: former_temporary_channel_id.unwrap(),
 counterparty_node_id,
 funding_txo,
 })
 .expect("Failed to push to event queue");
 }
 LdkEvent::ChannelReady {
 channel_id, user_channel_id, counterparty_node_id, ..
 } => {
 log_info!(
 self.logger,
 "Channel {} with {} ready to be used.",
 "Channel {} with counterparty {} ready to be used.",
 hex_utils::to_string(&channel_id),
 counterparty_node_id,
 );
Expand Down

18 changes: 10 additions & 8 deletions
src/test/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@ use crate::{Builder, Error, Event, PaymentDirection, PaymentStatus};

use bitcoin::Amount;

use std::time::Duration;
#[test]
fn channel_full_cycle() {
	let (bitcoind, electrsd) = setup_bitcoind_and_electrsd();
Expand DownExpand Up@@ -36,13 +35,16 @@ fn channel_full_cycle() {
	let node_b_addr = format!("{}@{}", node_b.node_id(), node_b.listening_address().unwrap());
	node_a.connect_open_channel(&node_b_addr, 50000, true).unwrap();

	let funding_txo = loop {
 let details = node_a.list_channels();
	expect_event!(node_a, ChannelPending);

 if details.is_empty() || details[0].funding_txo.is_none() {
 std::thread::sleep(Duration::from_secs(1));
 } else {
 break details[0].funding_txo.unwrap();
	let funding_txo = match node_b.next_event() {
 ref e @ Event::ChannelPending { funding_txo, .. } => {
 println!("{} got event {:?}", std::stringify!(node_b), e);
 node_b.event_handled();
 funding_txo
 }
 ref e => {
 panic!("{} got unexpected event!: {:?}", std::stringify!(node_b), e);
 }
	};

Expand DownExpand Up@@ -168,7 +170,7 @@ fn channel_full_cycle() {
	expect_event!(node_a, ChannelClosed);
	expect_event!(node_b, ChannelClosed);

	wait_for_outpoint_spend(&electrsd, funding_txo.into_bitcoin_outpoint());
	wait_for_outpoint_spend(&electrsd, funding_txo);

	generate_blocks_and_wait(&bitcoind, &electrsd, 1);
	node_a.sync_wallets().unwrap();
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Add `ChannelPending` event by tnull · Pull Request #60 · lightningdevkit/ldk-node · GitHub
Skip to content
Add ChannelPending event#60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tnull
merged 1 commit into

from

Apr 20, 2023
 Merged


Add ChannelPending event
#60
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


53 changes: 44 additions & 9 deletions
src/event.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,8 @@ use lightning::routing::gossip::NodeId;
use lightning::util::errors::APIError;
use lightning::util::ser::{Readable, ReadableArgs, Writeable, Writer};

use bitcoin::secp256k1::Secp256k1;
use bitcoin::secp256k1::{PublicKey, Secp256k1};
use bitcoin::OutPoint;
use rand::{thread_rng, Rng};
use std::collections::VecDeque;
use std::ops::Deref;
Expand DownExpand Up@@ -48,6 +49,19 @@ pub enum Event {
 /// The value, in thousandths of a satoshi, that has been received.
 amount_msat: u64,
	},
	/// A channel has been created and is pending confirmation on-chain.
	ChannelPending {
 /// The `channel_id` of the channel.
 channel_id: [u8; 32],
 /// The `user_channel_id` of the channel.
 user_channel_id: u128,
 /// The `temporary_channel_id` this channel used to be known by during channel establishment.
 former_temporary_channel_id: [u8; 32],
@jkczyzjkczyzApr 19, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: Would opt to drop former as this seems to be implied by "temporary", FWIW.
@tnulltnullApr 20, 2023•

edited

Loading

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tend to disagree. The 'former' is there to clearly communicate that it's invalid by now.
 /// The `node_id` of the channel counterparty.
 counterparty_node_id: PublicKey,
 /// The outpoint of the channel's funding transaction.
 funding_txo: OutPoint,
	},
	/// A channel is ready to be used.
	ChannelReady {
 /// The `channel_id` of the channel.
Expand DownExpand Up@@ -79,7 +93,14 @@ impl_writeable_tlv_based_enum!(Event,
 (0, channel_id, required),
 (1, user_channel_id, required),
	},
	(4, ChannelClosed) => {
	(4, ChannelPending) => {
Comment thread
tnull marked this conversation as resolved.

 (0, channel_id, required),
 (1, user_channel_id, required),
 (2, former_temporary_channel_id, required),
 (3, counterparty_node_id, required),
 (4, funding_txo, required),
	},
	(5, ChannelClosed) => {
 (0, channel_id, required),
 (1, user_channel_id, required),
	};
Expand DownExpand Up@@ -607,20 +628,34 @@ where
 }
 }
 LdkEvent::ChannelPending {
 channel_id: _,
 user_channel_id: _,
 former_temporary_channel_id: _,
 counterparty_node_id: _,
 funding_txo: _,
 channel_id,
 user_channel_id,
 former_temporary_channel_id,
 counterparty_node_id,
 funding_txo,
 } => {
 // TODO!
 log_info!(
 self.logger,
 "New channel {} with counterparty {} has been created and is pending confirmation on chain.",
 hex_utils::to_string(&channel_id),
 counterparty_node_id,
 );
 self.event_queue
 .add_event(Event::ChannelPending {
 channel_id,
 user_channel_id,
 former_temporary_channel_id: former_temporary_channel_id.unwrap(),
 counterparty_node_id,
 funding_txo,
 })
 .expect("Failed to push to event queue");
 }
 LdkEvent::ChannelReady {
 channel_id, user_channel_id, counterparty_node_id, ..
 } => {
 log_info!(
 self.logger,
 "Channel {} with {} ready to be used.",
 "Channel {} with counterparty {} ready to be used.",
 hex_utils::to_string(&channel_id),
 counterparty_node_id,
 );
Expand Down

18 changes: 10 additions & 8 deletions
src/test/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@ use crate::{Builder, Error, Event, PaymentDirection, PaymentStatus};

use bitcoin::Amount;

use std::time::Duration;
#[test]
fn channel_full_cycle() {
	let (bitcoind, electrsd) = setup_bitcoind_and_electrsd();
Expand DownExpand Up@@ -36,13 +35,16 @@ fn channel_full_cycle() {
	let node_b_addr = format!("{}@{}", node_b.node_id(), node_b.listening_address().unwrap());
	node_a.connect_open_channel(&node_b_addr, 50000, true).unwrap();

	let funding_txo = loop {
 let details = node_a.list_channels();
	expect_event!(node_a, ChannelPending);

 if details.is_empty() || details[0].funding_txo.is_none() {
 std::thread::sleep(Duration::from_secs(1));
 } else {
 break details[0].funding_txo.unwrap();
	let funding_txo = match node_b.next_event() {
 ref e @ Event::ChannelPending { funding_txo, .. } => {
 println!("{} got event {:?}", std::stringify!(node_b), e);
 node_b.event_handled();
 funding_txo
 }
 ref e => {
 panic!("{} got unexpected event!: {:?}", std::stringify!(node_b), e);
 }
	};

Expand DownExpand Up@@ -168,7 +170,7 @@ fn channel_full_cycle() {
	expect_event!(node_a, ChannelClosed);
	expect_event!(node_b, ChannelClosed);

	wait_for_outpoint_spend(&electrsd, funding_txo.into_bitcoin_outpoint());
	wait_for_outpoint_spend(&electrsd, funding_txo);

	generate_blocks_and_wait(&bitcoind, &electrsd, 1);
	node_a.sync_wallets().unwrap();
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Add `ChannelPending` event by tnull · Pull Request #60 · lightningdevkit/ldk-node · GitHub
Skip to content
Add ChannelPending event#60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tnull
merged 1 commit into

from

Apr 20, 2023
 Merged


Add ChannelPending event
#60
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


53 changes: 44 additions & 9 deletions
src/event.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,8 @@ use lightning::routing::gossip::NodeId;
use lightning::util::errors::APIError;
use lightning::util::ser::{Readable, ReadableArgs, Writeable, Writer};

use bitcoin::secp256k1::Secp256k1;
use bitcoin::secp256k1::{PublicKey, Secp256k1};
use bitcoin::OutPoint;
use rand::{thread_rng, Rng};
use std::collections::VecDeque;
use std::ops::Deref;
Expand DownExpand Up@@ -48,6 +49,19 @@ pub enum Event {
 /// The value, in thousandths of a satoshi, that has been received.
 amount_msat: u64,
	},
	/// A channel has been created and is pending confirmation on-chain.
	ChannelPending {
 /// The `channel_id` of the channel.
 channel_id: [u8; 32],
 /// The `user_channel_id` of the channel.
 user_channel_id: u128,
 /// The `temporary_channel_id` this channel used to be known by during channel establishment.
 former_temporary_channel_id: [u8; 32],
@jkczyzjkczyzApr 19, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: Would opt to drop former as this seems to be implied by "temporary", FWIW.
@tnulltnullApr 20, 2023•

edited

Loading

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tend to disagree. The 'former' is there to clearly communicate that it's invalid by now.
 /// The `node_id` of the channel counterparty.
 counterparty_node_id: PublicKey,
 /// The outpoint of the channel's funding transaction.
 funding_txo: OutPoint,
	},
	/// A channel is ready to be used.
	ChannelReady {
 /// The `channel_id` of the channel.
Expand DownExpand Up@@ -79,7 +93,14 @@ impl_writeable_tlv_based_enum!(Event,
 (0, channel_id, required),
 (1, user_channel_id, required),
	},
	(4, ChannelClosed) => {
	(4, ChannelPending) => {
Comment thread
tnull marked this conversation as resolved.

 (0, channel_id, required),
 (1, user_channel_id, required),
 (2, former_temporary_channel_id, required),
 (3, counterparty_node_id, required),
 (4, funding_txo, required),
	},
	(5, ChannelClosed) => {
 (0, channel_id, required),
 (1, user_channel_id, required),
	};
Expand DownExpand Up@@ -607,20 +628,34 @@ where
 }
 }
 LdkEvent::ChannelPending {
 channel_id: _,
 user_channel_id: _,
 former_temporary_channel_id: _,
 counterparty_node_id: _,
 funding_txo: _,
 channel_id,
 user_channel_id,
 former_temporary_channel_id,
 counterparty_node_id,
 funding_txo,
 } => {
 // TODO!
 log_info!(
 self.logger,
 "New channel {} with counterparty {} has been created and is pending confirmation on chain.",
 hex_utils::to_string(&channel_id),
 counterparty_node_id,
 );
 self.event_queue
 .add_event(Event::ChannelPending {
 channel_id,
 user_channel_id,
 former_temporary_channel_id: former_temporary_channel_id.unwrap(),
 counterparty_node_id,
 funding_txo,
 })
 .expect("Failed to push to event queue");
 }
 LdkEvent::ChannelReady {
 channel_id, user_channel_id, counterparty_node_id, ..
 } => {
 log_info!(
 self.logger,
 "Channel {} with {} ready to be used.",
 "Channel {} with counterparty {} ready to be used.",
 hex_utils::to_string(&channel_id),
 counterparty_node_id,
 );
Expand Down

18 changes: 10 additions & 8 deletions
src/test/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@ use crate::{Builder, Error, Event, PaymentDirection, PaymentStatus};

use bitcoin::Amount;

use std::time::Duration;
#[test]
fn channel_full_cycle() {
	let (bitcoind, electrsd) = setup_bitcoind_and_electrsd();
Expand DownExpand Up@@ -36,13 +35,16 @@ fn channel_full_cycle() {
	let node_b_addr = format!("{}@{}", node_b.node_id(), node_b.listening_address().unwrap());
	node_a.connect_open_channel(&node_b_addr, 50000, true).unwrap();

	let funding_txo = loop {
 let details = node_a.list_channels();
	expect_event!(node_a, ChannelPending);

 if details.is_empty() || details[0].funding_txo.is_none() {
 std::thread::sleep(Duration::from_secs(1));
 } else {
 break details[0].funding_txo.unwrap();
	let funding_txo = match node_b.next_event() {
 ref e @ Event::ChannelPending { funding_txo, .. } => {
 println!("{} got event {:?}", std::stringify!(node_b), e);
 node_b.event_handled();
 funding_txo
 }
 ref e => {
 panic!("{} got unexpected event!: {:?}", std::stringify!(node_b), e);
 }
	};

Expand DownExpand Up@@ -168,7 +170,7 @@ fn channel_full_cycle() {
	expect_event!(node_a, ChannelClosed);
	expect_event!(node_b, ChannelClosed);

	wait_for_outpoint_spend(&electrsd, funding_txo.into_bitcoin_outpoint());
	wait_for_outpoint_spend(&electrsd, funding_txo);

	generate_blocks_and_wait(&bitcoind, &electrsd, 1);
	node_a.sync_wallets().unwrap();
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Add `ChannelPending` event by tnull · Pull Request #60 · lightningdevkit/ldk-node · GitHub
Skip to content
Add ChannelPending event#60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tnull
merged 1 commit into

from

Apr 20, 2023
 Merged


Add ChannelPending event
#60
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


53 changes: 44 additions & 9 deletions
src/event.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,8 @@ use lightning::routing::gossip::NodeId;
use lightning::util::errors::APIError;
use lightning::util::ser::{Readable, ReadableArgs, Writeable, Writer};

use bitcoin::secp256k1::Secp256k1;
use bitcoin::secp256k1::{PublicKey, Secp256k1};
use bitcoin::OutPoint;
use rand::{thread_rng, Rng};
use std::collections::VecDeque;
use std::ops::Deref;
Expand DownExpand Up@@ -48,6 +49,19 @@ pub enum Event {
 /// The value, in thousandths of a satoshi, that has been received.
 amount_msat: u64,
	},
	/// A channel has been created and is pending confirmation on-chain.
	ChannelPending {
 /// The `channel_id` of the channel.
 channel_id: [u8; 32],
 /// The `user_channel_id` of the channel.
 user_channel_id: u128,
 /// The `temporary_channel_id` this channel used to be known by during channel establishment.
 former_temporary_channel_id: [u8; 32],
@jkczyzjkczyzApr 19, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: Would opt to drop former as this seems to be implied by "temporary", FWIW.
@tnulltnullApr 20, 2023•

edited

Loading

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tend to disagree. The 'former' is there to clearly communicate that it's invalid by now.
 /// The `node_id` of the channel counterparty.
 counterparty_node_id: PublicKey,
 /// The outpoint of the channel's funding transaction.
 funding_txo: OutPoint,
	},
	/// A channel is ready to be used.
	ChannelReady {
 /// The `channel_id` of the channel.
Expand DownExpand Up@@ -79,7 +93,14 @@ impl_writeable_tlv_based_enum!(Event,
 (0, channel_id, required),
 (1, user_channel_id, required),
	},
	(4, ChannelClosed) => {
	(4, ChannelPending) => {
Comment thread
tnull marked this conversation as resolved.

 (0, channel_id, required),
 (1, user_channel_id, required),
 (2, former_temporary_channel_id, required),
 (3, counterparty_node_id, required),
 (4, funding_txo, required),
	},
	(5, ChannelClosed) => {
 (0, channel_id, required),
 (1, user_channel_id, required),
	};
Expand DownExpand Up@@ -607,20 +628,34 @@ where
 }
 }
 LdkEvent::ChannelPending {
 channel_id: _,
 user_channel_id: _,
 former_temporary_channel_id: _,
 counterparty_node_id: _,
 funding_txo: _,
 channel_id,
 user_channel_id,
 former_temporary_channel_id,
 counterparty_node_id,
 funding_txo,
 } => {
 // TODO!
 log_info!(
 self.logger,
 "New channel {} with counterparty {} has been created and is pending confirmation on chain.",
 hex_utils::to_string(&channel_id),
 counterparty_node_id,
 );
 self.event_queue
 .add_event(Event::ChannelPending {
 channel_id,
 user_channel_id,
 former_temporary_channel_id: former_temporary_channel_id.unwrap(),
 counterparty_node_id,
 funding_txo,
 })
 .expect("Failed to push to event queue");
 }
 LdkEvent::ChannelReady {
 channel_id, user_channel_id, counterparty_node_id, ..
 } => {
 log_info!(
 self.logger,
 "Channel {} with {} ready to be used.",
 "Channel {} with counterparty {} ready to be used.",
 hex_utils::to_string(&channel_id),
 counterparty_node_id,
 );
Expand Down

18 changes: 10 additions & 8 deletions
src/test/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@ use crate::{Builder, Error, Event, PaymentDirection, PaymentStatus};

use bitcoin::Amount;

use std::time::Duration;
#[test]
fn channel_full_cycle() {
	let (bitcoind, electrsd) = setup_bitcoind_and_electrsd();
Expand DownExpand Up@@ -36,13 +35,16 @@ fn channel_full_cycle() {
	let node_b_addr = format!("{}@{}", node_b.node_id(), node_b.listening_address().unwrap());
	node_a.connect_open_channel(&node_b_addr, 50000, true).unwrap();

	let funding_txo = loop {
 let details = node_a.list_channels();
	expect_event!(node_a, ChannelPending);

 if details.is_empty() || details[0].funding_txo.is_none() {
 std::thread::sleep(Duration::from_secs(1));
 } else {
 break details[0].funding_txo.unwrap();
	let funding_txo = match node_b.next_event() {
 ref e @ Event::ChannelPending { funding_txo, .. } => {
 println!("{} got event {:?}", std::stringify!(node_b), e);
 node_b.event_handled();
 funding_txo
 }
 ref e => {
 panic!("{} got unexpected event!: {:?}", std::stringify!(node_b), e);
 }
	};

Expand DownExpand Up@@ -168,7 +170,7 @@ fn channel_full_cycle() {
	expect_event!(node_a, ChannelClosed);
	expect_event!(node_b, ChannelClosed);

	wait_for_outpoint_spend(&electrsd, funding_txo.into_bitcoin_outpoint());
	wait_for_outpoint_spend(&electrsd, funding_txo);

	generate_blocks_and_wait(&bitcoind, &electrsd, 1);
	node_a.sync_wallets().unwrap();
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
})();
Add `ChannelPending` event by tnull · Pull Request #60 · lightningdevkit/ldk-node · GitHub
Skip to content
Add ChannelPending event#60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tnull
merged 1 commit into

from

Apr 20, 2023
 Merged


Add ChannelPending event
#60
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


53 changes: 44 additions & 9 deletions
src/event.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,8 @@ use lightning::routing::gossip::NodeId;
use lightning::util::errors::APIError;
use lightning::util::ser::{Readable, ReadableArgs, Writeable, Writer};

use bitcoin::secp256k1::Secp256k1;
use bitcoin::secp256k1::{PublicKey, Secp256k1};
use bitcoin::OutPoint;
use rand::{thread_rng, Rng};
use std::collections::VecDeque;
use std::ops::Deref;
Expand DownExpand Up@@ -48,6 +49,19 @@ pub enum Event {
 /// The value, in thousandths of a satoshi, that has been received.
 amount_msat: u64,
	},
	/// A channel has been created and is pending confirmation on-chain.
	ChannelPending {
 /// The `channel_id` of the channel.
 channel_id: [u8; 32],
 /// The `user_channel_id` of the channel.
 user_channel_id: u128,
 /// The `temporary_channel_id` this channel used to be known by during channel establishment.
 former_temporary_channel_id: [u8; 32],
@jkczyzjkczyzApr 19, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: Would opt to drop former as this seems to be implied by "temporary", FWIW.
@tnulltnullApr 20, 2023•

edited

Loading

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tend to disagree. The 'former' is there to clearly communicate that it's invalid by now.
 /// The `node_id` of the channel counterparty.
 counterparty_node_id: PublicKey,
 /// The outpoint of the channel's funding transaction.
 funding_txo: OutPoint,
	},
	/// A channel is ready to be used.
	ChannelReady {
 /// The `channel_id` of the channel.
Expand DownExpand Up@@ -79,7 +93,14 @@ impl_writeable_tlv_based_enum!(Event,
 (0, channel_id, required),
 (1, user_channel_id, required),
	},
	(4, ChannelClosed) => {
	(4, ChannelPending) => {
Comment thread
tnull marked this conversation as resolved.

 (0, channel_id, required),
 (1, user_channel_id, required),
 (2, former_temporary_channel_id, required),
 (3, counterparty_node_id, required),
 (4, funding_txo, required),
	},
	(5, ChannelClosed) => {
 (0, channel_id, required),
 (1, user_channel_id, required),
	};
Expand DownExpand Up@@ -607,20 +628,34 @@ where
 }
 }
 LdkEvent::ChannelPending {
 channel_id: _,
 user_channel_id: _,
 former_temporary_channel_id: _,
 counterparty_node_id: _,
 funding_txo: _,
 channel_id,
 user_channel_id,
 former_temporary_channel_id,
 counterparty_node_id,
 funding_txo,
 } => {
 // TODO!
 log_info!(
 self.logger,
 "New channel {} with counterparty {} has been created and is pending confirmation on chain.",
 hex_utils::to_string(&channel_id),
 counterparty_node_id,
 );
 self.event_queue
 .add_event(Event::ChannelPending {
 channel_id,
 user_channel_id,
 former_temporary_channel_id: former_temporary_channel_id.unwrap(),
 counterparty_node_id,
 funding_txo,
 })
 .expect("Failed to push to event queue");
 }
 LdkEvent::ChannelReady {
 channel_id, user_channel_id, counterparty_node_id, ..
 } => {
 log_info!(
 self.logger,
 "Channel {} with {} ready to be used.",
 "Channel {} with counterparty {} ready to be used.",
 hex_utils::to_string(&channel_id),
 counterparty_node_id,
 );
Expand Down

18 changes: 10 additions & 8 deletions
src/test/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@ use crate::{Builder, Error, Event, PaymentDirection, PaymentStatus};

use bitcoin::Amount;

use std::time::Duration;
#[test]
fn channel_full_cycle() {
	let (bitcoind, electrsd) = setup_bitcoind_and_electrsd();
Expand DownExpand Up@@ -36,13 +35,16 @@ fn channel_full_cycle() {
	let node_b_addr = format!("{}@{}", node_b.node_id(), node_b.listening_address().unwrap());
	node_a.connect_open_channel(&node_b_addr, 50000, true).unwrap();

	let funding_txo = loop {
 let details = node_a.list_channels();
	expect_event!(node_a, ChannelPending);

 if details.is_empty() || details[0].funding_txo.is_none() {
 std::thread::sleep(Duration::from_secs(1));
 } else {
 break details[0].funding_txo.unwrap();
	let funding_txo = match node_b.next_event() {
 ref e @ Event::ChannelPending { funding_txo, .. } => {
 println!("{} got event {:?}", std::stringify!(node_b), e);
 node_b.event_handled();
 funding_txo
 }
 ref e => {
 panic!("{} got unexpected event!: {:?}", std::stringify!(node_b), e);
 }
	};

Expand DownExpand Up@@ -168,7 +170,7 @@ fn channel_full_cycle() {
	expect_event!(node_a, ChannelClosed);
	expect_event!(node_b, ChannelClosed);

	wait_for_outpoint_spend(&electrsd, funding_txo.into_bitcoin_outpoint());
	wait_for_outpoint_spend(&electrsd, funding_txo);

	generate_blocks_and_wait(&bitcoind, &electrsd, 1);
	node_a.sync_wallets().unwrap();
Expand Down