DEBUGGING - DO NOT MERGE

Author: jkczyz

lightning/src/ln/channel.rs

@@ -5222,7 +5222,7 @@ impl<Signer: Sign> Channel<Signer> {
 		}
 		// Check their_max_htlc_value_in_flight_msat
 		if outbound_stats.pending_htlcs_value_msat + amount_msat > self.counterparty_max_htlc_value_in_flight_msat {
-			return Err(ChannelError::Ignore(format!("Cannot send value that would put us over the max HTLC value in flight our peer will accept ({})", self.counterparty_max_htlc_value_in_flight_msat)));
+			return Err(ChannelError::Ignore(format!("Cannot send value that would put us over the max HTLC value in flight our peer will accept ({} + {} > {})", outbound_stats.pending_htlcs_value_msat, amount_msat, self.counterparty_max_htlc_value_in_flight_msat)));
 		}
 
 		let keys = self.build_holder_transaction_keys(self.cur_holder_commitment_transaction_number)?;

lightning/src/routing/router.rs

@@ -934,6 +934,7 @@ where L::Target: Logger {
 					let doesnt_exceed_cltv_delta_limit = hop_total_cltv_delta <= max_total_cltv_expiry_delta;
 
 					let value_contribution_msat = cmp::min(available_value_contribution_msat, $next_hops_value_contribution);
+					eprintln!("value_contribution_msat: {} = min(available_value_contribution_msat: {}, $next_hops_value_contribution: {})", value_contribution_msat, available_value_contribution_msat, $next_hops_value_contribution);
 					// Includes paying fees for the use of the following channels.
 					let amount_to_transfer_over_msat: u64 = match value_contribution_msat.checked_add($next_hops_fee_msat) {
 						Some(result) => result,
@@ -955,7 +956,8 @@ where L::Target: Logger {
 					// bother considering this channel. If retrying with recommended_value_msat may
 					// allow us to hit the HTLC minimum limit, set htlc_minimum_limit so that we go
 					// around again with a higher amount.
-					if contributes_sufficient_value && doesnt_exceed_cltv_delta_limit && may_overpay_to_meet_path_minimum_msat {
+					if value_contribution_msat == 0 {
+					} else if contributes_sufficient_value && doesnt_exceed_cltv_delta_limit && may_overpay_to_meet_path_minimum_msat {
 						hit_minimum_limit = true;
 					} else if contributes_sufficient_value && doesnt_exceed_cltv_delta_limit && over_path_minimum_msat {
 						// Note that low contribution here (limited by available_liquidity_msat)
@@ -1434,6 +1436,7 @@ where L::Target: Logger {
 						.entry((hop.candidate.short_channel_id(), *prev_hop < hop.node_id))
 						.and_modify(|used_liquidity_msat| *used_liquidity_msat += spent_on_hop_msat)
 						.or_insert(spent_on_hop_msat);
+					eprintln!("used_liquidity_msat: {}, spent_on_hop_msat: {}", used_liquidity_msat, spent_on_hop_msat);
 					if *used_liquidity_msat == hop.candidate.htlc_maximum_msat() {
 						// If this path used all of this channel's available liquidity, we know
 						// this path will not be selected again in the next loop iteration.