From: Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Date: Tue, 20 Nov 2018 21:29:21 +0000 (-0500)
Subject: Merge pull request #231 from philipr-za/philip-204-check-commitment-transaction-fee
X-Git-Tag: v0.0.12~270
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=86944d34a1fb845fd01772f591422026d393a38d;p=rust-lightning

Merge pull request #231 from philipr-za/philip-204-check-commitment-transaction-fee

Check funder can afford commitment transaction fee when receiving update_fee
---

86944d34a1fb845fd01772f591422026d393a38d
diff --cc src/ln/channelmanager.rs
index c5bf8b337,0600c4e70..20a377989
--- a/src/ln/channelmanager.rs
+++ b/src/ln/channelmanager.rs
@@@ -3209,8 -3210,9 +3209,9 @@@ mod tests 
  	use chain::chaininterface;
  	use chain::transaction::OutPoint;
  	use chain::chaininterface::{ChainListener, ChainWatchInterface};
 -	use chain::keysinterface::KeysInterface;
 +	use chain::keysinterface::{KeysInterface, SpendableOutputDescriptor};
  	use chain::keysinterface;
+ 	use ln::channel::{COMMITMENT_TX_BASE_WEIGHT, COMMITMENT_TX_WEIGHT_PER_HTLC};
  	use ln::channelmanager::{ChannelManager,ChannelManagerReadArgs,OnionKeys,PaymentFailReason,RAACommitmentOrder};
  	use ln::channelmonitor::{ChannelMonitor, ChannelMonitorUpdateErr, CLTV_CLAIM_BUFFER, HTLC_FAIL_TIMEOUT_BLOCKS, ManyChannelMonitor};
  	use ln::router::{Route, RouteHop, Router};