f - allow user-defined signing error

Author: jkczyz

lightning/src/offers/invoice_request.rs

@@ -459,14 +459,15 @@ mod tests {
 
 	use bitcoin::blockdata::constants::ChainHash;
 	use bitcoin::network::constants::Network;
-	use bitcoin::secp256k1::{KeyPair, Message, PublicKey, Secp256k1, SecretKey};
+	use bitcoin::secp256k1::{KeyPair, Message, PublicKey, Secp256k1, SecretKey, self};
 	use bitcoin::secp256k1::schnorr::Signature;
 	use core::convert::{Infallible, TryFrom};
 	use core::num::NonZeroU64;
 	#[cfg(feature = "std")]
 	use core::time::Duration;
 	use crate::ln::features::InvoiceRequestFeatures;
 	use crate::ln::msgs::{DecodeError, MAX_VALUE_MSAT};
+	use crate::offers::merkle::SignError;
 	use crate::offers::offer::{OfferBuilder, Quantity};
 	use crate::offers::parse::{ParseError, SemanticError};
 	use crate::util::ser::{BigSize, Writeable};
@@ -477,16 +478,22 @@ mod tests {
 		KeyPair::from_secret_key(&secp_ctx, &SecretKey::from_slice(&[42; 32]).unwrap())
 	}
 
-	fn payer_sign(digest: &Message) -> Signature {
+	fn payer_sign(digest: &Message) -> Result<Signature, Infallible> {
 		let secp_ctx = Secp256k1::new();
 		let keys = KeyPair::from_secret_key(&secp_ctx, &SecretKey::from_slice(&[42; 32]).unwrap());
-		secp_ctx.sign_schnorr_no_aux_rand(digest, &keys)
+		Ok(secp_ctx.sign_schnorr_no_aux_rand(digest, &keys))
 	}
 
 	fn payer_pubkey() -> PublicKey {
 		payer_keys().public_key()
 	}
 
+	fn recipient_sign(digest: &Message) -> Result<Signature, Infallible> {
+		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))
+	}
+
 	fn recipient_pubkey() -> PublicKey {
 		let secp_ctx = Secp256k1::new();
 		KeyPair::from_secret_key(&secp_ctx, &SecretKey::from_slice(&[43; 32]).unwrap()).public_key()
@@ -840,6 +847,31 @@ mod tests {
 		assert_eq!(tlv_stream.payer_note, Some(&String::from("baz")));
 	}
 
+	#[test]
+	fn fails_signing_invoice_request() {
+		match OfferBuilder::new("foo".into(), recipient_pubkey())
+			.amount_msats(1000)
+			.build().unwrap()
+			.request_invoice(vec![1; 32], payer_pubkey())
+			.build().unwrap()
+			.sign(|digest| Err(()))
+		{
+			Ok(_) => panic!("expected error"),
+			Err(e) => assert_eq!(e, SignError::Signing(())),
+		}
+
+		match OfferBuilder::new("foo".into(), recipient_pubkey())
+			.amount_msats(1000)
+			.build().unwrap()
+			.request_invoice(vec![1; 32], payer_pubkey())
+			.build().unwrap()
+			.sign(recipient_sign)
+		{
+			Ok(_) => panic!("expected error"),
+			Err(e) => assert_eq!(e, SignError::Verification(secp256k1::Error::InvalidSignature)),
+		}
+	}
+
 	#[test]
 	fn fails_parsing_invoice_request_with_extra_tlv_records() {
 		let secp_ctx = Secp256k1::new();

lightning/src/offers/merkle.rs

@@ -25,7 +25,7 @@ tlv_stream!(SignatureTlvStream, SignatureTlvStreamRef, SIGNATURE_TYPES, {
 });
 
 /// Error when signing messages using [`sign_message`].
-#[derive(Debug)]
+#[derive(Debug, PartialEq)]
 pub enum SignError<E> {
 	/// User-defined error when signing the message.
 	Signing(E),