Switch RequiredWrapper to LengthReadable

arik-so · arik-so · commit a94126b23bc8 · 2025-02-09T22:41:16.000-08:00
diff --git a/lightning/src/util/ser.rs b/lightning/src/util/ser.rs
@@ -403,10 +403,10 @@ impl<T: Readable> MaybeReadable for T {
 ///
 /// This is not exported to bindings users as manual TLV building is not currently supported in bindings
 pub struct RequiredWrapper<T>(pub Option<T>);
-impl<T: Readable> Readable for RequiredWrapper<T> {
+impl<T: LengthReadable> LengthReadable for RequiredWrapper<T> {
 	#[inline]
-	fn read<R: Read>(reader: &mut R) -> Result<Self, DecodeError> {
-		Ok(Self(Some(Readable::read(reader)?)))
+	fn read_from_fixed_length_buffer<R: LengthRead>(reader: &mut R) -> Result<Self, DecodeError> {
+		Ok(Self(Some(LengthReadable::read_from_fixed_length_buffer(reader)?)))
 	}
 }
 impl<A, T: ReadableArgs<A>> ReadableArgs<A> for RequiredWrapper<T> {

Original file line number	Diff line number	Diff line change
`@@ -403,10 +403,10 @@ impl<T: Readable> MaybeReadable for T {`
`403`	`403`	`///`
`404`	`404`	`/// This is not exported to bindings users as manual TLV building is not currently supported in bindings`
`405`	`405`	`pub struct RequiredWrapper<T>(pub Option<T>);`
`406`		`-impl<T: Readable> Readable for RequiredWrapper<T> {`
	`406`	`+impl<T: LengthReadable> LengthReadable for RequiredWrapper<T> {`
`407`	`407`	`#[inline]`
`408`		`- fn read<R: Read>(reader: &mut R) -> Result<Self, DecodeError> {`
`409`		`- Ok(Self(Some(Readable::read(reader)?)))`
	`408`	`+ fn read_from_fixed_length_buffer<R: LengthRead>(reader: &mut R) -> Result<Self, DecodeError> {`
	`409`	`+ Ok(Self(Some(LengthReadable::read_from_fixed_length_buffer(reader)?)))`
`410`	`410`	`}`
`411`	`411`	`}`
`412`	`412`	`impl<A, T: ReadableArgs<A>> ReadableArgs<A> for RequiredWrapper<T> {`