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

diff --git a/lightning-invoice/src/ser.rs b/lightning-invoice/src/ser.rs
index f921a5b0..f5742289 100644
--- a/lightning-invoice/src/ser.rs
+++ b/lightning-invoice/src/ser.rs
@@ -3,7 +3,7 @@ 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,
+use super::{Invoice, Sha256, TaggedField, ExpiryTime, MinFinalCltvExpiryDelta, Fallback, PayeePubKey, InvoiceSignature, PositiveTimestamp,
 	PrivateRoute, Description, RawTaggedField, Currency, RawHrp, SiPrefix, constants, SignedRawInvoice, RawDataPart};
 
 /// Converts a stream of bytes written to it to base32. On finalization the according padding will
@@ -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)
 	}
@@ -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)
@@ -469,7 +469,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 +480,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 +493,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 +503,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];