+// This file is Copyright its original authors, visible in version control
+// history.
+//
+// This file is licensed under the Apache License, Version 2.0 <LICENSE-APACHE
+// or http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your option.
+// You may not use this file except in accordance with one or both of these
+// licenses.
+
use chain::transaction::OutPoint;
use chain::keysinterface::SpendableOutputDescriptor;
}
macro_rules! log_funding_info {
($key_storage: expr) => {
- ::util::macro_logger::DebugFundingInfo(&$key_storage.funding_info)
+ ::util::macro_logger::DebugFundingInfo($key_storage.get_funding_txo())
}
}
impl<'a> std::fmt::Display for DebugRoute<'a> {
fn fmt(&self, f: &mut std::fmt::Formatter) -> Result<(), std::fmt::Error> {
for (idx, p) in self.0.paths.iter().enumerate() {
- write!(f, "path {}:\n", idx)?;
+ writeln!(f, "path {}:", idx)?;
for h in p.iter() {
- write!(f, " node_id: {}, short_channel_id: {}, fee_msat: {}, cltv_expiry_delta: {}\n", log_pubkey!(h.pubkey), h.short_channel_id, h.fee_msat, h.cltv_expiry_delta)?;
+ writeln!(f, " node_id: {}, short_channel_id: {}, fee_msat: {}, cltv_expiry_delta: {}", log_pubkey!(h.pubkey), h.short_channel_id, h.fee_msat, h.cltv_expiry_delta)?;
}
}
Ok(())
fn fmt(&self, f: &mut std::fmt::Formatter) -> Result<(), std::fmt::Error> {
match self.0 {
&SpendableOutputDescriptor::StaticOutput { ref outpoint, .. } => {
- write!(f, "StaticOutput {}:{} marked for spending", outpoint.txid, outpoint.vout)?;
+ write!(f, "StaticOutput {}:{} marked for spending", outpoint.txid, outpoint.index)?;
}
&SpendableOutputDescriptor::DynamicOutputP2WSH { ref outpoint, .. } => {
- write!(f, "DynamicOutputP2WSH {}:{} marked for spending", outpoint.txid, outpoint.vout)?;
+ write!(f, "DynamicOutputP2WSH {}:{} marked for spending", outpoint.txid, outpoint.index)?;
}
- &SpendableOutputDescriptor::StaticOutputRemotePayment { ref outpoint, .. } => {
- write!(f, "DynamicOutputP2WPKH {}:{} marked for spending", outpoint.txid, outpoint.vout)?;
+ &SpendableOutputDescriptor::StaticOutputCounterpartyPayment { ref outpoint, .. } => {
+ write!(f, "DynamicOutputP2WPKH {}:{} marked for spending", outpoint.txid, outpoint.index)?;
}
}
Ok(())