From: Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Date: Tue, 8 Jun 2021 01:51:41 +0000 (+0000)
Subject: Merge pull request #939 from TheBlueMatt/2021-05-derives
X-Git-Tag: v0.0.98~5
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=ffec147f0f316460abfb0997be6f37010c7850c4;hp=ed6a69c1cf9e084b1ba5f4fc386ba592c2fac504;p=rust-lightning

Merge pull request #939 from TheBlueMatt/2021-05-derives

Add additional derives for a few structs
---

diff --git a/lightning/src/ln/channel.rs b/lightning/src/ln/channel.rs
index 07293a10..f8c8c15b 100644
--- a/lightning/src/ln/channel.rs
+++ b/lightning/src/ln/channel.rs
@@ -1428,9 +1428,6 @@ impl<Signer: Sign> Channel<Signer> {
 		if msg.channel_reserve_satoshis > self.channel_value_satoshis {
 			return Err(ChannelError::Close(format!("Bogus channel_reserve_satoshis ({}). Must not be greater than ({})", msg.channel_reserve_satoshis, self.channel_value_satoshis)));
 		}
-		if msg.dust_limit_satoshis > msg.channel_reserve_satoshis {
-			return Err(ChannelError::Close(format!("Bogus channel_reserve ({}) and dust_limit ({})", msg.channel_reserve_satoshis, msg.dust_limit_satoshis)));
-		}
 		if msg.channel_reserve_satoshis < self.holder_dust_limit_satoshis {
 			return Err(ChannelError::Close(format!("Peer never wants payout outputs? channel_reserve_satoshis was ({}). dust_limit is ({})", msg.channel_reserve_satoshis, self.holder_dust_limit_satoshis)));
 		}