From c2fca83ffff07a4e22ee4a117698750687b25c47 Mon Sep 17 00:00:00 2001
From: Gav <gavin@parity.io>
Date: Fri, 19 Jan 2018 22:09:01 +0100
Subject: [PATCH] Remove superfluous code.

---
 substrate/native-runtime/support/src/lib.rs   |  26 ++++--------------
 substrate/wasm-runtime/support/src/lib.rs     |  17 ------------
 .../release/runtime_polkadot.compact.wasm     | Bin 37802 -> 37802 bytes
 .../release/runtime_polkadot.wasm             | Bin 37859 -> 37859 bytes
 4 files changed, 5 insertions(+), 38 deletions(-)

diff --git a/substrate/native-runtime/support/src/lib.rs b/substrate/native-runtime/support/src/lib.rs
index cd1aa00eef..348c0b17a9 100644
--- a/substrate/native-runtime/support/src/lib.rs
+++ b/substrate/native-runtime/support/src/lib.rs
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
-//! Support functions.
+//! The with-std support functions for the runtime.
 
 #[macro_use]
 extern crate environmental;
@@ -36,6 +36,7 @@ pub use polkadot_state_machine::Externalities;
 // TODO: use the real error, not NoError.
 
 #[derive(Debug)]
+/// As it says - an empty type we use for errors.
 pub struct NoError;
 impl fmt::Display for NoError {
 	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { write!(f, "") }
@@ -43,12 +44,15 @@ impl fmt::Display for NoError {
 
 environmental!(ext : Externalities<Error=NoError> + 'static);
 
+/// Get `key` from storage and return a `Vec`, empty if there's a problem.
 pub fn storage(key: &[u8]) -> Vec<u8> {
 	ext::with(|ext| ext.storage(key).ok().map(|s| s.to_vec()))
 		.unwrap_or(None)
 		.unwrap_or_else(|| vec![])
 }
 
+/// Get `key` from storage, placing the value into `value_out` (as much as possible) and return
+/// the number of bytes that the key in storage was.
 pub fn read_storage(key: &[u8], value_out: &mut [u8]) -> usize {
 	ext::with(|ext| {
 		if let Ok(value) = ext.storage(key) {
@@ -61,24 +65,6 @@ pub fn read_storage(key: &[u8], value_out: &mut [u8]) -> usize {
 	}).unwrap_or(0)
 }
 
-pub fn storage_into<T: Sized>(_key: &[u8]) -> Option<T> {
-	let size = size_of::<T>();
-
-	ext::with(|ext| {
-		if let Ok(value) = ext.storage(_key) {
-			if value.len() == size {
-				unsafe {
-					let mut result: T = std::mem::uninitialized();
-					std::slice::from_raw_parts_mut(transmute::<*mut T, *mut u8>(&mut result), size)
-						.copy_from_slice(&value);
-					return Some(result);
-				}
-			}
-		}
-		None
-	}).unwrap_or(None)
-}
-
 pub fn set_storage(key: &[u8], value: &[u8]) {
 	ext::with(|ext|
 		ext.set_storage(key.to_vec(), value.to_vec())
@@ -149,8 +135,6 @@ mod tests {
 			assert_eq!(storage(b"hello"), b"world".to_vec());
 			assert_eq!(storage(b"foo"), b"".to_vec());
 			set_storage(b"foo", &[1, 2, 3][..]);
-			assert_eq!(storage_into::<[u8; 3]>(b"foo"), Some([1, 2, 3]));
-			assert_eq!(storage_into::<[u8; 3]>(b"hello"), None);
 			true
 		}));
 
diff --git a/substrate/wasm-runtime/support/src/lib.rs b/substrate/wasm-runtime/support/src/lib.rs
index bc987ff396..b65b574351 100644
--- a/substrate/wasm-runtime/support/src/lib.rs
+++ b/substrate/wasm-runtime/support/src/lib.rs
@@ -43,23 +43,6 @@ pub fn storage(key: &[u8]) -> Vec<u8> {
 	}
 }
 
-pub fn storage_into<T: Sized>(key: &[u8]) -> Option<T> {
-	let mut result: T;
-	let size = size_of::<T>();
-	let written;
-	unsafe {
-		result = uninitialized();
-		let result_as_byte_blob = transmute::<*mut T, *mut u8>(&mut result);
-		written = ext_get_storage_into(&key[0], key.len() as u32, result_as_byte_blob, size as u32) as usize;
-	}
-	// Only return a fully written value.
-	if written == size {
-		Some(result)
-	} else {
-		None
-	}
-}
-
 pub fn set_storage(key: &[u8], value: &[u8]) {
 	unsafe {
 		ext_set_storage(
diff --git a/substrate/wasm-runtime/target/wasm32-unknown-unknown/release/runtime_polkadot.compact.wasm b/substrate/wasm-runtime/target/wasm32-unknown-unknown/release/runtime_polkadot.compact.wasm
index 5f357f211861828f797bbe3bf8388b2839067a07..ddd9dc70e64e3b02e101f88ad65bd0a5af897e86 100644
GIT binary patch
delta 108
zcmZ3roN3i^rVamO7@utZFC(c1q$J&0S%8$hw-6`O8-~d`4oaItLoP5fzS*o6<_)5X
z!b9X4zf2aWFxmXO%tl6qqqro|Dk(9?iox*>12=@1p9kc9Vc=#5$>kNNPL7`J4*;MS
BCiVaT

delta 108
zcmZ3roN3i^rVamO7~gFEFC(c1q$J&0S%8$hw-6`O7lz3?4oaItLoP5fe%Y)R<_)5X
z!b9X4pG+30FxmXO%tl6qy|^UNDz7+|!SM|PHwTE5l$c}1;P?f`%g?i#96i||0Iy9a
A761SM

diff --git a/substrate/wasm-runtime/target/wasm32-unknown-unknown/release/runtime_polkadot.wasm b/substrate/wasm-runtime/target/wasm32-unknown-unknown/release/runtime_polkadot.wasm
index 700194bb0a902a08b3704ed1a25f78b67a0e113e..8d3d3fb1ee5ffba092f881fdbe5e5c3780f7d23b 100644
GIT binary patch
delta 107
zcmaF7oaym$rVTo>j88V}%1UYhDR*~P79i#8EyT(AW^+QwXGX?1lM_NjH)n>K0hyZ@
zgons8ewl1nVX|4X++9Y6qqro|Dk(9?iox*>12=@1p9kc9Vc=#5$>kNNPM$K^9{^sN
BCWin3

delta 107
zcmaF7oaym$rVTo>jBhsU%1UYhDR*~P79i#8EyT(AWphHvXGX>^lM_NjH)n>K0hyZ@
zgons8KACJ+VX|4X++9Y6y|^UNDz7+|!SM|PHwTE5l$c}1;P?f`%g?i#JY}*!0Bz4E
ArvLx|