Skip to content

Commit b06db09

Browse files
committed
Expose VecWriter outside of util::ser since peer_handler uses it
1 parent 0ed2ec9 commit b06db09

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,13 +12,13 @@ use ln::features::InitFeatures;
1212
use ln::msgs;
1313
use ln::msgs::ChannelMessageHandler;
1414
use ln::channelmanager::{SimpleArcChannelManager, SimpleRefChannelManager};
15+
use util::ser::VecWriter;
1516
use ln::peer_channel_encryptor::{PeerChannelEncryptor,NextNoiseStep};
1617
use ln::wire;
1718
use ln::wire::Encode;
1819
use util::byte_utils;
1920
use util::events::{MessageSendEvent, MessageSendEventsProvider};
2021
use util::logger::Logger;
21-
use util::ser::Writer;
2222

2323
use std::collections::{HashMap,hash_map,HashSet,LinkedList};
2424
use std::sync::{Arc, Mutex};
@@ -192,17 +192,6 @@ pub struct PeerManager<Descriptor: SocketDescriptor, CM: Deref> where CM::Target
192192
logger: Arc<Logger>,
193193
}
194194

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