From: Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Date: Wed, 3 Aug 2022 17:37:51 +0000 (+0000)
Subject: Merge pull request #1619 from G8XSU/main
X-Git-Tag: v0.0.111~45
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=736c0b9e7f3dfe022e9bcd73717d17c21fe68355;p=rust-lightning

Merge pull request #1619 from G8XSU/main

Add config support for 'their_channel_reserve_proportional_millionths' [#1498]
---

736c0b9e7f3dfe022e9bcd73717d17c21fe68355
diff --cc lightning/src/ln/channel.rs
index 65d53a444,da770c7a1..fdd073f63
--- a/lightning/src/ln/channel.rs
+++ b/lightning/src/ln/channel.rs
@@@ -6571,9 -6587,9 +6588,9 @@@ mod tests 
  	use ln::PaymentHash;
  	use ln::channelmanager::{HTLCSource, PaymentId};
  	use ln::channel::{Channel, InboundHTLCOutput, OutboundHTLCOutput, InboundHTLCState, OutboundHTLCState, HTLCCandidate, HTLCInitiator};
- 	use ln::channel::{MAX_FUNDING_SATOSHIS_NO_WUMBO, TOTAL_BITCOIN_SUPPLY_SATOSHIS};
+ 	use ln::channel::{MAX_FUNDING_SATOSHIS_NO_WUMBO, TOTAL_BITCOIN_SUPPLY_SATOSHIS, MIN_THEIR_CHAN_RESERVE_SATOSHIS};
  	use ln::features::{InitFeatures, ChannelTypeFeatures};
 -	use ln::msgs::{ChannelUpdate, DataLossProtect, DecodeError, OptionalField, UnsignedChannelUpdate};
 +	use ln::msgs::{ChannelUpdate, DataLossProtect, DecodeError, OptionalField, UnsignedChannelUpdate, MAX_VALUE_MSAT};
  	use ln::script::ShutdownScript;
  	use ln::chan_utils;
  	use ln::chan_utils::{htlc_success_tx_weight, htlc_timeout_tx_weight};