Merge pull request #837 from TheBlueMatt/2021-03-0.0.13

[rust-lightning] / lightning / src / util / config.rs

diff --git a/lightning/src/util/config.rs b/lightning/src/util/config.rs
index 712b5937bab7ea2517f41cef155a7fe8d707c2b9..19c4562105bff3aa15b1d6f88099a8da42a33669 100644 (file)
--- a/lightning/src/util/config.rs
+++ b/lightning/src/util/config.rs
@@ -15,7 +15,7 @@ use ln::channelmanager::{BREAKDOWN_TIMEOUT, MAX_LOCAL_BREAKDOWN_TIMEOUT};
 /// Configuration we set when applicable.
 ///
 /// Default::default() provides sane defaults.
-#[derive(Clone, Debug)]
+#[derive(Copy, Clone, Debug)]
 pub struct ChannelHandshakeConfig {
        /// Confirmations we will wait for before considering the channel locked in.
        /// Applied only for inbound channels (see ChannelHandshakeLimits::max_minimum_depth for the
@@ -129,8 +129,8 @@ pub struct ChannelHandshakeLimits {
        /// Not checking this value would be a security issue, as our peer would be able to set it to
        /// max relative lock-time (a year) and we would "lose" money as it would be locked for a long time.
        ///
-       /// Default value: MAX_LOCAL_BREAKDOWN_TIMEOUT (1008), which we also enforce as a maximum value
-       /// so you can tweak config to reduce the loss of having useless locked funds (if your peer accepts)
+       /// Default value: 2016, which we also enforce as a maximum value so you can tweak config to
+       /// reduce the loss of having useless locked funds (if your peer accepts)
        pub their_to_self_delay: u16
 }
 
@@ -209,7 +209,7 @@ impl_writeable!(ChannelConfig, 8+1+1, {
 ///
 /// Default::default() provides sane defaults for most configurations
 /// (but currently with 0 relay fees!)
-#[derive(Clone, Debug)]
+#[derive(Copy, Clone, Debug)]
 pub struct UserConfig {
        /// Channel config that we propose to our counterparty.
        pub own_channel_config: ChannelHandshakeConfig,