projects
/
rust-lightning
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
OM functional tests: update util to take nodes by reference
[rust-lightning]
/
lightning
/
src
/
chain
/
keysinterface.rs
diff --git
a/lightning/src/chain/keysinterface.rs
b/lightning/src/chain/keysinterface.rs
index 000c497d8b77d75d6b8f60d3fd96584a939c7f68..73b8a1b98224ace7aef2f6db05a82ca2a020e476 100644
(file)
--- a/
lightning/src/chain/keysinterface.rs
+++ b/
lightning/src/chain/keysinterface.rs
@@
-410,7
+410,7
@@
pub trait KeysInterface {
/// secret, though this is less efficient.
///
/// [`node secret`]: Self::get_node_secret
/// secret, though this is less efficient.
///
/// [`node secret`]: Self::get_node_secret
- fn ecdh(&self, recipient: Recipient, other_key: &PublicKey, tweak: Option<&
[u8; 32]
>) -> Result<SharedSecret, ()>;
+ fn ecdh(&self, recipient: Recipient, other_key: &PublicKey, tweak: Option<&
Scalar
>) -> Result<SharedSecret, ()>;
/// Get a script pubkey which we send funds to when claiming on-chain contestable outputs.
///
/// This method should return a different value each time it is called, to avoid linking
/// Get a script pubkey which we send funds to when claiming on-chain contestable outputs.
///
/// This method should return a different value each time it is called, to avoid linking
@@
-1140,10
+1140,10
@@
impl KeysInterface for KeysManager {
}
}
}
}
- fn ecdh(&self, recipient: Recipient, other_key: &PublicKey, tweak: Option<&
[u8; 32]
>) -> Result<SharedSecret, ()> {
+ fn ecdh(&self, recipient: Recipient, other_key: &PublicKey, tweak: Option<&
Scalar
>) -> Result<SharedSecret, ()> {
let mut node_secret = self.get_node_secret(recipient)?;
if let Some(tweak) = tweak {
let mut node_secret = self.get_node_secret(recipient)?;
if let Some(tweak) = tweak {
- node_secret = node_secret.mul_tweak(
&Scalar::from_be_bytes(*tweak).unwrap()
).map_err(|_| ())?;
+ node_secret = node_secret.mul_tweak(
tweak
).map_err(|_| ())?;
}
Ok(SharedSecret::new(other_key, &node_secret))
}
}
Ok(SharedSecret::new(other_key, &node_secret))
}
@@
-1232,10
+1232,10
@@
impl KeysInterface for PhantomKeysManager {
}
}
}
}
- fn ecdh(&self, recipient: Recipient, other_key: &PublicKey, tweak: Option<&
[u8; 32]
>) -> Result<SharedSecret, ()> {
+ fn ecdh(&self, recipient: Recipient, other_key: &PublicKey, tweak: Option<&
Scalar
>) -> Result<SharedSecret, ()> {
let mut node_secret = self.get_node_secret(recipient)?;
if let Some(tweak) = tweak {
let mut node_secret = self.get_node_secret(recipient)?;
if let Some(tweak) = tweak {
- node_secret = node_secret.mul_tweak(
&Scalar::from_be_bytes(*tweak).unwrap()
).map_err(|_| ())?;
+ node_secret = node_secret.mul_tweak(
tweak
).map_err(|_| ())?;
}
Ok(SharedSecret::new(other_key, &node_secret))
}
}
Ok(SharedSecret::new(other_key, &node_secret))
}