Skip to content

Commit 8f9059d

Browse files
zoedbergzoedberg
committed
add env var to show prints for sample tests
This reverts commit dc9a337.
1 parent dc9a337 commit 8f9059d

File tree

2 files changed

+57
-0
lines changed

2 files changed

+57
-0
lines changed

‎lightning/src/chain/onchaintx.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1185,6 +1185,9 @@ impl<ChannelSigner: WriteableEcdsaChannelSigner> OnchainTxHandler<ChannelSigner>
11851185
}
11861186
}
11871187
}
1188+
if std::env::var_os("TEST_PRINTS").is_some() {
1189+
println!("COMPLETED GET_FULLY_SIGNED_HTLC_TX");
1190+
}
11881191
htlc_tx
11891192
}
11901193

‎lightning/src/ln/channelmanager.rs

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5631,6 +5631,9 @@ where
56315631
let _ = handle_error!(self, err, counterparty_node_id);
56325632
}
56335633

5634+
if std::env::var_os("TEST_PRINTS").is_some() && has_update {
5635+
println!("GENERATED CLOSING SIGNED");
5636+
}
56345637
has_update
56355638
}
56365639

@@ -6378,76 +6381,121 @@ where
63786381
fn handle_open_channel(&self, counterparty_node_id: &PublicKey, msg: &msgs::OpenChannel) {
63796382
let _persistence_guard = PersistenceNotifierGuard::notify_on_drop(&self.total_consistency_lock, &self.persistence_notifier);
63806383
let _ = handle_error!(self, self.internal_open_channel(counterparty_node_id, msg), *counterparty_node_id);
6384+
if std::env::var_os("TEST_PRINTS").is_some() {
6385+
println!("HANDLED OPEN CHANNEL");
6386+
}
63816387
}
63826388

63836389
fn handle_accept_channel(&self, counterparty_node_id: &PublicKey, msg: &msgs::AcceptChannel) {
63846390
let _persistence_guard = PersistenceNotifierGuard::notify_on_drop(&self.total_consistency_lock, &self.persistence_notifier);
63856391
let _ = handle_error!(self, self.internal_accept_channel(counterparty_node_id, msg), *counterparty_node_id);
6392+
if std::env::var_os("TEST_PRINTS").is_some() {
6393+
println!("HANDLED ACCEPT CHANNEL");
6394+
}
63866395
}
63876396

63886397
fn handle_funding_created(&self, counterparty_node_id: &PublicKey, msg: &msgs::FundingCreated) {
63896398
let _persistence_guard = PersistenceNotifierGuard::notify_on_drop(&self.total_consistency_lock, &self.persistence_notifier);
63906399
let _ = handle_error!(self, self.internal_funding_created(counterparty_node_id, msg), *counterparty_node_id);
6400+
if std::env::var_os("TEST_PRINTS").is_some() {
6401+
println!("HANDLED FUNDING CREATED");
6402+
}
63916403
}
63926404

63936405
fn handle_funding_signed(&self, counterparty_node_id: &PublicKey, msg: &msgs::FundingSigned) {
63946406
let _persistence_guard = PersistenceNotifierGuard::notify_on_drop(&self.total_consistency_lock, &self.persistence_notifier);
63956407
let _ = handle_error!(self, self.internal_funding_signed(counterparty_node_id, msg), *counterparty_node_id);
6408+
if std::env::var_os("TEST_PRINTS").is_some() {
6409+
println!("HANDLED FUNDING SIGNED");
6410+
}
63966411
}
63976412

63986413
fn handle_channel_ready(&self, counterparty_node_id: &PublicKey, msg: &msgs::ChannelReady) {
63996414
let _persistence_guard = PersistenceNotifierGuard::notify_on_drop(&self.total_consistency_lock, &self.persistence_notifier);
64006415
let _ = handle_error!(self, self.internal_channel_ready(counterparty_node_id, msg), *counterparty_node_id);
6416+
if std::env::var_os("TEST_PRINTS").is_some() {
6417+
println!("HANDLED CHANNEL READY");
6418+
}
64016419
}
64026420

64036421
fn handle_shutdown(&self, counterparty_node_id: &PublicKey, msg: &msgs::Shutdown) {
64046422
let _persistence_guard = PersistenceNotifierGuard::notify_on_drop(&self.total_consistency_lock, &self.persistence_notifier);
64056423
let _ = handle_error!(self, self.internal_shutdown(counterparty_node_id, msg), *counterparty_node_id);
6424+
if std::env::var_os("TEST_PRINTS").is_some() {
6425+
println!("HANDLED SHUTDOWN");
6426+
}
64066427
}
64076428

64086429
fn handle_closing_signed(&self, counterparty_node_id: &PublicKey, msg: &msgs::ClosingSigned) {
64096430
let _persistence_guard = PersistenceNotifierGuard::notify_on_drop(&self.total_consistency_lock, &self.persistence_notifier);
64106431
let _ = handle_error!(self, self.internal_closing_signed(counterparty_node_id, msg), *counterparty_node_id);
6432+
if std::env::var_os("TEST_PRINTS").is_some() {
6433+
println!("HANDLED CLOSING SIGNED");
6434+
}
64116435
}
64126436

64136437
fn handle_update_add_htlc(&self, counterparty_node_id: &PublicKey, msg: &msgs::UpdateAddHTLC) {
64146438
let _persistence_guard = PersistenceNotifierGuard::notify_on_drop(&self.total_consistency_lock, &self.persistence_notifier);
64156439
let _ = handle_error!(self, self.internal_update_add_htlc(counterparty_node_id, msg), *counterparty_node_id);
6440+
if std::env::var_os("TEST_PRINTS").is_some() {
6441+
println!("HANDLED UPDATE ADD HTLC");
6442+
}
64166443
}
64176444

