From: Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Date: Fri, 29 Jun 2018 22:26:25 +0000 (-0400)
Subject: Merge pull request #36 from TheBlueMatt/2018-08-33-cleanups
X-Git-Tag: v0.0.12~398
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=5918df84909109e965fe1784434227c06d93c249;p=rust-lightning

Merge pull request #36 from TheBlueMatt/2018-08-33-cleanups

Cleanups after #33, plus one unrelated bugfix spotted in #33 review
---

5918df84909109e965fe1784434227c06d93c249
diff --cc src/ln/channel.rs
index 1c17cb1f,37d435ce..dea03bd4
--- a/src/ln/channel.rs
+++ b/src/ln/channel.rs
@@@ -1164,9 -1164,8 +1164,8 @@@ impl Channel 
  
  		// Now that we're past error-generating stuff, update our local state:
  
 -		self.channel_monitor.provide_latest_remote_commitment_tx_info(&remote_initial_commitment_tx, Vec::new());
 +		self.channel_monitor.provide_latest_remote_commitment_tx_info(&remote_initial_commitment_tx, Vec::new(), self.cur_remote_commitment_transaction_number);
  		self.channel_state = ChannelState::FundingSent as u32;
- 		let funding_txo = self.channel_monitor.get_funding_txo().unwrap();
  		self.channel_id = funding_txo.to_channel_id();
  		self.cur_remote_commitment_transaction_number -= 1;
  		self.cur_local_commitment_transaction_number -= 1;
@@@ -2069,9 -2068,8 +2068,8 @@@
  		let temporary_channel_id = self.channel_id;
  
  		// Now that we're past error-generating stuff, update our local state:
 -		self.channel_monitor.provide_latest_remote_commitment_tx_info(&commitment_tx, Vec::new());
 +		self.channel_monitor.provide_latest_remote_commitment_tx_info(&commitment_tx, Vec::new(), self.cur_remote_commitment_transaction_number);
  		self.channel_state = ChannelState::FundingCreated as u32;
- 		let funding_txo = self.channel_monitor.get_funding_txo().unwrap();
  		self.channel_id = funding_txo.to_channel_id();
  		self.cur_remote_commitment_transaction_number -= 1;