projects
/
rust-lightning
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
OutboundOnionPayload: hold Vec fields as references.
[rust-lightning]
/
lightning
/
src
/
offers
/
test_utils.rs
diff --git
a/lightning/src/offers/test_utils.rs
b/lightning/src/offers/test_utils.rs
index 26c0d051223a6c26787055257a187fdfd95f1da7..ee8cf3a7c1764e018bfd7d096218c8e67aff09c4 100644
(file)
--- a/
lightning/src/offers/test_utils.rs
+++ b/
lightning/src/offers/test_utils.rs
@@
-9,43
+9,51
@@
//! Utilities for testing BOLT 12 Offers interfaces
//! Utilities for testing BOLT 12 Offers interfaces
-use bitcoin::secp256k1::{KeyPair,
Message,
PublicKey, Secp256k1, SecretKey};
+use bitcoin::secp256k1::{KeyPair, PublicKey, Secp256k1, SecretKey};
use bitcoin::secp256k1::schnorr::Signature;
use bitcoin::secp256k1::schnorr::Signature;
-use core::convert::Infallible;
+
use core::time::Duration;
use core::time::Duration;
-use crate::blinded_path::{BlindedHop, BlindedPath};
+use crate::blinded_path::{BlindedHop, BlindedPath
, IntroductionNode
};
use crate::sign::EntropySource;
use crate::sign::EntropySource;
-use crate::ln::PaymentHash;
+use crate::ln::
types::
PaymentHash;
use crate::ln::features::BlindedHopFeatures;
use crate::offers::invoice::BlindedPayInfo;
use crate::ln::features::BlindedHopFeatures;
use crate::offers::invoice::BlindedPayInfo;
+use crate::offers::merkle::TaggedHash;
+
+#[allow(unused_imports)]
+use crate::prelude::*;
+
+pub(crate) fn fail_sign<T: AsRef<TaggedHash>>(_message: &T) -> Result<Signature, ()> {
+ Err(())
+}
-pub(
super
) fn payer_keys() -> KeyPair {
+pub(
crate
) fn payer_keys() -> KeyPair {
let secp_ctx = Secp256k1::new();
KeyPair::from_secret_key(&secp_ctx, &SecretKey::from_slice(&[42; 32]).unwrap())
}
let secp_ctx = Secp256k1::new();
KeyPair::from_secret_key(&secp_ctx, &SecretKey::from_slice(&[42; 32]).unwrap())
}
-pub(
super) fn payer_sign(digest: &Message) -> Result<Signature, Infallible
> {
+pub(
crate) fn payer_sign<T: AsRef<TaggedHash>>(message: &T) -> Result<Signature, ()
> {
let secp_ctx = Secp256k1::new();
let keys = KeyPair::from_secret_key(&secp_ctx, &SecretKey::from_slice(&[42; 32]).unwrap());
let secp_ctx = Secp256k1::new();
let keys = KeyPair::from_secret_key(&secp_ctx, &SecretKey::from_slice(&[42; 32]).unwrap());
- Ok(secp_ctx.sign_schnorr_no_aux_rand(
digest
, &keys))
+ Ok(secp_ctx.sign_schnorr_no_aux_rand(
message.as_ref().as_digest()
, &keys))
}
}
-pub(
super
) fn payer_pubkey() -> PublicKey {
+pub(
crate
) fn payer_pubkey() -> PublicKey {
payer_keys().public_key()
}
payer_keys().public_key()
}
-pub(
super
) fn recipient_keys() -> KeyPair {
+pub(
crate
) fn recipient_keys() -> KeyPair {
let secp_ctx = Secp256k1::new();
KeyPair::from_secret_key(&secp_ctx, &SecretKey::from_slice(&[43; 32]).unwrap())
}
let secp_ctx = Secp256k1::new();
KeyPair::from_secret_key(&secp_ctx, &SecretKey::from_slice(&[43; 32]).unwrap())
}
-pub(
super) fn recipient_sign(digest: &Message) -> Result<Signature, Infallible
> {
+pub(
crate) fn recipient_sign<T: AsRef<TaggedHash>>(message: &T) -> Result<Signature, ()
> {
let secp_ctx = Secp256k1::new();
let keys = KeyPair::from_secret_key(&secp_ctx, &SecretKey::from_slice(&[43; 32]).unwrap());
let secp_ctx = Secp256k1::new();
let keys = KeyPair::from_secret_key(&secp_ctx, &SecretKey::from_slice(&[43; 32]).unwrap());
- Ok(secp_ctx.sign_schnorr_no_aux_rand(
digest
, &keys))
+ Ok(secp_ctx.sign_schnorr_no_aux_rand(
message.as_ref().as_digest()
, &keys))
}
}
-pub(
super
) fn recipient_pubkey() -> PublicKey {
+pub(
crate
) fn recipient_pubkey() -> PublicKey {
recipient_keys().public_key()
}
recipient_keys().public_key()
}
@@
-58,10
+66,10
@@
pub(super) fn privkey(byte: u8) -> SecretKey {
SecretKey::from_slice(&[byte; 32]).unwrap()
}
SecretKey::from_slice(&[byte; 32]).unwrap()
}
-pub(
super) fn payment_paths() -> Vec<(BlindedPath, BlindedPayInfo
)> {
+pub(
crate) fn payment_paths() -> Vec<(BlindedPayInfo, BlindedPath
)> {
let paths = vec![
BlindedPath {
let paths = vec![
BlindedPath {
- introduction_node
_id: pubkey(40
),
+ introduction_node
: IntroductionNode::NodeId(pubkey(40)
),
blinding_point: pubkey(41),
blinded_hops: vec![
BlindedHop { blinded_node_id: pubkey(43), encrypted_payload: vec![0; 43] },
blinding_point: pubkey(41),
blinded_hops: vec![
BlindedHop { blinded_node_id: pubkey(43), encrypted_payload: vec![0; 43] },
@@
-69,7
+77,7
@@
pub(super) fn payment_paths() -> Vec<(BlindedPath, BlindedPayInfo)> {
],
},
BlindedPath {
],
},
BlindedPath {
- introduction_node
_id: pubkey(40
),
+ introduction_node
: IntroductionNode::NodeId(pubkey(40)
),
blinding_point: pubkey(41),
blinded_hops: vec![
BlindedHop { blinded_node_id: pubkey(45), encrypted_payload: vec![0; 45] },
blinding_point: pubkey(41),
blinded_hops: vec![
BlindedHop { blinded_node_id: pubkey(45), encrypted_payload: vec![0; 45] },
@@
-97,20
+105,20
@@
pub(super) fn payment_paths() -> Vec<(BlindedPath, BlindedPayInfo)> {
},
];
},
];
- pa
ths.into_iter().zip(payinfo
.into_iter()).collect()
+ pa
yinfo.into_iter().zip(paths
.into_iter()).collect()
}
}
-pub(
super
) fn payment_hash() -> PaymentHash {
+pub(
crate
) fn payment_hash() -> PaymentHash {
PaymentHash([42; 32])
}
PaymentHash([42; 32])
}
-pub(
super
) fn now() -> Duration {
+pub(
crate
) fn now() -> Duration {
std::time::SystemTime::now()
.duration_since(std::time::SystemTime::UNIX_EPOCH)
.expect("SystemTime::now() should come after SystemTime::UNIX_EPOCH")
}
std::time::SystemTime::now()
.duration_since(std::time::SystemTime::UNIX_EPOCH)
.expect("SystemTime::now() should come after SystemTime::UNIX_EPOCH")
}
-pub(
super
) struct FixedEntropy;
+pub(
crate
) struct FixedEntropy;
impl EntropySource for FixedEntropy {
fn get_secure_random_bytes(&self) -> [u8; 32] {
impl EntropySource for FixedEntropy {
fn get_secure_random_bytes(&self) -> [u8; 32] {