From 4a1830c423c7cab5ad9d3308b875a00ed5d568da Mon Sep 17 00:00:00 2001
From: Elichai Turkel <elichai.turkel@gmail.com>
Date: Wed, 7 Aug 2019 11:35:22 -0400
Subject: [PATCH] Replaced Read trait with a generic over Read (#307)

Removed tempfile usage from stream_reader
---
 Cargo.toml                   |  1 -
 src/network/stream_reader.rs | 48 +++++++++++-------------------------
 2 files changed, 15 insertions(+), 34 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 62c4483c..10f614bf 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -41,4 +41,3 @@ features = [ "rand" ]
 serde_derive = "1"
 serde_json = "1"
 serde_test = "1"
-tempfile = "3"
diff --git a/src/network/stream_reader.rs b/src/network/stream_reader.rs
index 23de2f0e..70161bef 100644
--- a/src/network/stream_reader.rs
+++ b/src/network/stream_reader.rs
@@ -28,26 +28,26 @@ use network::message::RawNetworkMessage;
 use consensus::encode;
 
 /// Struct used to configure stream reader function
-pub struct StreamReader<'a> {
+pub struct StreamReader<R> {
     /// Stream to read from
-    pub stream: &'a mut Read,
+    pub stream: R,
     /// I/O buffer
     data: Vec<u8>,
     /// Buffer containing unparsed message part
     unparsed: Vec<u8>
 }
 
-impl<'a> fmt::Debug for StreamReader<'a> {
+impl<R> fmt::Debug for StreamReader<R> {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         write!(f, "StreamReader with buffer_size={} and unparsed content {:?}",
                self.data.capacity(), self.unparsed)
     }
 }
 
-impl<'a> StreamReader<'a> {
+impl<R: Read> StreamReader<R> {
     /// Constructs new stream reader for a given input stream `stream` with
     /// optional parameter `buffer_size` determining reading buffer size
-    pub fn new(stream: &mut Read, buffer_size: Option<usize>) -> StreamReader {
+    pub fn new(stream: R, buffer_size: Option<usize>) -> StreamReader<R> {
         StreamReader {
             stream,
             data: vec![0u8; buffer_size.unwrap_or(64 * 1024)],
@@ -84,12 +84,10 @@ impl<'a> StreamReader<'a> {
 
 #[cfg(test)]
 mod test {
-    extern crate tempfile;
 
     use std::thread;
-    use std::fs::File;
     use std::time::Duration;
-    use std::io::{Write, Seek, SeekFrom};
+    use std::io::{self, Write};
     use std::net::{TcpListener, TcpStream, Shutdown};
     use std::thread::JoinHandle;
 
@@ -198,8 +196,7 @@ mod test {
 
     #[test]
     fn parse_multipartmsg_test() {
-        let mut tmpfile: File = tempfile::tempfile().unwrap();
-        let mut reader = StreamReader::new(&mut tmpfile, None);
+        let mut reader = StreamReader::new(io::empty(), None);
         reader.unparsed = MSG_ALERT[..24].to_vec();
         assert!(reader.next_message().is_err());
         assert_eq!(reader.unparsed.len(), 24);
@@ -211,33 +208,18 @@ mod test {
         check_alert_msg(&message);
     }
 
-    fn init_stream(buf: &[u8]) -> File {
-        let mut tmpfile: File = tempfile::tempfile().unwrap();
-        write_file(&mut tmpfile, &buf);
-        tmpfile
-    }
-
-    fn write_file(tmpfile: &mut File, buf: &[u8]) {
-        tmpfile.seek(SeekFrom::End(0)).unwrap();
-        tmpfile.write(&buf).unwrap();
-        tmpfile.flush().unwrap();
-        tmpfile.seek(SeekFrom::Start(0)).unwrap();
-    }
-
     #[test]
     fn read_singlemsg_test() {
-        let mut stream = init_stream(&MSG_VERSION);
-        let message = StreamReader::new(&mut stream, None).next_message().unwrap();
-
+        let message = StreamReader::new(&MSG_VERSION[..], None).next_message().unwrap();
         check_version_msg(&message);
     }
 
     #[test]
     fn read_doublemsgs_test() {
-        let mut stream = init_stream(&MSG_VERSION);
-        write_file(&mut stream, &MSG_PING);
+        let mut stream = MSG_VERSION.to_vec();
+        stream.extend(&MSG_PING);
 
-        let mut reader = StreamReader::new(&mut stream, None);
+        let mut reader = StreamReader::new(&stream[..], None);
         let message = reader.next_message().unwrap();
         check_version_msg(&message);
 
@@ -283,11 +265,11 @@ mod test {
     #[test]
     fn read_multipartmsg_test() {
         // Setting up TCP connection emulation
-        let (handle, mut istream) = serve_tcp(vec![
+        let (handle, istream) = serve_tcp(vec![
             // single message split in two parts to emulate real network conditions
             MSG_VERSION[..24].to_vec(), MSG_VERSION[24..].to_vec()
         ]);
-        let mut reader = StreamReader::new(&mut istream, None);
+        let mut reader = StreamReader::new(istream, None);
 
         // Reading and checking the whole message back
         let message = reader.next_message().unwrap();
@@ -300,13 +282,13 @@ mod test {
     #[test]
     fn read_sequencemsg_test() {
         // Setting up TCP connection emulation
-        let (handle, mut istream) = serve_tcp(vec![
+        let (handle, istream) = serve_tcp(vec![
             // Real-world Bitcoin core communication case for /Satoshi:0.17.1/
             MSG_VERSION[..23].to_vec(), MSG_VERSION[23..].to_vec(),
             MSG_VERACK.to_vec(),
             MSG_ALERT[..24].to_vec(), MSG_ALERT[24..].to_vec()
         ]);
-        let mut reader = StreamReader::new(&mut istream, None);
+        let mut reader = StreamReader::new(istream, None);
 
         // Reading and checking the first message (Version)
         let message = reader.next_message().unwrap();