X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning-invoice%2Fsrc%2Fser.rs;h=dc5dba45da0fe46c24bbf6f8b664dbef76f175b5;hb=34f8dd9a49060676da0cf4157613cfb5fd58cf1e;hp=f921a5b0f6959a832c0eea01c915635ba1820859;hpb=a82067d3595a782d656f18d544145b547e27abc4;p=rust-lightning

diff --git a/lightning-invoice/src/ser.rs b/lightning-invoice/src/ser.rs
index f921a5b0..dc5dba45 100644
--- a/lightning-invoice/src/ser.rs
+++ b/lightning-invoice/src/ser.rs
@@ -3,8 +3,8 @@ use core::fmt::{Display, Formatter};
 use bech32::{ToBase32, u5, WriteBase32, Base32Len};
 use crate::prelude::*;
 
-use super::{Invoice, Sha256, TaggedField, ExpiryTime, MinFinalCltvExpiry, Fallback, PayeePubKey, InvoiceSignature, PositiveTimestamp,
-	PrivateRoute, Description, RawTaggedField, Currency, RawHrp, SiPrefix, constants, SignedRawInvoice, RawDataPart};
+use super::{Bolt11Invoice, Sha256, TaggedField, ExpiryTime, MinFinalCltvExpiryDelta, Fallback, PayeePubKey, Bolt11InvoiceSignature, PositiveTimestamp,
+	PrivateRoute, Description, RawTaggedField, Currency, RawHrp, SiPrefix, constants, SignedRawBolt11Invoice, RawDataPart};
 
 /// Converts a stream of bytes written to it to base32. On finalization the according padding will
 /// be applied. That means the results of writing two data blocks with one or two `BytesToBase32`
@@ -47,7 +47,7 @@ impl<'a, W: WriteBase32> BytesToBase32<'a, W> {
 			self.writer.write_u5(
 				u5::try_from_u8((self.buffer & 0b11111000) >> 3 ).expect("<32")
 			)?;
-			self.buffer = self.buffer << 5;
+			self.buffer <<= 5;
 			self.buffer_bits -= 5;
 		}
 
@@ -58,7 +58,7 @@ impl<'a, W: WriteBase32> BytesToBase32<'a, W> {
 
 		self.writer.write_u5(u5::try_from_u8(from_buffer | from_byte).expect("<32"))?;
 		self.buffer = byte << (5 - self.buffer_bits);
-		self.buffer_bits = 3 + self.buffer_bits;
+		self.buffer_bits += 3;
 
 		Ok(())
 	}
@@ -75,7 +75,7 @@ impl<'a, W: WriteBase32> BytesToBase32<'a, W> {
 			self.writer.write_u5(
 				u5::try_from_u8((self.buffer & 0b11111000) >> 3).expect("<32")
 			)?;
-			self.buffer = self.buffer << 5;
+			self.buffer <<= 5;
 			self.buffer_bits -= 5;
 		}
 
@@ -106,13 +106,13 @@ fn bytes_size_to_base32_size(byte_size: usize) -> usize {
 	}
 }
 
