From 2635086e9731ec2fc2ca1e6e453484bc7e4f3578 Mon Sep 17 00:00:00 2001
From: Patrick Auernig <patrick.auernig@mykolab.com>
Date: Sat, 24 Mar 2018 15:15:48 +0100
Subject: [PATCH] Use byteorder crate instead of byte

---
 Cargo.toml             |  2 +-
 src/connection/unix.rs |  2 +-
 src/lib.rs             |  2 +-
 src/models/message.rs  | 46 ++++++++++++++----------------------------
 4 files changed, 18 insertions(+), 34 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index fab7ec8..5f1db91 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,7 +17,7 @@ maintenance = { status = "experimental" }
 serde        = "^1.0"
 serde_derive = "^1.0"
 serde_json   = "^1.0"
-byte         = "0.2"
+byteorder    = "^1.0"
 log          = "~0.4"
 libc         = "0.2.39" # until std::process::id is stable
 
diff --git a/src/connection/unix.rs b/src/connection/unix.rs
index f25d5a3..a00be9d 100644
--- a/src/connection/unix.rs
+++ b/src/connection/unix.rs
@@ -60,7 +60,7 @@ impl Connection for UnixConnection {
         let mut buf: Vec<u8> = vec![0; 1024];
         let n = self.socket.read(buf.as_mut_slice())?;
         buf.resize(n, 0);
-        debug!("{:?}", Message::decode(buf.as_ref()));
+        debug!("{:?}", Message::decode(&buf));
         Ok(buf)
     }
 }
diff --git a/src/lib.rs b/src/lib.rs
index 867af41..187af77 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -4,7 +4,7 @@ extern crate log;
 extern crate serde_derive;
 extern crate serde;
 extern crate serde_json;
-extern crate byte;
+extern crate byteorder;
 extern crate uuid;
 extern crate libc;
 
diff --git a/src/models/message.rs b/src/models/message.rs
index 77a4de7..fe8325c 100644
--- a/src/models/message.rs
+++ b/src/models/message.rs
@@ -1,5 +1,5 @@
-use byte::{TryRead, TryWrite, BytesExt, Result};
-use byte::ctx::{Endian, LE, Str};
+use std::io::{self, Write, Read, Result};
+use byteorder::{WriteBytesExt, ReadBytesExt, LittleEndian};
 use serde_json;
 use serde::Serialize;
 
@@ -9,33 +9,12 @@ pub enum OpCode {
     Frame,
 }
 
-#[derive(Debug, Default, Clone, PartialEq, Serialize, Deserialize)]
-#[repr(C)]
+#[derive(Debug, Default, Clone, PartialEq)]
 pub struct Message {
     opcode:  u32,
     message: String,
 }
 
-impl<'a> TryRead<'a, Endian> for Message {
-    fn try_read(bytes: &'a [u8], endian: Endian) -> Result<(Self, usize)> {
-        let offset = &mut 0;
-        let opcode: u32 = bytes.read_with(offset, endian)?;
-        let message_length = bytes.read_with::<u32>(offset, endian)? as usize;
-        let message = bytes.read_with::<&str>(offset, Str::Len(message_length))?.to_string();
-        Ok((Message { opcode, message }, *offset))
-    }
-}
-
-impl TryWrite<Endian> for Message {
-    fn try_write(self, bytes: &mut [u8], endian: Endian) -> Result<usize> {
-        let offset = &mut 0;
-        bytes.write_with::<u32>(offset, self.opcode, endian)?;
-        bytes.write_with::<u32>(offset, self.message.len() as u32, endian)?;
-        bytes.write_with::<&str>(offset, self.message.as_ref(), ())?;
-        Ok(*offset)
-    }
-}
-
 impl Message {
     pub fn new<T>(opcode: OpCode, message: T) -> Self
         where T: Serialize
@@ -47,15 +26,20 @@ impl Message {
     }
 
     pub fn encode(&self) -> Result<Vec<u8>> {
-        let mut bytes: Vec<u8> = vec![0; 2*4+self.message.len()];
-        bytes.write_with(&mut 0, self.clone(), LE)?;
+        let mut bytes: Vec<u8> = vec![];
+        bytes.write_u32::<LittleEndian>(self.opcode)?;
+        bytes.write_u32::<LittleEndian>(self.message.len() as u32)?;
+        write!(bytes, "{}", self.message)?;
         Ok(bytes)
     }
 
-    #[allow(dead_code)]
-    pub fn decode<'a>(bytes: &'a [u8]) -> Result<Self> {
-        let message: Message = bytes.read_with(&mut 0, LE)?;
-        Ok(message)
+    pub fn decode(bytes: &[u8]) -> Result<Self> {
+        let mut reader = io::Cursor::new(bytes);
+        let mut message = String::new();
+        let opcode = reader.read_u32::<LittleEndian>()?;
+        reader.read_u32::<LittleEndian>()?;
+        reader.read_to_string(&mut message)?;
+        Ok(Message { opcode, message })
     }
 }
 
@@ -72,7 +56,7 @@ mod tests {
     fn test_encoder() {
         let msg = Message::new(OpCode::Frame, Something { empty: true });
         let encoded = msg.encode().unwrap();
-        let decoded = Message::decode(encoded.as_ref()).unwrap();
+        let decoded = Message::decode(&encoded).unwrap();
         assert_eq!(msg, decoded);
     }
 }