64186445
fn handle_update_fulfill_htlc(&self, counterparty_node_id: &PublicKey, msg: &msgs::UpdateFulfillHTLC) {
64196446
let _persistence_guard = PersistenceNotifierGuard::notify_on_drop(&self.total_consistency_lock, &self.persistence_notifier);
64206447
let _ = handle_error!(self, self.internal_update_fulfill_htlc(counterparty_node_id, msg), *counterparty_node_id);
6448+
if std::env::var_os("TEST_PRINTS").is_some() {
6449+
println!("HANDLED UPDATE FULFILL HTLC");
6450+
}
64216451
}
64226452

64236453
fn handle_update_fail_htlc(&self, counterparty_node_id: &PublicKey, msg: &msgs::UpdateFailHTLC) {
64246454
let _persistence_guard = PersistenceNotifierGuard::notify_on_drop(&self.total_consistency_lock, &self.persistence_notifier);
64256455
let _ = handle_error!(self, self.internal_update_fail_htlc(counterparty_node_id, msg), *counterparty_node_id);
6456+
if std::env::var_os("TEST_PRINTS").is_some() {
6457+
println!("HANDLED UPDATE FAIL HTLC");
6458+
}
64266459
}
64276460

64286461
fn handle_update_fail_malformed_htlc(&self, counterparty_node_id: &PublicKey, msg: &msgs::UpdateFailMalformedHTLC) {
64296462
let _persistence_guard = PersistenceNotifierGuard::notify_on_drop(&self.total_consistency_lock, &self.persistence_notifier);
64306463
let _ = handle_error!(self, self.internal_update_fail_malformed_htlc(counterparty_node_id, msg), *counterparty_node_id);
6464+
if std::env::var_os("TEST_PRINTS").is_some() {
6465+
println!("HANDLED UPDATE FAIL MALFORMED HTLC");
6466+
}
64316467
}
64326468

64336469
fn handle_commitment_signed(&self, counterparty_node_id: &PublicKey, msg: &msgs::CommitmentSigned) {
64346470
let _persistence_guard = PersistenceNotifierGuard::notify_on_drop(&self.total_consistency_lock, &self.persistence_notifier);
64356471
let _ = handle_error!(self, self.internal_commitment_signed(counterparty_node_id, msg), *counterparty_node_id);
6472+
if std::env::var_os("TEST_PRINTS").is_some() {
6473+
println!("HANDLED COMMITMENT SIGNED");
6474+
}
64366475
}
64376476

64386477
fn handle_revoke_and_ack(&self, counterparty_node_id: &PublicKey, msg: &msgs::RevokeAndACK) {
64396478
let _persistence_guard = PersistenceNotifierGuard::notify_on_drop(&self.total_consistency_lock, &self.persistence_notifier);
64406479
let _ = handle_error!(self, self.internal_revoke_and_ack(counterparty_node_id, msg), *counterparty_node_id);
6480+
if std::env::var_os("TEST_PRINTS").is_some() {
6481+
println!("HANDLED REVOKE AND ACK");
6482+
}
64416483
}
64426484

64436485
fn handle_update_fee(&self, counterparty_node_id: &PublicKey, msg: &msgs::UpdateFee) {
64446486
let _persistence_guard = PersistenceNotifierGuard::notify_on_drop(&self.total_consistency_lock, &self.persistence_notifier);
64456487
let _ = handle_error!(self, self.internal_update_fee(counterparty_node_id, msg), *counterparty_node_id);
6488+
if std::env::var_os("TEST_PRINTS").is_some() {
6489+
println!("HANDLED UPDATE FEE");
6490+
}
64466491
}
64476492

64486493
fn handle_announcement_signatures(&self, counterparty_node_id: &PublicKey, msg: &msgs::AnnouncementSignatures) {
64496494
let _persistence_guard = PersistenceNotifierGuard::notify_on_drop(&self.total_consistency_lock, &self.persistence_notifier);
64506495
let _ = handle_error!(self, self.internal_announcement_signatures(counterparty_node_id, msg), *counterparty_node_id);
6496+
if std::env::var_os("TEST_PRINTS").is_some() {
6497+
println!("HANDLED ANNOUNCEMENT SIGNATURES");
6498+
}
64516499
}
64526500

64536501
fn handle_channel_update(&self, counterparty_node_id: &PublicKey, msg: &msgs::ChannelUpdate) {
@@ -6458,11 +6506,17 @@ where
64586506
NotifyOption::SkipPersist
64596507
}
64606508
});
6509+
if std::env::var_os("TEST_PRINTS").is_some() {
6510+
println!("HANDLED CHANNEL UPDATE");
6511+
}
64616512
}
64626513

64636514
fn handle_channel_reestablish(&self, counterparty_node_id: &PublicKey, msg: &msgs::ChannelReestablish) {
64646515
let _persistence_guard = PersistenceNotifierGuard::notify_on_drop(&self.total_consistency_lock, &self.persistence_notifier);
64656516
let _ = handle_error!(self, self.internal_channel_reestablish(counterparty_node_id, msg), *counterparty_node_id);
6517+
if std::env::var_os("TEST_PRINTS").is_some() {
6518+
println!("HANDLED CHANNEL REESTABLISH");
6519+
}
64666520
}
64676521

64686522
fn peer_disconnected(&self, counterparty_node_id: &PublicKey) {

0 commit comments

Comments
 (0)