diff --git a/sim-lib/src/lib.rs b/sim-lib/src/lib.rs index 7dbf933c..0dd12ef8 100644 --- a/sim-lib/src/lib.rs +++ b/sim-lib/src/lib.rs @@ -358,6 +358,16 @@ struct Payment { dispatch_time: SystemTime, } +impl Payment { + fn formatted_activity_name(&self) -> String { + if self.activity_name != "" { + format!("{} activity:", self.activity_name) + } else { + "".to_string() + } + } +} + impl Display for Payment { fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { let dispatch_time = self @@ -367,8 +377,8 @@ impl Display for Payment { write!( f, - "{} activity: Payment {} dispatched at {:?} sending {} msat from {} -> {}", - self.activity_name, + "{} Payment {} dispatched at {:?} sending {} msat from {} -> {}", + self.formatted_activity_name(), self.hash.map(|h| hex::encode(h.0)).unwrap_or_default(), dispatch_time, self.amount_msat, @@ -1118,20 +1128,17 @@ impl PaymentResultLogger { } self.total_sent += details.amount_msat; - self.activity_name = details.activity_name.clone(); + self.activity_name = details.formatted_activity_name(); } } -// TODO: Add activity name and handle the initial processing log with few LOC impl Display for PaymentResultLogger { fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { let total_payments = self.success_payment + self.failed_payment; - // if self.activity_name - write!( f, - "{} activity: Processed {} payments sending {} msat total with {:.2}% success rate.", + "{} Processed {} payments sending {} msat total with {:.2}% success rate.", self.activity_name, total_payments, self.total_sent,