]> git.bitcoin.ninja Git - rust-lightning/commitdiff
Merge pull request #1619 from G8XSU/main
authorMatt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Wed, 3 Aug 2022 17:37:51 +0000 (17:37 +0000)
committerGitHub <noreply@github.com>
Wed, 3 Aug 2022 17:37:51 +0000 (17:37 +0000)
Add config support for 'their_channel_reserve_proportional_millionths' [#1498]

1  2 
lightning/src/ln/channel.rs
lightning/src/ln/channelmanager.rs
lightning/src/ln/functional_tests.rs

index 65d53a444c55db87a735c267d39a08ba3be73ce7,da770c7a1e48174d09e7504d51f152d6a310a6f0..fdd073f632a8d4b978453a55dc6c98b7f277e141
@@@ -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};
Simple merge
Simple merge