Integrate shutdown_pubkey from KeysInterface in ChannelManager/Channel

[rust-lightning] / src / chain / keysinterface.rs

diff --git a/src/chain/keysinterface.rs b/src/chain/keysinterface.rs
index 3a5ca6942c69d0473f5bfd7113fac9f311a89a50..84ebde34252c95a530c4c0bb6c5f6ef63d9f64ac 100644 (file)
--- a/src/chain/keysinterface.rs
+++ b/src/chain/keysinterface.rs
@@ -74,8 +74,6 @@ pub struct ChannelKeys {
        pub delayed_payment_base_key: SecretKey,
        /// Local htlc secret key used in commitment tx htlc outputs
        pub htlc_base_key: SecretKey,
-       /// Local secret key used for closing tx
-       pub channel_close_key: SecretKey,
        /// Local secret key used in justice tx, claim tx and preimage tx outputs
        pub channel_monitor_claim_key: SecretKey,
        /// Commitment seed
@@ -106,9 +104,6 @@ impl ChannelKeys {
                hkdf_expand(Sha256::new(), &prk, b"rust-lightning htlc base key info", &mut okm);
                let htlc_base_key = SecretKey::from_slice(&secp_ctx, &okm).expect("Sha256 is broken");
 
-               hkdf_expand(Sha256::new(), &prk, b"rust-lightning channel close key info", &mut okm);
-               let channel_close_key = SecretKey::from_slice(&secp_ctx, &okm).expect("Sha256 is broken");
-
                hkdf_expand(Sha256::new(), &prk, b"rust-lightning channel monitor claim key info", &mut okm);
                let channel_monitor_claim_key = SecretKey::from_slice(&secp_ctx, &okm).expect("Sha256 is broken");
 
@@ -120,7 +115,6 @@ impl ChannelKeys {
                        payment_base_key: payment_base_key,
                        delayed_payment_base_key: delayed_payment_base_key,
                        htlc_base_key: htlc_base_key,
-                       channel_close_key: channel_close_key,
                        channel_monitor_claim_key: channel_monitor_claim_key,
                        commitment_seed: okm
                }