raw bytes refactoring

util/src/bytes.rs

@@ -247,7 +247,7 @@ pub trait FromRawBytes : Sized {
 	fn from_bytes(d: &[u8]) -> Result<Self, FromBytesError>;
 }
 
-impl<T> FromRawBytes for T where T: Sized + FixedHash {
+impl<T> FromRawBytes for (T) where T: FixedHash {
 	fn from_bytes(bytes: &[u8]) -> Result<Self, FromBytesError> {
 		use std::mem;
 		use std::cmp::Ordering;
@@ -263,15 +263,79 @@ impl<T> FromRawBytes for T where T: Sized + FixedHash {
 	}
 }
 
-impl FromRawBytes for String {
+impl FromRawBytes for u16 {
-	fn from_bytes(bytes: &[u8]) -> Result<String, FromBytesError> {
+	fn from_bytes(bytes: &[u8]) -> Result<Self, FromBytesError> {
+		use std::mem;
+		use std::cmp::Ordering;
+
+		match bytes.len().cmp(&2) {
+			Ordering::Less => return Err(FromBytesError::NotLongEnough),
+			Ordering::Greater => return Err(FromBytesError::TooLong),
+			Ordering::Equal => ()
+		};
+		let mut res: Self = unsafe { mem::uninitialized() };
+		res.copy_raw(bytes);
+		Ok(res)
+	}
+}
+
+impl FromRawBytes for u8 {
+	fn from_bytes(bytes: &[u8]) -> Result<Self, FromBytesError> {
+		use std::mem;
+		use std::cmp::Ordering;
+
+		match bytes.len().cmp(&1) {
+			Ordering::Less => return Err(FromBytesError::NotLongEnough),
+			Ordering::Greater => return Err(FromBytesError::TooLong),
+			Ordering::Equal => ()
+		};
+		let mut res: Self = unsafe { mem::uninitialized() };
+		res.copy_raw(bytes);
+		Ok(res)
+	}
+}
+
+pub trait FromRawBytesVariable : Sized {
+	fn from_bytes_var(d: &[u8], len: u64) -> Result<Self, FromBytesError>;
+}
+
+impl<T> FromRawBytesVariable for T where T: FromRawBytes {
+	fn from_bytes_var(d: &[u8], _len: u64) -> Result<Self, FromBytesError> {
+		T::from_bytes(d)
+	}
+}
+
+impl FromRawBytesVariable for String {
+	fn from_bytes_var(bytes: &[u8], _len: u64) -> Result<String, FromBytesError> {
 		Ok(::std::str::from_utf8(bytes).unwrap().to_owned())
 	}
 }
 
-impl FromRawBytes for Vec<u8> {
+impl<T> FromRawBytesVariable for Vec<T> where T: FromRawBytes {
-	fn from_bytes(bytes: &[u8]) -> Result<Vec<u8>, FromBytesError> {
+	fn from_bytes_var(d: &[u8], len: u64) -> Result<Self, FromBytesError> {
-		Ok(bytes.clone().to_vec())
+		let size_of_t = ::std::mem::size_of::<T>();
+		assert_eq!(len, 8);
+		let length_in_chunks = len as usize / size_of_t;
+
+		let mut result = Vec::with_capacity(length_in_chunks as usize);
+		unsafe { result.set_len(length_in_chunks as usize) };
+		for i in 0..length_in_chunks { *result.get_mut(i).unwrap() = try!(T::from_bytes(&d[size_of_t * i..size_of_t * (i+1)])) }
+		Ok(result)
+	}
+}
+
+impl<V1, T2> FromRawBytes for (V1, T2) where V1: FromRawBytesVariable, T2: FromRawBytes {
+	fn from_bytes(d: &[u8]) -> Result<Self, FromBytesError> {
+		let header = 8usize;
+		let mut map: (u64, ) = unsafe { ::std::mem::uninitialized() };
+
+		if d.len() < header { return  Err(FromBytesError::NotLongEnough); }
+		map.copy_raw(&d[0..header]);
+
+		Ok((
+			try!(V1::from_bytes_var(&d[header..header + (map.0 as usize)], map.0)),
+			try!(T2::from_bytes(&d[header + (map.0 as usize)..d.len()])),
+		))
 	}
 }
 
@@ -326,3 +390,24 @@ fn populate_big_types() {
 	h.copy_raw_from(&a);
 	assert_eq!(h, h256_from_hex("ffffffffffffffffffffffffffffffffffffffff000000000000000000000069"));
 }
+
+#[test]
+fn raw_bytes_from_tuple() {
+	let tup = (vec![1u16, 1u16, 1u16, 1u16], 10u16);
+	let bytes = vec![
+		// map
+		8u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8,
+		// four 1u16
+		0u8, 1u8,
+		0u8, 1u8,
+		0u8, 1u8,
+		0u8, 1u8,
+		// 10u16
+		0u8, 10u8];
+
+	type tup = (Vec<u16>, u16);
+
+	let tup_from = tup::from_bytes(&bytes).unwrap();
+
+	assert_eq!(tup, tup_from);
+}

util/src/keys/store.rs

@@ -34,11 +34,11 @@ const KEY_LENGTH_AES_USIZE: usize = KEY_LENGTH_AES as usize;
 /// Encrypted hash-map, each request should contain password
 pub trait EncryptedHashMap<Key: Hash + Eq> {
 	/// Returns existing value for the key, if any
-	fn get<Value: FromRawBytes + BytesConvertable>(&self, key: &Key, password: &str) ->  Result<Value, EncryptedHashMapError>;
+	fn get<Value: FromRawBytesVariable + BytesConvertable>(&self, key: &Key, password: &str) ->  Result<Value, EncryptedHashMapError>;
 	/// Insert new encrypted key-value and returns previous if there was any
-	fn insert<Value: FromRawBytes + BytesConvertable>(&mut self, key: Key, value: Value, password: &str) -> Option<Value>;
+	fn insert<Value: FromRawBytesVariable + BytesConvertable>(&mut self, key: Key, value: Value, password: &str) -> Option<Value>;
 	/// Removes key-value by key and returns the removed one, if any exists and password was provided
-	fn remove<Value: FromRawBytes + BytesConvertable> (&mut self, key: &Key, password: Option<&str>) -> Option<Value>;
+	fn remove<Value: FromRawBytesVariable + BytesConvertable> (&mut self, key: &Key, password: Option<&str>) -> Option<Value>;
 	/// Deletes key-value by key and returns if the key-value existed
 	fn delete(&mut self, key: &Key) -> bool {
 		self.remove::<Bytes>(key, None).is_some()
@@ -306,7 +306,7 @@ fn derive_mac(derived_left_bits: &[u8], cipher_text: &[u8]) -> Bytes {
 }
 
 impl EncryptedHashMap<H128> for SecretStore {
-	fn get<Value: FromRawBytes + BytesConvertable>(&self, key: &H128, password: &str) -> Result<Value, EncryptedHashMapError> {
+	fn get<Value: FromRawBytesVariable + BytesConvertable>(&self, key: &H128, password: &str) -> Result<Value, EncryptedHashMapError> {
 		match self.directory.get(key) {
 			Some(key_file) => {
 				let (derived_left_bits, derived_right_bits) = match key_file.crypto.kdf {
@@ -324,7 +324,7 @@ impl EncryptedHashMap<H128> for SecretStore {
 					}
 				};
 
-				match Value::from_bytes(&val) {
+				match Value::from_bytes_var(&val, val.len() as u64) {
 					Ok(value) => Ok(value),
 					Err(bytes_error) => Err(EncryptedHashMapError::InvalidValueFormat(bytes_error))
 				}
@@ -333,7 +333,7 @@ impl EncryptedHashMap<H128> for SecretStore {
 		}
 	}
 
-	fn insert<Value: FromRawBytes + BytesConvertable>(&mut self, key: H128, value: Value, password: &str) -> Option<Value> {
+	fn insert<Value: FromRawBytesVariable + BytesConvertable>(&mut self, key: H128, value: Value, password: &str) -> Option<Value> {
 		let previous = if let Ok(previous_value) = self.get(&key, password) { Some(previous_value) } else { None };
 
 		// crypto random initiators
@@ -366,7 +366,7 @@ impl EncryptedHashMap<H128> for SecretStore {
 		previous
 	}
 
-	fn remove<Value: FromRawBytes + BytesConvertable>(&mut self, key: &H128, password: Option<&str>) -> Option<Value> {
+	fn remove<Value: FromRawBytesVariable + BytesConvertable>(&mut self, key: &H128, password: Option<&str>) -> Option<Value> {
 		let previous = if let Some(pass) = password {
 			if let Ok(previous_value) = self.get(&key, pass) { Some(previous_value) } else { None }
 		}