X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=sidebyside;f=lightning%2Fsrc%2Futil%2Fconfig.rs;h=19c4562105bff3aa15b1d6f88099a8da42a33669;hb=52edab7055e998ec334855c9979403e0d8eb9406;hp=c3726365996ae5b5cff69448aeb33c766ce82b54;hpb=4395b92cc8bfe0cc803e70bba11f4db58d5d0dbf;p=rust-lightning

diff --git a/lightning/src/util/config.rs b/lightning/src/util/config.rs
index c3726365..19c45621 100644
--- a/lightning/src/util/config.rs
+++ b/lightning/src/util/config.rs
@@ -12,34 +12,10 @@
 
 use ln::channelmanager::{BREAKDOWN_TIMEOUT, MAX_LOCAL_BREAKDOWN_TIMEOUT};
 
-/// Top-level config which holds ChannelHandshakeLimits and ChannelConfig.
-///
-/// Default::default() provides sane defaults for most configurations
-/// (but currently with 0 relay fees!)
-#[derive(Clone, Debug)]
-pub struct UserConfig {
-	/// Channel config that we propose to our counterparty.
-	pub own_channel_config: ChannelHandshakeConfig,
-	/// Limits applied to our counterparty's proposed channel config settings.
-	pub peer_channel_config_limits: ChannelHandshakeLimits,
-	/// Channel config which affects behavior during channel lifetime.
-	pub channel_options: ChannelConfig,
-}
-
-impl Default for UserConfig {
-	fn default() -> Self {
-		UserConfig {
-			own_channel_config: ChannelHandshakeConfig::default(),
-			peer_channel_config_limits: ChannelHandshakeLimits::default(),
-			channel_options: ChannelConfig::default(),
-		}
-	}
-}
-
 /// 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
@@ -153,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
 }
 
@@ -228,3 +204,27 @@ impl_writeable!(ChannelConfig, 8+1+1, {
 	announced_channel,
 	commit_upfront_shutdown_pubkey
 });
+
+/// Top-level config which holds ChannelHandshakeLimits and ChannelConfig.
+///
+/// Default::default() provides sane defaults for most configurations
+/// (but currently with 0 relay fees!)
+#[derive(Copy, Clone, Debug)]
+pub struct UserConfig {
+	/// Channel config that we propose to our counterparty.
+	pub own_channel_config: ChannelHandshakeConfig,
+	/// Limits applied to our counterparty's proposed channel config settings.
+	pub peer_channel_config_limits: ChannelHandshakeLimits,
+	/// Channel config which affects behavior during channel lifetime.
+	pub channel_options: ChannelConfig,
+}
+
+impl Default for UserConfig {
+	fn default() -> Self {
+		UserConfig {
+			own_channel_config: ChannelHandshakeConfig::default(),
+			peer_channel_config_limits: ChannelHandshakeLimits::default(),
+			channel_options: ChannelConfig::default(),
+		}
+	}
+}