f - use u64 instead of BigSize

Author: jkczyz

lightning/src/offers/merkle.rs

@@ -33,7 +33,7 @@ fn root_hash(data: &[u8]) -> sha256::Hash {
 
 	let mut leaves = Vec::new();
 	for record in tlv_stream {
-		if !SIGNATURE_TYPES.contains(&record.r#type.0) {
+		if !SIGNATURE_TYPES.contains(&record.r#type) {
 			leaves.push(tagged_hash_from_engine(leaf_tag.clone(), &record));
 			leaves.push(tagged_hash_from_engine(nonce_tag.clone(), &record.type_bytes));
 		}
@@ -102,7 +102,7 @@ impl<'a> TlvStream<'a> {
 
 /// A slice into a [`TlvStream`] for a record.
 struct TlvRecord<'a> {
-	r#type: BigSize,
+	r#type: u64,
 	type_bytes: &'a [u8],
 	data: &'a [u8],
 }
@@ -118,13 +118,13 @@ impl<'a> Iterator for TlvStream<'a> {
 		if self.data.position() < self.data.get_ref().len() as u64 {
 			let start = self.data.position();
 
-			let r#type: BigSize = Readable::read(&mut self.data).unwrap();
+			let r#type = <BigSize as Readable>::read(&mut self.data).unwrap().0;
 			let offset = self.data.position();
 			let type_bytes = &self.data.get_ref()[start as usize..offset as usize];
 
-			let length: BigSize = Readable::read(&mut self.data).unwrap();
+			let length = <BigSize as Readable>::read(&mut self.data).unwrap().0;
 			let offset = self.data.position();
-			let end = offset + length.0;
+			let end = offset + length;
 
 			let _value = &self.data.get_ref()[offset as usize..end as usize];
 			let data = &self.data.get_ref()[start as usize..end as usize];