|
36 | 36 | //! # #[cfg(feature = "no-std")]
|
37 | 37 | //! # extern crate core2;
|
38 | 38 | //! #
|
| 39 | +//! # use lightning::io; |
39 | 40 | //! # use lightning::ln::{PaymentHash, PaymentPreimage, PaymentSecret};
|
40 | 41 | //! # use lightning::ln::channelmanager::{ChannelDetails, PaymentId, PaymentSendFailure};
|
41 | 42 | //! # use lightning::ln::msgs::LightningError;
|
|
51 | 52 | //! # use std::cell::RefCell;
|
52 | 53 | //! # use std::ops::Deref;
|
53 | 54 | //! #
|
54 |
| -//! # #[cfg(not(feature = "std"))] |
55 |
| -//! # use core2::io; |
56 |
| -//! # #[cfg(feature = "std")] |
57 |
| -//! # use std::io; |
58 |
| -//! # |
59 | 55 | //! # struct FakeEventProvider {}
|
60 | 56 | //! # impl EventsProvider for FakeEventProvider {
|
61 | 57 | //! # fn process_pending_events<H: Deref>(&self, handler: H) where H::Target: EventHandler {}
|
@@ -147,6 +143,7 @@ use bitcoin_hashes::Hash;
|
147 | 143 | use bitcoin_hashes::sha256::Hash as Sha256;
|
148 | 144 |
|
149 | 145 | use crate::prelude::*;
|
| 146 | +use lightning::io; |
150 | 147 | use lightning::ln::{PaymentHash, PaymentPreimage, PaymentSecret};
|
151 | 148 | use lightning::ln::channelmanager::{ChannelDetails, PaymentId, PaymentSendFailure};
|
152 | 149 | use lightning::ln::msgs::LightningError;
|
@@ -752,14 +749,12 @@ impl InFlightHtlcs {
|
752 | 749 | }
|
753 | 750 | }
|
754 | 751 |
|
755 |
| -#[cfg(not(feature = "no-std"))] |
756 | 752 | 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) } |
758 | 754 | }
|
759 | 755 |
|
760 |
| -#[cfg(not(feature = "no-std"))] |
761 | 756 | 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> { |
763 | 758 | let infight_map: HashMap<(u64, bool), u64> = lightning::util::ser::Readable::read(reader)?;
|
764 | 759 | Ok(Self(infight_map))
|
765 | 760 | }
|
|
0 commit comments