convert to safe but extremely verbose type conversion.

@rphmeier any more concise way of doing this?
paritytech · Dec 11, 2017 · 84b9f84 · rphmeier · Dec 12, 2017 · rphmeier
1 parent 13dcd89
commit 84b9f84
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/state_machine/Cargo.toml b/state_machine/Cargo.toml
@@ -11,3 +11,4 @@ keccak-hash = "0.1.0"
 patricia-trie = "0.1.0"
 memorydb = "0.1.1"
 triehash = "0.1"
+byteorder = "1.1"
diff --git a/state_machine/src/backend.rs b/state_machine/src/backend.rs
@@ -82,10 +82,14 @@ impl Backend for InMemory {
 		self.inner.update(changes);
 
 		// fully recalculate trie roots.
-		use std::mem::transmute;
 		let storage_roots = self.inner.storage.iter().map(|(object, storage)| {
 			let flat_trie = storage.iter().map(|(k, v)| (k.to_vec(), v.clone())).collect();
-			(unsafe { transmute::<u64, [u8; 8]>(object.to_be()) }.to_vec(), sec_trie_root(flat_trie).to_vec())
+			({
+				use byteorder::{BigEndian, ByteOrder};
+				let mut r = [0u8; 8];
+				BigEndian::write_u64(&mut r, *object);
+				r.to_vec()
+			}, sec_trie_root(flat_trie).to_vec())
 		}).collect();
 
 		let storage_tree_root = H256(sec_trie_root(storage_roots).0);

diff --git a/state_machine/src/lib.rs b/state_machine/src/lib.rs
@@ -27,6 +27,8 @@ extern crate keccak_hash;
 extern crate patricia_trie;
 extern crate triehash;
 
+extern crate byteorder;
+
 use std::collections::HashMap;
 use std::fmt;