f drop parameters suffix

Author: TheBlueMatt

fuzz/src/router.rs

@@ -13,7 +13,7 @@ use bitcoin::hash_types::BlockHash;
 
 use lightning::chain;
 use lightning::chain::transaction::OutPoint;
-use lightning::ln::channelmanager::{ChannelDetails, ChannelCounterpartyParameters};
+use lightning::ln::channelmanager::{ChannelDetails, ChannelCounterparty};
 use lightning::ln::features::InitFeatures;
 use lightning::ln::msgs;
 use lightning::routing::router::{get_route, RouteHint, RouteHintHop};
@@ -207,7 +207,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 							let rnid = node_pks.iter().skip(slice_to_be16(get_slice!(2))as usize % node_pks.len()).next().unwrap();
 							first_hops_vec.push(ChannelDetails {
 								channel_id: [0; 32],
-								counterparty: ChannelCounterpartyParameters {
+								counterparty: ChannelCounterparty {
 									node_id: *rnid,
 									features: InitFeatures::known(),
 									unspendable_punishment_reserve: 0,

lightning/src/ln/channelmanager.rs

@@ -605,7 +605,7 @@ const CHECK_CLTV_EXPIRY_SANITY_2: u32 = MIN_CLTV_EXPIRY_DELTA as u32 - LATENCY_G
 /// Channel parameters which apply to our counterparty. These are split out from [`ChannelDetails`]
 /// to better separate parameters.
 #[derive(Clone, Debug, PartialEq)]
-pub struct ChannelCounterpartyParameters {
+pub struct ChannelCounterparty {
 	/// The node_id of our counterparty
 	pub node_id: PublicKey,
 	/// The Features the channel counterparty provided upon last connection.
@@ -634,7 +634,7 @@ pub struct ChannelDetails {
 	/// lifetime of the channel.
 	pub channel_id: [u8; 32],
 	/// Parameters which apply to our counterparty. See individual fields for more information.
-	pub counterparty: ChannelCounterpartyParameters,
+	pub counterparty: ChannelCounterparty,
 	/// The Channel's funding transaction output, if we've negotiated the funding transaction with
 	/// our counterparty already.
 	///
@@ -1178,7 +1178,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 					channel.get_holder_counterparty_selected_channel_reserve_satoshis();
 				res.push(ChannelDetails {
 					channel_id: (*channel_id).clone(),
-					counterparty: ChannelCounterpartyParameters {
+					counterparty: ChannelCounterparty {
 						node_id: channel.get_counterparty_node_id(),
 						features: InitFeatures::empty(),
 						unspendable_punishment_reserve: to_remote_reserve_satoshis,

lightning/src/routing/router.rs

@@ -1204,7 +1204,7 @@ mod tests {
 			features: InitFeatures, outbound_capacity_msat: u64) -> channelmanager::ChannelDetails {
 		channelmanager::ChannelDetails {
 			channel_id: [0; 32],
-			counterparty: channelmanager::ChannelCounterpartyParameters {
+			counterparty: channelmanager::ChannelCounterparty {
 				features,
 				node_id,
 				unspendable_punishment_reserve: 0,