-impl Display for Invoice {
+impl Display for Bolt11Invoice {
 	fn fmt(&self, f: &mut Formatter) -> Result<(), fmt::Error> {
 		self.signed_invoice.fmt(f)
 	}
 }
 
-impl Display for SignedRawInvoice {
+impl Display for SignedRawBolt11Invoice {
 	fn fmt(&self, f: &mut Formatter) -> Result<(), fmt::Error> {
 		let hrp = self.raw_invoice.hrp.to_string();
 		let mut data  = self.raw_invoice.data.to_base32();
@@ -124,7 +124,7 @@ impl Display for SignedRawInvoice {
 	}
 }
 
-/// (C-not exported)
+/// This is not exported to bindings users
 impl Display for RawHrp {
 	fn fmt(&self, f: &mut Formatter) -> Result<(), fmt::Error> {
 		let amount = match self.raw_amount {
@@ -313,13 +313,13 @@ impl Base32Len for ExpiryTime {
 	}
 }
 
-impl ToBase32 for MinFinalCltvExpiry {
+impl ToBase32 for MinFinalCltvExpiryDelta {
 	fn write_base32<W: WriteBase32>(&self, writer: &mut W) -> Result<(), <W as WriteBase32>::Err> {
 		writer.write(&encode_int_be_base32(self.0))
 	}
 }
 
-impl Base32Len for MinFinalCltvExpiry {
+impl Base32Len for MinFinalCltvExpiryDelta {
 	fn base32_len(&self) -> usize {
 		encoded_int_be_base32_size(self.0)
 	}
@@ -329,7 +329,7 @@ impl ToBase32 for Fallback {
 	fn write_base32<W: WriteBase32>(&self, writer: &mut W) -> Result<(), <W as WriteBase32>::Err> {
 		match *self {
 			Fallback::SegWitProgram {version: v, program: ref p} => {
-				writer.write_u5(v)?;
+				writer.write_u5(Into::<u5>::into(v))?;
 				p.write_base32(writer)
 			},
 			Fallback::PubKeyHash(ref hash) => {
@@ -434,8 +434,8 @@ impl ToBase32 for TaggedField {
 			TaggedField::ExpiryTime(ref duration) => {
 				write_tagged_field(writer, constants::TAG_EXPIRY_TIME, duration)
 			},
-			TaggedField::MinFinalCltvExpiry(ref expiry) => {
-				write_tagged_field(writer, constants::TAG_MIN_FINAL_CLTV_EXPIRY, expiry)
+			TaggedField::MinFinalCltvExpiryDelta(ref expiry) => {
+				write_tagged_field(writer, constants::TAG_MIN_FINAL_CLTV_EXPIRY_DELTA, expiry)
 			},
 			TaggedField::Fallback(ref fallback_address) => {
 				write_tagged_field(writer, constants::TAG_FALLBACK, fallback_address)
@@ -446,6 +446,9 @@ impl ToBase32 for TaggedField {
 			TaggedField::PaymentSecret(ref payment_secret) => {
 				  write_tagged_field(writer, constants::TAG_PAYMENT_SECRET, payment_secret)
 			},
+			TaggedField::PaymentMetadata(ref payment_metadata) => {
+				  write_tagged_field(writer, constants::TAG_PAYMENT_METADATA, payment_metadata)
+			},
 			TaggedField::Features(ref features) => {
 				write_tagged_field(writer, constants::TAG_FEATURES, features)
 			},
@@ -453,7 +456,7 @@ impl ToBase32 for TaggedField {
 	}
 }
 
-impl ToBase32 for InvoiceSignature {
+impl ToBase32 for Bolt11InvoiceSignature {
 	fn write_base32<W: WriteBase32>(&self, writer: &mut W) -> Result<(), <W as WriteBase32>::Err> {
 		let mut converter = BytesToBase32::new(writer);
 		let (recovery_id, signature) = self.0.serialize_compact();
@@ -469,7 +472,7 @@ mod test {
 
 	#[test]
 	fn test_currency_code() {
-		use Currency;
+		use crate::Currency;
 
 		assert_eq!("bc", Currency::Bitcoin.to_string());
 		assert_eq!("tb", Currency::BitcoinTestnet.to_string());
@@ -480,7 +483,7 @@ mod test {
 
 	#[test]
 	fn test_raw_hrp() {
-		use ::{Currency, RawHrp, SiPrefix};
+		use crate::{Currency, RawHrp, SiPrefix};
 
 		let hrp = RawHrp {
 			currency: Currency::Bitcoin,
@@ -493,7 +496,7 @@ mod test {
 
 	#[test]
 	fn test_encode_int_be_base32() {
-		use ser::encode_int_be_base32;
+		use crate::ser::encode_int_be_base32;
 
 		let input: u64 = 33764;
 		let expected_out = CheckBase32::check_base32(&[1, 0, 31, 4]).unwrap();
@@ -503,7 +506,7 @@ mod test {
 
 	#[test]
 	fn test_encode_int_be_base256() {
-		use ser::encode_int_be_base256;
+		use crate::ser::encode_int_be_base256;
 
 		let input: u64 = 16842530;
 		let expected_out = vec![1, 0, 255, 34];