From 8c709d1b6f8bd03d2982b9f94f936a61522f6e4b Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Tue, 4 Sep 2018 19:28:06 -0400 Subject: [PATCH] Dont return an Err from Channel::get_accept_channel that can't fail --- fuzz/fuzz_targets/channel_target.rs | 2 +- src/ln/channel.rs | 6 +++--- src/ln/channelmanager.rs | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fuzz/fuzz_targets/channel_target.rs b/fuzz/fuzz_targets/channel_target.rs index 37a671836..7b3b7df1c 100644 --- a/fuzz/fuzz_targets/channel_target.rs +++ b/fuzz/fuzz_targets/channel_target.rs @@ -230,7 +230,7 @@ pub fn do_test(data: &[u8]) { Ok(chan) => chan, Err(_) => return, }; - chan.get_accept_channel().unwrap(); + chan.get_accept_channel(); tx.output.push(TxOut{ value: open_chan.funding_satoshis, script_pubkey: chan.get_funding_redeemscript().to_v0_p2wsh() }); let funding_output = OutPoint::new(Sha256dHash::from_data(&serialize(&tx).unwrap()[..]), 0); diff --git a/src/ln/channel.rs b/src/ln/channel.rs index 0659f8261..8dcd23b78 100644 --- a/src/ln/channel.rs +++ b/src/ln/channel.rs @@ -2200,7 +2200,7 @@ impl Channel { }) } - pub fn get_accept_channel(&self) -> Result { + pub fn get_accept_channel(&self) -> msgs::AcceptChannel { if self.channel_outbound { panic!("Tried to send accept_channel for an outbound channel?"); } @@ -2213,7 +2213,7 @@ impl Channel { let local_commitment_secret = self.build_local_commitment_secret(self.cur_local_commitment_transaction_number); - Ok(msgs::AcceptChannel { + msgs::AcceptChannel { temporary_channel_id: self.channel_id, dust_limit_satoshis: self.our_dust_limit_satoshis, max_htlc_value_in_flight_msat: Channel::get_our_max_htlc_value_in_flight_msat(self.channel_value_satoshis), @@ -2229,7 +2229,7 @@ impl Channel { htlc_basepoint: PublicKey::from_secret_key(&self.secp_ctx, &self.local_keys.htlc_base_key), first_per_commitment_point: PublicKey::from_secret_key(&self.secp_ctx, &local_commitment_secret), shutdown_scriptpubkey: None, - }) + } } fn get_outbound_funding_created_signature(&mut self) -> Result<(Signature, Transaction), HandleError> { diff --git a/src/ln/channelmanager.rs b/src/ln/channelmanager.rs index 845bced75..ff1f6e53d 100644 --- a/src/ln/channelmanager.rs +++ b/src/ln/channelmanager.rs @@ -1414,7 +1414,7 @@ impl ChannelManager { }; let channel = Channel::new_from_req(&*self.fee_estimator, chan_keys, their_node_id.clone(), msg, 0, false, self.announce_channels_publicly, Arc::clone(&self.logger)).map_err(|e| MsgHandleErrInternal::from_no_close(e))?; - let accept_msg = channel.get_accept_channel().map_err(|e| MsgHandleErrInternal::from_no_close(e))?; + let accept_msg = channel.get_accept_channel(); channel_state.by_id.insert(channel.channel_id(), channel); Ok(accept_msg) } -- 2.39.5