X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning-invoice%2Fsrc%2Fde.rs;h=4b38c89ec9444932daac0f224567dae1e749282b;hb=b5f0ebab77961ce243fcf5a5fad3d4e161f4952a;hp=c06281e4b4db86c00b95812ad4794b57dffe9112;hpb=6b9ec8b6e6c6ecb8a405611bf52b960d66d657a8;p=rust-lightning

diff --git a/lightning-invoice/src/de.rs b/lightning-invoice/src/de.rs
index c06281e4..4b38c89e 100644
--- a/lightning-invoice/src/de.rs
+++ b/lightning-invoice/src/de.rs
@@ -10,6 +10,7 @@ use bech32::{u5, FromBase32};
 
 use bitcoin_hashes::Hash;
 use bitcoin_hashes::sha256;
+use lightning::ln::PaymentSecret;
 use lightning::routing::network_graph::RoutingFees;
 use lightning::routing::router::RouteHintHop;
 
@@ -264,7 +265,7 @@ impl FromStr for SignedRawInvoice {
 				hrp.as_bytes(),
 				&data[..data.len()-104]
 			),
-			signature: Signature::from_base32(&data[data.len()-104..])?,
+			signature: InvoiceSignature::from_base32(&data[data.len()-104..])?,
 		})
 	}
 }
@@ -338,17 +339,17 @@ impl FromBase32 for PositiveTimestamp {
 	}
 }
 
-impl FromBase32 for Signature {
+impl FromBase32 for InvoiceSignature {
 	type Err = ParseError;
 	fn from_base32(signature: &[u5]) -> Result<Self, Self::Err> {
 		if signature.len() != 104 {
-			return Err(ParseError::InvalidSliceLength("Signature::from_base32()".into()));
+			return Err(ParseError::InvalidSliceLength("InvoiceSignature::from_base32()".into()));
 		}
 		let recoverable_signature_bytes = Vec::<u8>::from_base32(signature)?;
 		let signature = &recoverable_signature_bytes[0..64];
 		let recovery_id = RecoveryId::from_i32(recoverable_signature_bytes[64] as i32)?;
 
-		Ok(Signature(RecoverableSignature::from_compact(
+		Ok(InvoiceSignature(RecoverableSignature::from_compact(
 			signature,
 			recovery_id
 		)?))
@@ -484,21 +485,6 @@ impl FromBase32 for PayeePubKey {
 	}
 }
 
-impl FromBase32 for PaymentSecret {
-	type Err = ParseError;
-
-	fn from_base32(field_data: &[u5]) -> Result<PaymentSecret, ParseError> {
-		if field_data.len() != 52 {
-			Err(ParseError::Skip)
-		} else {
-			let data_bytes = Vec::<u8>::from_base32(field_data)?;
-			let mut payment_secret = [0; 32];
-			payment_secret.copy_from_slice(&data_bytes);
-			Ok(PaymentSecret(payment_secret))
-		}
-	}
-}
-
 impl FromBase32 for ExpiryTime {
 	type Err = ParseError;
 
@@ -999,7 +985,7 @@ mod test {
 		use lightning::ln::features::InvoiceFeatures;
 		use secp256k1::recovery::{RecoveryId, RecoverableSignature};
 		use TaggedField::*;
-		use {SiPrefix, SignedRawInvoice, Signature, RawInvoice, RawHrp, RawDataPart,
+		use {SiPrefix, SignedRawInvoice, InvoiceSignature, RawInvoice, RawHrp, RawDataPart,
 				 Currency, Sha256, PositiveTimestamp};
 
 		// Feature bits 9, 15, and 99 are set.
@@ -1025,7 +1011,7 @@ mod test {
 					hash: [0xb1, 0x96, 0x46, 0xc3, 0xbc, 0x56, 0x76, 0x1d, 0x20, 0x65, 0x6e, 0x0e, 0x32,
 									0xec, 0xd2, 0x69, 0x27, 0xb7, 0x62, 0x6e, 0x2a, 0x8b, 0xe6, 0x97, 0x71, 0x9f,
 									0xf8, 0x7e, 0x44, 0x54, 0x55, 0xb9],
-					signature: Signature(RecoverableSignature::from_compact(
+					signature: InvoiceSignature(RecoverableSignature::from_compact(
 										&[0xd7, 0x90, 0x4c, 0xc4, 0xb7, 0x4a, 0x22, 0x26, 0x9c, 0x68, 0xc1, 0xdf, 0x68,
 											0xa9, 0x6c, 0x21, 0x4d, 0x65, 0x1b, 0x93, 0x76, 0xe9, 0xf1, 0x64, 0xd3, 0x60,
 											0x4d, 0xa4, 0xb7, 0xde, 0xcc, 0xce, 0x0e, 0x82, 0xaa, 0xab, 0x4c, 0x85, 0xd3,
@@ -1045,7 +1031,7 @@ mod test {
 	fn test_raw_signed_invoice_deserialization() {
 		use TaggedField::*;
 		use secp256k1::recovery::{RecoveryId, RecoverableSignature};
-		use {SignedRawInvoice, Signature, RawInvoice, RawHrp, RawDataPart, Currency, Sha256,
+		use {SignedRawInvoice, InvoiceSignature, RawInvoice, RawHrp, RawDataPart, Currency, Sha256,
 			 PositiveTimestamp};
 
 		assert_eq!(
@@ -1078,7 +1064,7 @@ mod test {
 					0x7b, 0x1d, 0x85, 0x8d, 0xb1, 0xd1, 0xf7, 0xab, 0x71, 0x37, 0xdc, 0xb7,
 					0x83, 0x5d, 0xb2, 0xec, 0xd5, 0x18, 0xe1, 0xc9
 				],
-				signature: Signature(RecoverableSignature::from_compact(
+				signature: InvoiceSignature(RecoverableSignature::from_compact(
 					& [
 						0x38u8, 0xec, 0x68, 0x91, 0x34, 0x5e, 0x20, 0x41, 0x45, 0xbe, 0x8a,
 						0x3a, 0x99, 0xde, 0x38, 0xe9, 0x8a, 0x39, 0xd6, 0xa5, 0x69, 0x43,