Swith invoice util's create_invoice to return a SignOrCreationError

Author: valentinewallace

lightning-invoice/src/lib.rs

@@ -1292,14 +1292,15 @@ impl<S> Display for SignOrCreationError<S> {
 
 	/// Convenient utilities to create an invoice.
 pub mod utils {
-	use {Currency, Invoice, InvoiceBuilder, SemanticError, SignedRawInvoice};
+	use {Currency, Invoice, InvoiceBuilder, SignOrCreationError, SignedRawInvoice};
 	use bech32::{FromBase32, ToBase32, u5};
 	use bitcoin_hashes::Hash;
 	use lightning::chain;
 	use lightning::chain::chaininterface::{BroadcasterInterface, FeeEstimator};
 	use lightning::chain::keysinterface::{Sign, KeysInterface};
 	use lightning::ln::channelmanager::{ChannelManager, MIN_FINAL_CLTV_EXPIRY};
 	use lightning::ln::features::InvoiceFeatures;
+	use lightning::ln::msgs::DecodeError;
 	use lightning::routing::network_graph::RoutingFees;
 	use lightning::routing::router::RouteHintHop;
 	use lightning::util::logger::Logger;
@@ -1312,8 +1313,8 @@ pub mod utils {
 	/// that the payment secret is valid when the invoice is paid.
 	pub fn create_invoice_from_channelmanager<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>(
 		channelmanager: &ChannelManager<Signer, M, T, K, F, L>, amt_msat: Option<u64>, description: String,
-		network: Currency, keys_manager: &dyn KeysInterface<Signer = Signer>
-	) -> Result<Invoice, SemanticError>
+		network: Currency, keys_manager: K
+	) -> Result<Invoice, SignOrCreationError<DecodeError>>
 	where
 		M::Target: chain::Watch<Signer>,
 		T::Target: BroadcasterInterface,
@@ -1367,7 +1368,10 @@ pub mod utils {
 			invoice = invoice.route(hint);
 		}
 
-		let raw_invoice = invoice.build_raw().unwrap();
+		let raw_invoice = match invoice.build_raw() {
+			Ok(inv) => inv,
+			Err(e) => return Err(SignOrCreationError::CreationError(e))
+		};
 		let hrp_str = raw_invoice.hrp.to_string();
 		let hrp_bytes = hrp_str.as_bytes();
 		let data_without_signature = raw_invoice.data.to_base32();
@@ -1387,12 +1391,11 @@ pub mod utils {
 
 		invoice_preimage.extend_from_slice(&Vec::<u8>::from_base32(&data_part)
 		  .expect("No padding error may occur due to appended zero above."));
-		let signature = match keys_manager.sign_invoice(invoice_preimage) {
-			Ok(sig) => sig,
-			Err(_) => return Err(SemanticError::InvalidSignature)
+		let signed_raw_invoice: Result<SignedRawInvoice, DecodeError> = raw_invoice.sign(|_| keys_manager.sign_invoice(invoice_preimage));
+		match signed_raw_invoice {
+			Ok(inv) => return Ok(Invoice::from_signed(inv).unwrap()),
+			Err(e) => return Err(SignOrCreationError::SignError(e))
 		};
-		let signed_raw_invoice: Result<SignedRawInvoice, SemanticError> = raw_invoice.sign(|_| Ok(signature));
-		Invoice::from_signed(signed_raw_invoice.unwrap())
 	}
 
 }