projects
/
rust-lightning
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #2142 from alecchendev/2023-03-expose-fail-reason-in-payment-failure
[rust-lightning]
/
lightning
/
src
/
onion_message
/
utils.rs
diff --git
a/lightning/src/onion_message/utils.rs
b/lightning/src/onion_message/utils.rs
index 52cadf6c9dbf5db5e3a5747729dde7fbeadf8d93..ae9e0a7f6fee3e23b27c1aa9b1c63c51d1ea26cf 100644
(file)
--- a/
lightning/src/onion_message/utils.rs
+++ b/
lightning/src/onion_message/utils.rs
@@
-15,11
+15,11
@@
use bitcoin::hashes::sha256::Hash as Sha256;
use bitcoin::secp256k1::{self, PublicKey, Secp256k1, SecretKey, Scalar};
use bitcoin::secp256k1::ecdh::SharedSecret;
use bitcoin::secp256k1::{self, PublicKey, Secp256k1, SecretKey, Scalar};
use bitcoin::secp256k1::ecdh::SharedSecret;
-use ln::onion_utils;
-use super::blinded_
route::BlindedRoute
;
+use
crate::
ln::onion_utils;
+use super::blinded_
path::BlindedPath
;
use super::messenger::Destination;
use super::messenger::Destination;
-use prelude::*;
+use
crate::
prelude::*;
// TODO: DRY with onion_utils::construct_onion_keys_callback
#[inline]
// TODO: DRY with onion_utils::construct_onion_keys_callback
#[inline]
@@
-87,7
+87,7
@@
pub(super) fn construct_keys_callback<T: secp256k1::Signing + secp256k1::Verific
Destination::Node(pk) => {
build_keys!(pk, false, None);
},
Destination::Node(pk) => {
build_keys!(pk, false, None);
},
- Destination::Blinded
Route(BlindedRoute
{ blinded_hops, .. }) => {
+ Destination::Blinded
Path(BlindedPath
{ blinded_hops, .. }) => {
for hop in blinded_hops {
build_keys_in_loop!(hop.blinded_node_id, true, Some(hop.encrypted_payload));
}
for hop in blinded_hops {
build_keys_in_loop!(hop.blinded_node_id, true, Some(hop.encrypted_payload));
}