X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fln%2Fchannel.rs;h=c4b6acb7d632708c322b15915cf2bdc240cdead9;hb=4e4fa56e2b52971271ccddf56e8195d96b1c69ba;hp=3a627f35baa9548881e8e52f8b1f888abff791a6;hpb=01c8e4f56fed86fdca842a03968741549b336bc1;p=rust-lightning

diff --git a/src/ln/channel.rs b/src/ln/channel.rs
index 3a627f35..c4b6acb7 100644
--- a/src/ln/channel.rs
+++ b/src/ln/channel.rs
@@ -2168,7 +2168,7 @@ impl Channel {
 	// Methods to get unprompted messages to send to the remote end (or where we already returned
 	// something in the handler for the message that prompted this message):
 
-	pub fn get_open_channel(&self, chain_hash: Sha256dHash, fee_estimator: &FeeEstimator) -> Result<msgs::OpenChannel, APIError> {
+	pub fn get_open_channel(&self, chain_hash: Sha256dHash, fee_estimator: &FeeEstimator) -> msgs::OpenChannel {
 		if !self.channel_outbound {
 			panic!("Tried to open a channel for an inbound channel?");
 		}
@@ -2182,7 +2182,7 @@ impl Channel {
 
 		let local_commitment_secret = self.build_local_commitment_secret(self.cur_local_commitment_transaction_number);
 
-		Ok(msgs::OpenChannel {
+		msgs::OpenChannel {
 			chain_hash: chain_hash,
 			temporary_channel_id: self.channel_id,
 			funding_satoshis: self.channel_value_satoshis,
@@ -2202,7 +2202,7 @@ impl Channel {
 			first_per_commitment_point: PublicKey::from_secret_key(&self.secp_ctx, &local_commitment_secret),
 			channel_flags: if self.announce_publicly {1} else {0},
 			shutdown_scriptpubkey: None,
-		})
+		}
 	}
 
 	pub fn get_accept_channel(&self) -> msgs::AcceptChannel {
@@ -2551,10 +2551,7 @@ impl Channel {
 			}
 		}
 
-		for htlc in self.pending_outbound_htlcs.drain(..) {
-			if htlc.state == OutboundHTLCState::LocalAnnounced {
-				dropped_outbound_htlcs.push((htlc.source, htlc.payment_hash));
-			}
+		for _htlc in self.pending_outbound_htlcs.drain(..) {
 			//TODO: Do something with the remaining HTLCs
 			//(we need to have the ChannelManager monitor them so we can claim the inbound HTLCs
 			//which correspond)