Use lightning::io for reading/writing InFlightHtlcs

Author: jurvis

lightning-invoice/src/payment.rs

@@ -36,6 +36,7 @@
 //! # #[cfg(feature = "no-std")]
 //! # extern crate core2;
 //! #
+//! # use lightning::io;
 //! # use lightning::ln::{PaymentHash, PaymentPreimage, PaymentSecret};
 //! # use lightning::ln::channelmanager::{ChannelDetails, PaymentId, PaymentSendFailure};
 //! # use lightning::ln::msgs::LightningError;
@@ -51,11 +52,6 @@
 //! # use std::cell::RefCell;
 //! # use std::ops::Deref;
 //! #
-//! # #[cfg(not(feature = "std"))]
-//! # use core2::io;
-//! # #[cfg(feature = "std")]
-//! # use std::io;
-//! #
 //! # struct FakeEventProvider {}
 //! # impl EventsProvider for FakeEventProvider {
 //! #     fn process_pending_events<H: Deref>(&self, handler: H) where H::Target: EventHandler {}
@@ -147,6 +143,7 @@ use bitcoin_hashes::Hash;
 use bitcoin_hashes::sha256::Hash as Sha256;
 
 use crate::prelude::*;
+use lightning::io;
 use lightning::ln::{PaymentHash, PaymentPreimage, PaymentSecret};
 use lightning::ln::channelmanager::{ChannelDetails, PaymentId, PaymentSendFailure};
 use lightning::ln::msgs::LightningError;
@@ -752,14 +749,12 @@ impl InFlightHtlcs {
 	}
 }
 
-#[cfg(not(feature = "no-std"))]
 impl lightning::util::ser::Writeable for InFlightHtlcs {
-	fn write<W: lightning::util::ser::Writer>(&self, writer: &mut W) -> Result<(), std::io::Error> { self.0.write(writer) }
+	fn write<W: lightning::util::ser::Writer>(&self, writer: &mut W) -> Result<(), io::Error> { self.0.write(writer) }
 }
 
-#[cfg(not(feature = "no-std"))]
 impl lightning::util::ser::Readable for InFlightHtlcs {
-	fn read<R: lightning::io::Read>(reader: &mut R) -> Result<Self, lightning::ln::msgs::DecodeError> {
+	fn read<R: io::Read>(reader: &mut R) -> Result<Self, lightning::ln::msgs::DecodeError> {
 		let infight_map: HashMap<(u64, bool), u64> = lightning::util::ser::Readable::read(reader)?;
 		Ok(Self(infight_map))
 	}