Skip to content

Commit

Permalink
add env var to show prints for sample tests
Browse files Browse the repository at this point in the history 
This reverts commit dc9a337.
  • Loading branch information
@zoedberg
zoedberg committed Aug 2, 2023
1 parent dc9a337 commit 8f9059d
Show file tree
Hide file tree
Showing 2 changed files with 57 additions and 0 deletions.
3 changes: 3 additions & 0 deletions lightning/src/chain/onchaintx.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1185,6 +1185,9 @@ impl<ChannelSigner: WriteableEcdsaChannelSigner> OnchainTxHandler<ChannelSigner>
}
}
}
if std::env::var_os("TEST_PRINTS").is_some() {
println!("COMPLETED GET_FULLY_SIGNED_HTLC_TX");
}
htlc_tx
}

Expand Down
54 changes: 54 additions & 0 deletions lightning/src/ln/channelmanager.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5631,6 +5631,9 @@ where
let _ = handle_error!(self, err, counterparty_node_id);
}

if std::env::var_os("TEST_PRINTS").is_some() && has_update {
println!("GENERATED CLOSING SIGNED");
}
has_update
}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

fn handle_channel_update(&self, counterparty_node_id: &PublicKey, msg: &msgs::ChannelUpdate) {
Expand All @@ -6458,11 +6506,17 @@ where
NotifyOption::SkipPersist
}
});
if std::env::var_os("TEST_PRINTS").is_some() {
println!("HANDLED CHANNEL UPDATE");
}
}

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

fn peer_disconnected(&self, counterparty_node_id: &PublicKey) {
Expand Down

0 comments on commit 8f9059d

Please sign in to comment.