f rename channel reserve values to to_*_reserve_satoshis

Author: TheBlueMatt

fuzz/src/router.rs

@@ -214,8 +214,8 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 								channel_value_satoshis: slice_to_be64(get_slice!(8)),
 								user_id: 0,
 								inbound_capacity_msat: 0,
-								counterparty_selected_channel_reserve_satoshis: None,
-								holder_selected_channel_reserve_satoshis: 0,
+								to_self_reserve_satoshis: None,
+								to_remote_reserve_satoshis: 0,
 								confirmations_required: None, to_self_delay: None,
 								is_outbound: true,
 								is_funding_locked: true,

lightning/src/ln/channelmanager.rs

@@ -665,15 +665,15 @@ pub struct ChannelDetails {
 	/// This value will be `None` for outbound channels until the counterparty accepts the channel.
 	///
 	/// [`outbound_capacity_msat`]: ChannelDetails::outbound_capacity_msat
-	pub counterparty_selected_channel_reserve_satoshis: Option<u64>,
+	pub to_self_reserve_satoshis: Option<u64>,
 	/// The value, in satoshis, that must always be held in the channel for our counterparty. This
 	/// value ensures that if our counterparty broadcasts a revoked state, we can punish them by
 	/// claiming at least this value on chain.
 	///
 	/// This value is not included in [`inbound_capacity_msat`] as it can never be spent.
 	///
 	/// [`inbound_capacity_msat`]: ChannelDetails::inbound_capacity_msat
-	pub holder_selected_channel_reserve_satoshis: u64,
+	pub to_remote_reserve_satoshis: u64,
 	/// The user_id passed in to create_channel, or 0 if the channel was inbound.
 	pub user_id: u64,
 	/// The available outbound capacity for sending HTLCs to the remote peer. This does not include
@@ -1195,7 +1195,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 			res.reserve(channel_state.by_id.len());
 			for (channel_id, channel) in channel_state.by_id.iter().filter(f) {
 				let (inbound_capacity_msat, outbound_capacity_msat) = channel.get_inbound_outbound_available_balance_msat();
-				let (holder_selected_channel_reserve_satoshis, counterparty_selected_channel_reserve_satoshis) =
+				let (to_remote_reserve_satoshis, to_self_reserve_satoshis) =
 					channel.get_holder_counterparty_selected_channel_reserve_satoshis();
 				res.push(ChannelDetails {
 					channel_id: (*channel_id).clone(),
@@ -1204,8 +1204,8 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 					remote_network_id: channel.get_counterparty_node_id(),
 					counterparty_features: InitFeatures::empty(),
 					channel_value_satoshis: channel.get_value_satoshis(),
-					counterparty_selected_channel_reserve_satoshis,
-					holder_selected_channel_reserve_satoshis,
+					to_self_reserve_satoshis,
+					to_remote_reserve_satoshis,
 					inbound_capacity_msat,
 					outbound_capacity_msat,
 					user_id: channel.get_user_id(),

lightning/src/routing/router.rs

@@ -1642,8 +1642,8 @@ mod tests {
 			user_id: 0,
 			outbound_capacity_msat: 100000,
 			inbound_capacity_msat: 100000,
-			counterparty_selected_channel_reserve_satoshis: None,
-			holder_selected_channel_reserve_satoshis: 0,
+			to_self_reserve_satoshis: None,
+			to_remote_reserve_satoshis: 0,
 			confirmations_required: None, to_self_delay: None,
 			is_outbound: true, is_funding_locked: true,
 			is_usable: true, is_public: true,
@@ -1965,8 +1965,8 @@ mod tests {
 			user_id: 0,
 			outbound_capacity_msat: 250_000_000,
 			inbound_capacity_msat: 0,
-			counterparty_selected_channel_reserve_satoshis: None,
-			holder_selected_channel_reserve_satoshis: 0,
+			to_self_reserve_satoshis: None,
+			to_remote_reserve_satoshis: 0,
 			confirmations_required: None, to_self_delay: None,
 			is_outbound: true, is_funding_locked: true,
 			is_usable: true, is_public: true,
@@ -2018,8 +2018,8 @@ mod tests {
 			user_id: 0,
 			outbound_capacity_msat: 250_000_000,
 			inbound_capacity_msat: 0,
-			counterparty_selected_channel_reserve_satoshis: None,
-			holder_selected_channel_reserve_satoshis: 0,
+			to_self_reserve_satoshis: None,
+			to_remote_reserve_satoshis: 0,
 			confirmations_required: None, to_self_delay: None,
 			is_outbound: true, is_funding_locked: true,
 			is_usable: true, is_public: true,
@@ -2088,8 +2088,8 @@ mod tests {
 			user_id: 0,
 			outbound_capacity_msat: 250_000_000,
 			inbound_capacity_msat: 0,
-			counterparty_selected_channel_reserve_satoshis: None,
-			holder_selected_channel_reserve_satoshis: 0,
+			to_self_reserve_satoshis: None,
+			to_remote_reserve_satoshis: 0,
 			confirmations_required: None, to_self_delay: None,
 			is_outbound: true, is_funding_locked: true,
 			is_usable: true, is_public: true,
@@ -2230,8 +2230,8 @@ mod tests {
 			user_id: 0,
 			outbound_capacity_msat: 250_000_000,
 			inbound_capacity_msat: 0,
-			counterparty_selected_channel_reserve_satoshis: None,
-			holder_selected_channel_reserve_satoshis: 0,
+			to_self_reserve_satoshis: None,
+			to_remote_reserve_satoshis: 0,
 			confirmations_required: None, to_self_delay: None,
 			is_outbound: true, is_funding_locked: true,
 			is_usable: true, is_public: true,
@@ -2364,8 +2364,8 @@ mod tests {
 			user_id: 0,
 			outbound_capacity_msat: 100000,
 			inbound_capacity_msat: 100000,
-			counterparty_selected_channel_reserve_satoshis: None,
-			holder_selected_channel_reserve_satoshis: 0,
+			to_self_reserve_satoshis: None,
+			to_remote_reserve_satoshis: 0,
 			confirmations_required: None, to_self_delay: None,
 			is_outbound: true, is_funding_locked: true,
 			is_usable: true, is_public: true,
@@ -2501,8 +2501,8 @@ mod tests {
 			user_id: 0,
 			outbound_capacity_msat: 200_000_000,
 			inbound_capacity_msat: 0,
-			counterparty_selected_channel_reserve_satoshis: None,
-			holder_selected_channel_reserve_satoshis: 0,
+			to_self_reserve_satoshis: None,
+			to_remote_reserve_satoshis: 0,
 			confirmations_required: None, to_self_delay: None,
 			is_outbound: true, is_funding_locked: true,
 			is_usable: true, is_public: true,