X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Frouting%2Frouter.rs;h=325920b778151bafbfa98c8d610af77b7cb7ca41;hb=0273ac52db6df30b798b1815b093d9ef065c8c17;hp=97c2c7623ea77c2642ab2ec0874ea47ab9d7073d;hpb=088daf79aa375a69089ba2054ecf9820ae2c8871;p=rust-lightning

diff --git a/lightning/src/routing/router.rs b/lightning/src/routing/router.rs
index 97c2c762..325920b7 100644
--- a/lightning/src/routing/router.rs
+++ b/lightning/src/routing/router.rs
@@ -28,7 +28,7 @@ use core::cmp;
 use core::ops::Deref;
 
 /// A hop in a route
-#[derive(Clone, Hash, PartialEq, Eq)]
+#[derive(Clone, Debug, Hash, PartialEq, Eq)]
 pub struct RouteHop {
 	/// The node_id of the node at this hop.
 	pub pubkey: PublicKey,
@@ -71,6 +71,27 @@ pub struct Route {
 	pub paths: Vec<Vec<RouteHop>>,
 }
 
+impl Route {
+	/// Returns the total amount of fees paid on this [`Route`].
+	///
+	/// This doesn't include any extra payment made to the recipient, which can happen in excess of
+	/// the amount passed to [`get_route`]'s `final_value_msat`.
+	pub fn get_total_fees(&self) -> u64 {
+		// Do not count last hop of each path since that's the full value of the payment
+		return self.paths.iter()
+			.flat_map(|path| path.split_last().map(|(_, path_prefix)| path_prefix).unwrap_or(&[]))
+			.map(|hop| &hop.fee_msat)
+			.sum();
+	}
+
+	/// Returns the total amount paid on this [`Route`], excluding the fees.
+	pub fn get_total_amount(&self) -> u64 {
+		return self.paths.iter()
+			.map(|path| path.split_last().map(|(hop, _)| hop.fee_msat).unwrap_or(0))
+			.sum();
+	}
+}
+
 const SERIALIZATION_VERSION: u8 = 1;
 const MIN_SERIALIZATION_VERSION: u8 = 1;
 
@@ -1245,7 +1266,7 @@ pub fn get_route<L: Deref>(our_node_id: &PublicKey, network: &NetworkGraph, paye
 
 #[cfg(test)]
 mod tests {
-	use routing::router::{get_route, Route, RouteHint, RouteHintHop, RoutingFees};
+	use routing::router::{get_route, Route, RouteHint, RouteHintHop, RouteHop, RoutingFees};
 	use routing::network_graph::{NetworkGraph, NetGraphMsgHandler};
 	use chain::transaction::OutPoint;
 	use ln::features::{ChannelFeatures, InitFeatures, InvoiceFeatures, NodeFeatures};
@@ -3791,6 +3812,7 @@ mod tests {
 				total_amount_paid_msat += path.last().unwrap().fee_msat;
 			}
 			assert_eq!(total_amount_paid_msat, 200_000);
+			assert_eq!(route.get_total_fees(), 150_000);
 		}
 
 	}
@@ -4198,6 +4220,75 @@ mod tests {
 		}
 	}
 
+	#[test]
+	fn total_fees_single_path() {
+		let route = Route {
+			paths: vec![vec![
+				RouteHop {
+					pubkey: PublicKey::from_slice(&hex::decode("02eec7245d6b7d2ccb30380bfbe2a3648cd7a942653f5aa340edcea1f283686619").unwrap()[..]).unwrap(),
+					channel_features: ChannelFeatures::empty(), node_features: NodeFeatures::empty(),
+					short_channel_id: 0, fee_msat: 100, cltv_expiry_delta: 0
+				},
+				RouteHop {
+					pubkey: PublicKey::from_slice(&hex::decode("0324653eac434488002cc06bbfb7f10fe18991e35f9fe4302dbea6d2353dc0ab1c").unwrap()[..]).unwrap(),
+					channel_features: ChannelFeatures::empty(), node_features: NodeFeatures::empty(),
+					short_channel_id: 0, fee_msat: 150, cltv_expiry_delta: 0
+				},
+				RouteHop {
+					pubkey: PublicKey::from_slice(&hex::decode("027f31ebc5462c1fdce1b737ecff52d37d75dea43ce11c74d25aa297165faa2007").unwrap()[..]).unwrap(),
+					channel_features: ChannelFeatures::empty(), node_features: NodeFeatures::empty(),
+					short_channel_id: 0, fee_msat: 225, cltv_expiry_delta: 0
+				},
+			]],
+		};
+
+		assert_eq!(route.get_total_fees(), 250);
+		assert_eq!(route.get_total_amount(), 225);
+	}
+
+	#[test]
+	fn total_fees_multi_path() {
+		let route = Route {
+			paths: vec![vec![
+				RouteHop {
+					pubkey: PublicKey::from_slice(&hex::decode("02eec7245d6b7d2ccb30380bfbe2a3648cd7a942653f5aa340edcea1f283686619").unwrap()[..]).unwrap(),
+					channel_features: ChannelFeatures::empty(), node_features: NodeFeatures::empty(),
+					short_channel_id: 0, fee_msat: 100, cltv_expiry_delta: 0
+				},
+				RouteHop {
+					pubkey: PublicKey::from_slice(&hex::decode("0324653eac434488002cc06bbfb7f10fe18991e35f9fe4302dbea6d2353dc0ab1c").unwrap()[..]).unwrap(),
+					channel_features: ChannelFeatures::empty(), node_features: NodeFeatures::empty(),
+					short_channel_id: 0, fee_msat: 150, cltv_expiry_delta: 0
+				},
+			],vec![
+				RouteHop {
+					pubkey: PublicKey::from_slice(&hex::decode("02eec7245d6b7d2ccb30380bfbe2a3648cd7a942653f5aa340edcea1f283686619").unwrap()[..]).unwrap(),
+					channel_features: ChannelFeatures::empty(), node_features: NodeFeatures::empty(),
+					short_channel_id: 0, fee_msat: 100, cltv_expiry_delta: 0
+				},
+				RouteHop {
+					pubkey: PublicKey::from_slice(&hex::decode("0324653eac434488002cc06bbfb7f10fe18991e35f9fe4302dbea6d2353dc0ab1c").unwrap()[..]).unwrap(),
+					channel_features: ChannelFeatures::empty(), node_features: NodeFeatures::empty(),
+					short_channel_id: 0, fee_msat: 150, cltv_expiry_delta: 0
+				},
+			]],
+		};
+
+		assert_eq!(route.get_total_fees(), 200);
+		assert_eq!(route.get_total_amount(), 300);
+	}
+
+	#[test]
+	fn total_empty_route_no_panic() {
+		// In an earlier version of `Route::get_total_fees` and `Route::get_total_amount`, they
+		// would both panic if the route was completely empty. We test to ensure they return 0
+		// here, even though its somewhat nonsensical as a route.
+		let route = Route { paths: Vec::new() };
+
+		assert_eq!(route.get_total_fees(), 0);
+		assert_eq!(route.get_total_amount(), 0);
+	}
+
 	#[cfg(not(feature = "no-std"))]
 	pub(super) fn random_init_seed() -> u64 {
 		// Because the default HashMap in std pulls OS randomness, we can use it as a (bad) RNG.