Fuzz fix

Author: optout21

fuzz/src/bolt11_deser.rs

@@ -11,7 +11,8 @@ use crate::utils::test_logger;
 use bech32::Fe32;
 use bitcoin::secp256k1::{Secp256k1, SecretKey};
 use lightning_invoice::{
-	Bolt11Invoice, FromBase32, RawBolt11Invoice, RawDataPart, RawHrp, RawTaggedField, TaggedField,
+	Base32Iterable, Bolt11Invoice, FromBase32, RawBolt11Invoice, RawDataPart, RawHrp,
+	RawTaggedField, TaggedField,
 };
 use std::str::FromStr;
 
@@ -31,12 +32,13 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], _out: Out) {
 			Err(_) => return,
 		};
 
+		let invoice_data_base32 = invoice_data.fe_iter().collect::<Vec<_>>();
 		// Our data encoding is not worse than the input
-		assert!(invoice_data.to_base32().len() <= bech32.len());
+		assert!(invoice_data_base32.len() <= bech32.len());
 
 		// Our data serialization is loss-less
 		assert_eq!(
-			RawDataPart::from_base32(&invoice_data.to_base32())
+			RawDataPart::from_base32(&invoice_data_base32)
 				.expect("faild parsing out own encoding"),
 			invoice_data
 		);

lightning-invoice/src/lib.rs

@@ -77,6 +77,10 @@ mod prelude {
 
 use crate::prelude::*;
 
+/// Re-export serialization traits
+#[cfg(fuzzing)]
+pub use crate::ser::Base32Iterable;
+
 /// Trait for paring/converting base32 slice.
 pub trait FromBase32: Sized {
 	/// The associated error which can be returned from parsing (e.g. because of bad padding).

lightning-invoice/src/ser.rs

@@ -12,7 +12,7 @@ use super::{Bolt11Invoice, Bolt11InvoiceFeatures, Sha256, TaggedField, ExpiryTim
 /// Objects that can be encoded to base32 (bech32).
 ///
 /// Private to this crate to avoid polluting the API.
-pub(crate) trait Base32Iterable {
+pub trait Base32Iterable {
 	/// apoelstra: In future we want to replace this Box<dyn Iterator> with an explicit
 	/// associated type, to avoid the allocation. But we cannot do this until
 	/// Rust 1.65 and GATs since the iterator may contain a reference to self.