projects
/
rust-lightning
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Drop requirement that all ChannelKeys expose revocaion_basepoint
[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 9a1b3ccf983b7493a172e95a58f8be2971e8d0bd..425b2124f9cc146bca00363489f4118fbfee4638 100644
(file)
--- a/
lightning/src/util/enforcing_trait_impls.rs
+++ b/
lightning/src/util/enforcing_trait_impls.rs
@@
-35,7
+35,6
@@
impl EnforcingChannelKeys {
impl EnforcingChannelKeys {
fn check_keys<T: secp256k1::Signing + secp256k1::Verification>(&self, secp_ctx: &Secp256k1<T>,
keys: &TxCreationKeys) {
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 htlc_base = PublicKey::from_secret_key(secp_ctx, &self.inner.htlc_base_key());
let remote_points = self.inner.remote_channel_pubkeys.as_ref().unwrap();
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();
@@
-44,16
+43,13
@@
impl EnforcingChannelKeys {
&keys.per_commitment_point,
&remote_points.delayed_payment_basepoint,
&remote_points.htlc_basepoint,
&keys.per_commitment_point,
&remote_points.delayed_payment_basepoint,
&remote_points.htlc_basepoint,
- &
revocation_base
,
+ &
self.inner.pubkeys().revocation_basepoint
,
&htlc_base).unwrap();
if keys != &keys_expected { panic!("derived different per-tx keys") }
}
}
impl ChannelKeys for EnforcingChannelKeys {
&htlc_base).unwrap();
if keys != &keys_expected { panic!("derived different per-tx keys") }
}
}
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_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() }
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() }