Skip to content

Commit df9ea09

Browse files
committed
Use lightning::io for reading/writing InFlightHtlcs
1 parent b194c1d commit df9ea09

File tree

1 file changed

+4
-9
lines changed

1 file changed

+4
-9
lines changed

lightning-invoice/src/payment.rs

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
//! # #[cfg(feature = "no-std")]
3737
//! # extern crate core2;
3838
//! #
39+
//! # use lightning::io;
3940
//! # use lightning::ln::{PaymentHash, PaymentPreimage, PaymentSecret};
4041
//! # use lightning::ln::channelmanager::{ChannelDetails, PaymentId, PaymentSendFailure};
4142
//! # use lightning::ln::msgs::LightningError;
@@ -51,11 +52,6 @@
5152
//! # use std::cell::RefCell;
5253
//! # use std::ops::Deref;
5354
//! #
54-
//! # #[cfg(not(feature = "std"))]
55-
//! # use core2::io;
56-
//! # #[cfg(feature = "std")]
57-
//! # use std::io;
58-
//! #
5955
//! # struct FakeEventProvider {}
6056
//! # impl EventsProvider for FakeEventProvider {
6157
//! # fn process_pending_events<H: Deref>(&self, handler: H) where H::Target: EventHandler {}
@@ -147,6 +143,7 @@ use bitcoin_hashes::Hash;
147143
use bitcoin_hashes::sha256::Hash as Sha256;
148144

149145
use crate::prelude::*;
146+
use lightning::io;
150147
use lightning::ln::{PaymentHash, PaymentPreimage, PaymentSecret};
151148
use lightning::ln::channelmanager::{ChannelDetails, PaymentId, PaymentSendFailure};
152149
use lightning::ln::msgs::LightningError;
@@ -752,14 +749,12 @@ impl InFlightHtlcs {
752749
}
753750
}
754751

755-
#[cfg(not(feature = "no-std"))]
756752
impl lightning::util::ser::Writeable for InFlightHtlcs {
757-
fn write<W: lightning::util::ser::Writer>(&self, writer: &mut W) -> Result<(), std::io::Error> { self.0.write(writer) }
753+
fn write<W: lightning::util::ser::Writer>(&self, writer: &mut W) -> Result<(), io::Error> { self.0.write(writer) }
758754
}
759755

760-
#[cfg(not(feature = "no-std"))]
761756
impl lightning::util::ser::Readable for InFlightHtlcs {
762-
fn read<R: lightning::io::Read>(reader: &mut R) -> Result<Self, lightning::ln::msgs::DecodeError> {
757+
fn read<R: io::Read>(reader: &mut R) -> Result<Self, lightning::ln::msgs::DecodeError> {
763758
let infight_map: HashMap<(u64, bool), u64> = lightning::util::ser::Readable::read(reader)?;
764759
Ok(Self(infight_map))
765760
}

0 commit comments

Comments
 (0)