Rename field to LSPS2ServiceConfig::disable_client_reserve

This makes it consistent with the argument used in ldk-server's open
channel API.

Also add a few more variable renames to make things consistent.

Author: tankyleo

src/lib.rs

@@ -1149,7 +1149,7 @@ impl Node {
 	fn open_channel_inner(
 		&self, node_id: PublicKey, address: SocketAddress, channel_amount_sats: FundingAmount,
 		push_to_counterparty_msat: Option<u64>, channel_config: Option<ChannelConfig>,
-		announce_for_forwarding: bool, set_0reserve: bool,
+		announce_for_forwarding: bool, disable_counterparty_reserve: bool,
 	) -> Result<UserChannelId, Error> {
 		if !*self.is_running.read().expect("lock") {
 			return Err(Error::NotRunning);
@@ -1219,7 +1219,7 @@ impl Node {
 				.expect("a 16-byte slice should convert into a [u8; 16]"),
 		);
 
-		let result = if set_0reserve {
+		let result = if disable_counterparty_reserve {
 			self.channel_manager.create_channel_to_trusted_peer_0reserve(
 				peer_info.node_id,
 				channel_amount_sats,
@@ -1239,7 +1239,7 @@ impl Node {
 			)
 		};
 
-		let zero_reserve_string = if set_0reserve { "0reserve " } else { "" };
+		let zero_reserve_string = if disable_counterparty_reserve { "0reserve " } else { "" };
 
 		match result {
 			Ok(_) => {

src/liquidity.rs

@@ -149,7 +149,7 @@ pub struct LSPS2ServiceConfig {
 	/// See [`Node::open_0reserve_channel`] to manually open these channels.
 	///
 	/// [`Node::open_0reserve_channel`]: crate::Node::open_0reserve_channel
-	pub allow_client_0reserve: bool,
+	pub disable_client_reserve: bool,
 }
 
 pub(crate) struct LiquiditySourceBuilder<L: Deref>
@@ -796,7 +796,7 @@ where
 				config.channel_config.forwarding_fee_base_msat = 0;
 				config.channel_config.forwarding_fee_proportional_millionths = 0;
 
-				let result = if service_config.allow_client_0reserve {
+				let result = if service_config.disable_client_reserve {
 					self.channel_manager.create_channel_to_trusted_peer_0reserve(
 						their_network_key,
 						channel_amount_sats,
@@ -823,7 +823,7 @@ where
 						// the pending requests and regularly retry opening the channel until we
 						// succeed.
 						let zero_reserve_string =
-							if service_config.allow_client_0reserve { "0reserve " } else { "" };
+							if service_config.disable_client_reserve { "0reserve " } else { "" };
 						log_error!(
 							self.logger,
 							"Failed to open LSPS2 {}channel to {}: {:?}",

tests/common/mod.rs

@@ -790,7 +790,7 @@ pub async fn splice_in_with_all(
 
 pub(crate) async fn do_channel_full_cycle<E: ElectrumApi>(
 	node_a: TestNode, node_b: TestNode, bitcoind: &BitcoindClient, electrsd: &E, allow_0conf: bool,
-	allow_0reserve: bool, expect_anchor_channel: bool, force_close: bool,
+	disable_node_b_reserve: bool, expect_anchor_channel: bool, force_close: bool,
 ) {
 	let addr_a = node_a.onchain_payment().new_address().unwrap();
 	let addr_b = node_b.onchain_payment().new_address().unwrap();
@@ -846,7 +846,7 @@ pub(crate) async fn do_channel_full_cycle<E: ElectrumApi>(
 	println!("\nA -- open_channel -> B");
 	let funding_amount_sat = 2_080_000;
 	let push_msat = (funding_amount_sat / 2) * 1000; // balance the channel
-	if allow_0reserve {
+	if disable_node_b_reserve {
 		node_a
 			.open_0reserve_channel(
 				node_b.node_id(),
@@ -927,7 +927,7 @@ pub(crate) async fn do_channel_full_cycle<E: ElectrumApi>(
 
 	// Note that only node B has 0-reserve, we don't yet have an API to allow the opener of the
 	// channel to have 0-reserve.
-	if allow_0reserve {
+	if disable_node_b_reserve {
 		assert_eq!(node_b.list_channels()[0].unspendable_punishment_reserve, Some(0));
 		assert_eq!(node_b.list_channels()[0].outbound_capacity_msat, push_msat);
 		assert_eq!(node_b.list_channels()[0].next_outbound_htlc_limit_msat, push_msat);
@@ -1295,7 +1295,7 @@ pub(crate) async fn do_channel_full_cycle<E: ElectrumApi>(
 		2
 	);
 
-	if allow_0reserve {
+	if disable_node_b_reserve {
 		let node_a_outbound_capacity_msat = node_a.list_channels()[0].outbound_capacity_msat;
 		let node_a_reserve_msat =
 			node_a.list_channels()[0].unspendable_punishment_reserve.unwrap() * 1000;

tests/integration_tests_rust.rs

@@ -1786,7 +1786,7 @@ async fn do_lsps2_client_service_integration(client_trusts_lsp: bool) {
 		min_channel_opening_fee_msat: 0,
 		max_client_to_self_delay: 1024,
 		client_trusts_lsp,
-		allow_client_0reserve: false,
+		disable_client_reserve: false,
 	};
 
 	let service_config = random_config(true);
@@ -2105,7 +2105,7 @@ async fn lsps2_client_trusts_lsp() {
 		min_channel_opening_fee_msat: 0,
 		max_client_to_self_delay: 1024,
 		client_trusts_lsp: true,
-		allow_client_0reserve: false,
+		disable_client_reserve: false,
 	};
 
 	let service_config = random_config(true);
@@ -2280,7 +2280,7 @@ async fn lsps2_lsp_trusts_client_but_client_does_not_claim() {
 		min_channel_opening_fee_msat: 0,
 		max_client_to_self_delay: 1024,
 		client_trusts_lsp: false,
-		allow_client_0reserve: false,
+		disable_client_reserve: false,
 	};
 
 	let service_config = random_config(true);