Fix type of *WithInput::Output for non-constant functions (#100)

* ethabi-derive: fix *WithInput::Output for non-constant functions * Bump version * Add test for *WithInput::Output
rust-ethereum · Jun 7, 2018 · 59faf54 · 59faf54
1 parent 7b9cca3
commit 59faf54
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 26 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ethabi-cli"
-version = "6.0.0"
+version = "6.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 keywords = ["ethereum", "eth", "abi", "solidity", "cli"]
 description = "Easy to use cli for conversion of ethereum contract calls to bytecode."

diff --git a/contract/Cargo.toml b/contract/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ethabi-contract"
-version = "6.0.0"
+version = "6.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 homepage = "https://github.com/paritytech/ethabi"
 license = "MIT"

diff --git a/derive/Cargo.toml b/derive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ethabi-derive"
-version = "6.0.0"
+version = "6.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 homepage = "https://github.com/paritytech/ethabi"
 license = "MIT"

diff --git a/derive/src/lib.rs b/derive/src/lib.rs
@@ -785,18 +785,8 @@ fn declare_output_functions(function: &Function) -> quote::Tokens {
 fn declare_functions_input_wrappers(function: &Function) -> quote::Tokens {
 	let name = syn::Ident::from(function.name.to_camel_case());
 	let name_with_input = syn::Ident::from(format!("{}WithInput",function.name.to_camel_case()));
-	let output_kinds = if function.constant {
-		get_output_kinds(&function.outputs)
-	}
-	else {
-		quote!{()}
-	};
-	let output_fn_body =  if function.constant {
-		quote!{functions::#name::default().decode_output(&_output_bytes)}
-	}
-	else {
-		quote!{Ok(())}
-	};
+	let output_kinds = get_output_kinds(&function.outputs);
+	let output_fn_body = quote!{functions::#name::default().decode_output(&_output_bytes)};
 
 	quote! {
 		/// Contract function with already defined input values

diff --git a/ethabi/Cargo.toml b/ethabi/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ethabi"
-version = "6.0.0"
+version = "6.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 homepage = "https://github.com/paritytech/ethabi"
 license = "MIT"

diff --git a/tests/src/lib.rs b/tests/src/lib.rs
@@ -62,13 +62,22 @@ mod tests {
 	fn test_decoding_function_output() {
 		// Make sure that the output param type of the derived contract is correct
 
-		use eip20::Eip20;
+		// given
 
+		use eip20::Eip20;
 		let contract = Eip20::default();
 		let output = "000000000000000000000000000000000000000000000000000000000036455B".from_hex().unwrap();
+
+		// when
+
 		let decoded_output = contract.outputs().total_supply(&output).unwrap();
+		let decoded_output2 = contract.functions().total_supply().output(output).unwrap();
+
+		// then
+
 		let expected_output: Uint = 0x36455b.into();
 		assert_eq!(expected_output, decoded_output);
+		assert_eq!(expected_output, decoded_output2);
 	}
 
 	#[test]