WIP Simplify reserve check fn

Author: optout21

lightning/src/ln/channel.rs

@@ -4137,28 +4137,24 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
 	pub fn check_splice_balance_meets_v2_reserve_requirement_noerr(pre_balance: u64, post_balance: u64, pre_channel_value: u64, post_channel_value: u64, dust_limit: u64) -> Result<(), u64> {
 		if post_balance == 0 {
 			// 0 balance is fine
-			Ok(())
-		} else {
-			let post_channel_reserve = get_v2_channel_reserve_satoshis(post_channel_value, dust_limit);
-			if post_balance >= post_channel_reserve {
-				Ok(())
-			} else {
-				// post is not OK, check pre
-				if pre_balance == 0 {
-					// pre OK, post not -> not
-					Err(post_channel_reserve)
-				} else {
-					let pre_channel_reserve = get_v2_channel_reserve_satoshis(pre_channel_value, dust_limit);
-					if pre_balance >= pre_channel_reserve {
-						// pre OK, post not -> not
-						Err(post_channel_reserve)
-					} else {
-						// post not OK, but so was pre -> OK
-						Ok(())
-					}
-				}
-			}
+			return Ok(());
+		}
+		let post_channel_reserve = get_v2_channel_reserve_satoshis(post_channel_value, dust_limit);
+		if post_balance >= post_channel_reserve {
+			return Ok(());
 		}
+		// post is not OK, check pre
+		if pre_balance == 0 {
+			// pre OK, post not -> not
+			return Err(post_channel_reserve);
+		}
+		let pre_channel_reserve = get_v2_channel_reserve_satoshis(pre_channel_value, dust_limit);
+		if pre_balance >= pre_channel_reserve {
+			// pre OK, post not -> not
+			return Err(post_channel_reserve);
+		}
+		// post not OK, but so was pre -> OK
+		Ok(())
 	}
 
 	/// Check that balances meet the channel reserve requirements or violates them (below reserve).