Rename payment_basepoint/key to simply payment_point/key.

[rust-lightning] / lightning / src / util / enforcing_trait_impls.rs

diff --git a/lightning/src/util/enforcing_trait_impls.rs b/lightning/src/util/enforcing_trait_impls.rs
index 3e1ffd04446021a4e00d5e0a5fe55318128a6d2e..d8db20f0f9a6008d9b23e8f85072a85ed48609fa 100644 (file)
--- a/lightning/src/util/enforcing_trait_impls.rs
+++ b/lightning/src/util/enforcing_trait_impls.rs
@@ -8,9 +8,9 @@ use std::sync::{Mutex, Arc};
 use bitcoin::blockdata::transaction::Transaction;
 use bitcoin::util::bip143;
 
-use secp256k1;
-use secp256k1::key::{SecretKey, PublicKey};
-use secp256k1::{Secp256k1, Signature};
+use bitcoin::secp256k1;
+use bitcoin::secp256k1::key::{SecretKey, PublicKey};
+use bitcoin::secp256k1::{Secp256k1, Signature};
 use util::ser::{Writeable, Writer, Readable};
 use std::io::Error;
 use ln::msgs::DecodeError;
@@ -36,7 +36,6 @@ impl EnforcingChannelKeys {
        fn check_keys<T: secp256k1::Signing + secp256k1::Verification>(&self, secp_ctx: &Secp256k1<T>,
                                                                       keys: &TxCreationKeys) {
                let revocation_base = PublicKey::from_secret_key(secp_ctx, &self.inner.revocation_base_key());
-               let payment_base = PublicKey::from_secret_key(secp_ctx, &self.inner.payment_base_key());
                let htlc_base = PublicKey::from_secret_key(secp_ctx, &self.inner.htlc_base_key());
 
                let remote_points = self.inner.remote_channel_pubkeys.as_ref().unwrap();
@@ -46,7 +45,6 @@ impl EnforcingChannelKeys {
                                                        &remote_points.delayed_payment_basepoint,
                                                        &remote_points.htlc_basepoint,
                                                        &revocation_base,
-                                                       &payment_base,
                                                        &htlc_base).unwrap();
                if keys != &keys_expected { panic!("derived different per-tx keys") }
        }
@@ -55,7 +53,7 @@ impl EnforcingChannelKeys {
 impl ChannelKeys for EnforcingChannelKeys {
        fn funding_key(&self) -> &SecretKey { self.inner.funding_key() }
        fn revocation_base_key(&self) -> &SecretKey { self.inner.revocation_base_key() }
-       fn payment_base_key(&self) -> &SecretKey { self.inner.payment_base_key() }
+       fn payment_key(&self) -> &SecretKey { self.inner.payment_key() }
        fn delayed_payment_base_key(&self) -> &SecretKey { self.inner.delayed_payment_base_key() }
        fn htlc_base_key(&self) -> &SecretKey { self.inner.htlc_base_key() }
        fn commitment_seed(&self) -> &[u8; 32] { self.inner.commitment_seed() }