Switch usages of OutData to u64

No need to be able to return bytes anymore.
paritytech · rphmeier · Jan 8, 2018 · Dec 5, 2017 · Dec 6, 2017 · Dec 6, 2017
commit 13dcd891d2f411d8e9cd827257ef360170b83926
diff --git a/client/src/lib.rs b/client/src/lib.rs
@@ -27,7 +27,7 @@ extern crate error_chain;
 pub mod error;
 
 use primitives::{block, Address, H256};
-use primitives::contract::{CallData, OutData, StorageKey, StorageData};
+use primitives::contract::{CallData, StorageKey, StorageData};
 use state_machine::backend::Backend;
 
 use self::error::ResultExt;
@@ -80,7 +80,7 @@ impl<B, E> Client<B, E> where
 	}
 
 	/// Execute a call to a contract on top of state in a block of given hash.
-	pub fn call(&self, hash: &block::HeaderHash, method: &str, call_data: &CallData) -> error::Result<OutData> {
+	pub fn call(&self, hash: &block::HeaderHash, method: &str, call_data: &CallData) -> error::Result<u64> {
 		let state = self.state_at(hash)?;
 		let mut changes = state_machine::OverlayedChanges::default();
 

diff --git a/executor/src/error.rs b/executor/src/error.rs
@@ -43,6 +43,12 @@ error_chain! {
 			display("Externalities error: {}", e),
 		}
 
+		/// Invalid return type.
+		InvalidReturn {
+			description("u64 was not returned"),
+			display("Invalid type returned (should be u64)"),
+		}
+
 		/// Runtime failed.
 		Runtime {
 			description("runtime failure"),

diff --git a/executor/src/wasm_executor.rs b/executor/src/wasm_executor.rs
@@ -18,7 +18,7 @@
 
 use parity_wasm;
 
-use primitives::contract::{CallData, OutData};
+use primitives::contract::CallData;
 //use serializer::{from_slice as de, to_vec as ser};
 use state_machine::{Externalities, CodeExecutor};
 
@@ -202,7 +202,7 @@ impl CodeExecutor for WasmExecutor {
 		ext: &mut E,
 		method: &str,
 		data: &CallData,
-	) -> Result<OutData> {
+	) -> Result<u64> {
 		// TODO: avoid copying code by requiring code to remain immutable through execution,
 		// splitting it off from potentially mutable externalities.
 		let code = match ext.code() {
@@ -212,7 +212,7 @@ impl CodeExecutor for WasmExecutor {
 
 		use parity_wasm::ModuleInstanceInterface;
 		use parity_wasm::interpreter::UserDefinedElements;
-		use parity_wasm::RuntimeValue::I32;
+		use parity_wasm::RuntimeValue::{I32, I64};
 		use std::collections::HashMap;
 
 		let fe_context = Arc::new(Mutex::new(None));
@@ -232,11 +232,8 @@ impl CodeExecutor for WasmExecutor {
 		module.memory(parity_wasm::interpreter::ItemIndex::Internal(0)).unwrap().set(offset, &data.0).unwrap();
 
 		module.execute_export(method, vec![I32(offset as i32), I32(size as i32)].into())
-			.map(|o| {
-				// TODO: populate vec properly
-				OutData(vec![1; if let Some(I32(l)) = o { l as usize } else { 0 }])
-			})
 			.map_err(|_| ErrorKind::Runtime.into())
+			.and_then(|i| if let Some(I64(r)) = i { Ok(r as u64) } else { Err(ErrorKind::InvalidReturn.into()) })
 	}
 }
 
@@ -274,7 +271,8 @@ mod tests {
 	use std::result;
 	use std::sync::{Arc, Mutex};
 	use std::mem::transmute;
-	use parity_wasm::{MemoryInstance, ModuleInstanceInterface, UserDefinedElements};
+	use parity_wasm::{ModuleInstanceInterface};
+	use parity_wasm::interpreter::{MemoryInstance, UserDefinedElements};
 	use parity_wasm::RuntimeValue::{I32, I64};
 
 	// user function executor

diff --git a/rpc/src/state/mod.rs b/rpc/src/state/mod.rs
@@ -23,7 +23,7 @@ mod tests;
 
 use client::{self, Client};
 use primitives::{block};
-use primitives::contract::{CallData, OutData, StorageKey, StorageData};
+use primitives::contract::{CallData, StorageKey, StorageData};
 use state_machine;
 
 use self::error::Result;
@@ -37,7 +37,7 @@ build_rpc_trait! {
 
 		/// Call a contract.
 		#[rpc(name = "state_call")]
-		fn call(&self, String, CallData, block::HeaderHash) -> Result<OutData>;
+		fn call(&self, String, CallData, block::HeaderHash) -> Result<u64>;
 	}
 }
 
@@ -49,7 +49,7 @@ impl<B, E> StateApi for Client<B, E> where
 		Ok(self.storage(&block, object, &key)?)
 	}
 
-	fn call(&self, method: String, data: CallData, block: block::HeaderHash) -> Result<OutData> {
+	fn call(&self, method: String, data: CallData, block: block::HeaderHash) -> Result<u64> {
 		Ok(self.call(&block, &method, &data)?)
 	}
 }
diff --git a/state_machine/src/lib.rs b/state_machine/src/lib.rs
@@ -30,7 +30,7 @@ extern crate triehash;
 use std::collections::HashMap;
 use std::fmt;
 
-use primitives::contract::{CallData, OutData};
+use primitives::contract::{CallData};
 
 pub mod backend;
 mod ext;
@@ -199,7 +199,7 @@ pub trait CodeExecutor: Sized {
 		ext: &mut E,
 		method: &str,
 		data: &CallData,
-	) -> Result<OutData, Self::Error>;
+	) -> Result<u64, Self::Error>;
 }
 
 /// Execute a call using the given state backend, overlayed changes, and call executor.
@@ -211,7 +211,7 @@ pub fn execute<B: backend::Backend, Exec: CodeExecutor>(
 	exec: &Exec,
 	method: &str,
 	call_data: &CallData,
-) -> Result<OutData, Box<Error>> {
+) -> Result<u64, Box<Error>> {
 
 	let result = {
 		let mut externalities = ext::Ext {