Skip to content

Commit ebb55ff

Browse files
committed
Expose VecWriter outside of util::ser since peer_handler uses it
1 parent 6a18959 commit ebb55ff

File tree

2 files changed

+2
-13
lines changed

2 files changed

+2
-13
lines changed

lightning/src/ln/peer_handler.rs

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ use ln::features::InitFeatures;
1212
use ln::msgs;
1313
use ln::msgs::ChannelMessageHandler;
1414
use ln::channelmanager::{SimpleArcChannelManager, SimpleRefChannelManager};
15-
use util::ser::{Writeable, Writer, Readable};
15+
use util::ser::{Writeable, Readable, VecWriter};
1616
use ln::peer_channel_encryptor::{PeerChannelEncryptor,NextNoiseStep};
1717
use util::byte_utils;
1818
use util::events::{MessageSendEvent, MessageSendEventsProvider};
@@ -191,17 +191,6 @@ pub struct PeerManager<Descriptor: SocketDescriptor, CM: Deref> where CM::Target
191191
logger: Arc<Logger>,
192192
}
193193

194-
struct VecWriter(Vec<u8>);
195-
impl Writer for VecWriter {
196-
fn write_all(&mut self, buf: &[u8]) -> Result<(), ::std::io::Error> {
197-
self.0.extend_from_slice(buf);
198-
Ok(())
199-
}
200-
fn size_hint(&mut self, size: usize) {
201-
self.0.reserve_exact(size);
202-
}
203-
}
204-
205194
macro_rules! encode_msg {
206195
($msg: expr, $msg_code: expr) => {{
207196
let mut msg = VecWriter(Vec::new());

lightning/src/util/ser.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ impl<'a, W: Writer + 'a> Write for WriterWriteAdaptor<'a, W> {
5757
}
5858
}
5959

60-
struct VecWriter(Vec<u8>);
60+
pub(crate) struct VecWriter(pub Vec<u8>);
6161
impl Writer for VecWriter {
6262
fn write_all(&mut self, buf: &[u8]) -> Result<(), ::std::io::Error> {
6363
self.0.extend_from_slice(buf);

0 commit comments

Comments
 (0)