unwrap channel.get_open_channel

diff --git a/fuzz/fuzz_targets/channel_target.rs b/fuzz/fuzz_targets/channel_target.rs
index d33ac94192a5efeaecc3829dd26c6ab9d7e94751..5cf0783c58bc7201155ac8234e0dd51b4f43a14e 100644 (file)
--- a/fuzz/fuzz_targets/channel_target.rs
+++ b/fuzz/fuzz_targets/channel_target.rs
@@ -197,7 +197,7 @@ pub fn do_test(data: &[u8]) {
                        Ok(chan) => chan,
                        Err(_) => return,
                };
-               chan.get_open_channel(Sha256dHash::from(get_slice!(32)), &fee_est).unwrap();
+               chan.get_open_channel(Sha256dHash::from(get_slice!(32)), &fee_est);
                let accept_chan = if get_slice!(1)[0] == 0 {
                        decode_msg_with_len16!(msgs::AcceptChannel, 270, 1)
                } else {

diff --git a/src/ln/channel.rs b/src/ln/channel.rs
index e71ba9b2c63f151351d60f9f9ce9f46c91620b39..c4b6acb7d632708c322b15915cf2bdc240cdead9 100644 (file)
--- 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 {

diff --git a/src/ln/channelmanager.rs b/src/ln/channelmanager.rs
index 765c417f3a6856c0f56543cc84d7000655a10a54..af27a3f32134bd13a26805b887e8bc2758cb3b58 100644 (file)
--- a/src/ln/channelmanager.rs
+++ b/src/ln/channelmanager.rs
@@ -369,7 +369,7 @@ impl ChannelManager {
                };
 
                let channel = Channel::new_outbound(&*self.fee_estimator, chan_keys, their_network_key, channel_value_satoshis, push_msat, self.announce_channels_publicly, user_id, Arc::clone(&self.logger))?;
-               let res = channel.get_open_channel(self.genesis_hash.clone(), &*self.fee_estimator)?;
+               let res = channel.get_open_channel(self.genesis_hash.clone(), &*self.fee_estimator);
                let mut channel_state = self.channel_state.lock().unwrap();
                match channel_state.by_id.insert(channel.channel_id(), channel) {
                        Some(_) => panic!("RNG is bad???"),