From ef6c1588059900fb536948ff6a8276610e7b39b3 Mon Sep 17 00:00:00 2001
From: Liana Husikyan <liana@ethdev.com>
Date: Mon, 11 May 2015 13:47:21 +0200
Subject: [PATCH] bug in abi. fixed external type for return parameters

---
 libsolidity/InterfaceHandler.cpp              | 10 ++--
 test/libsolidity/SolidityABIJSON.cpp          | 48 ++++++++++++++++++-
 .../SolidityNameAndTypeResolution.cpp         | 22 +++++++++
 3 files changed, 74 insertions(+), 6 deletions(-)

diff --git a/libsolidity/InterfaceHandler.cpp b/libsolidity/InterfaceHandler.cpp
index d4958475b..e266f8d61 100644
--- a/libsolidity/InterfaceHandler.cpp
+++ b/libsolidity/InterfaceHandler.cpp
@@ -55,15 +55,15 @@ std::unique_ptr<std::string> InterfaceHandler::getABIInterface(ContractDefinitio
 
 	for (auto it: _contractDef.getInterfaceFunctions())
 	{
-
+		auto externalFunctionType = it.second->externalFunctionType();
 		Json::Value method;
 		method["type"] = "function";
 		method["name"] = it.second->getDeclaration().getName();
 		method["constant"] = it.second->isConstant();
-		method["inputs"] = populateParameters(it.second->getParameterNames(),
-											  it.second->getParameterTypeNames());
-		method["outputs"] = populateParameters(it.second->getReturnParameterNames(),
-											   it.second->getReturnParameterTypeNames());
+		method["inputs"] = populateParameters(externalFunctionType->getParameterNames(),
+											  externalFunctionType->getParameterTypeNames());
+		method["outputs"] = populateParameters(externalFunctionType->getReturnParameterNames(),
+											   externalFunctionType->getReturnParameterTypeNames());
 		abi.append(method);
 	}
 	if (_contractDef.getConstructor())
diff --git a/test/libsolidity/SolidityABIJSON.cpp b/test/libsolidity/SolidityABIJSON.cpp
index 26d0110b8..6c1025d6a 100644
--- a/test/libsolidity/SolidityABIJSON.cpp
+++ b/test/libsolidity/SolidityABIJSON.cpp
@@ -499,7 +499,8 @@ BOOST_AUTO_TEST_CASE(constructor_abi)
 {
 	char const* sourceCode = R"(
 		contract test {
-			function test(uint param1, test param2, bool param3) {}
+			enum ActionChoices { GoLeft, GoRight, GoStraight, Sit }
+			function test(uint param1, test param2, bool param3, ActionChoices param4) {}
 		}
 	)";
 
@@ -517,6 +518,51 @@ BOOST_AUTO_TEST_CASE(constructor_abi)
 			{
 				"name": "param3",
 				"type": "bool"
+			},
+			{
+				"name": "param4",
+				"type": "uint8"
+			}
+		],
+		"type": "constructor"
+	}
+	])";
+	checkInterface(sourceCode, interface);
+}
+
+
+BOOST_AUTO_TEST_CASE(return_param_in_abi)
+{
+	// bug #1801
+	char const* sourceCode = R"(
+		contract test {
+			enum ActionChoices { GoLeft, GoRight, GoStraight, Sit }
+			function test(ActionChoices param) {}
+			function ret() returns(ActionChoices){
+				ActionChoices action = ActionChoices.GoLeft;
+				return action;
+			}
+		}
+	)";
+
+	char const* interface = R"([
+	{
+		 "constant" : false,
+		 "inputs" : [],
+		 "name" : "ret",
+		 "outputs" : [
+			{
+			   "name" : "",
+			   "type" : "uint8"
+			}
+		 ],
+		 "type" : "function"
+	},
+	{
+		"inputs": [
+			{
+				"name": "param",
+				"type": "uint8"
 			}
 		],
 		"type": "constructor"
diff --git a/test/libsolidity/SolidityNameAndTypeResolution.cpp b/test/libsolidity/SolidityNameAndTypeResolution.cpp
index c317dad97..c59c1f56f 100644
--- a/test/libsolidity/SolidityNameAndTypeResolution.cpp
+++ b/test/libsolidity/SolidityNameAndTypeResolution.cpp
@@ -508,6 +508,28 @@ BOOST_AUTO_TEST_CASE(function_external_types)
 		}
 }
 
+BOOST_AUTO_TEST_CASE(enum_external_type)
+{
+	// bug #1801
+	ASTPointer<SourceUnit> sourceUnit;
+	char const* text = R"(
+		contract Test {
+			enum ActionChoices { GoLeft, GoRight, GoStraight, Sit }
+			function boo(ActionChoices enumArg) external returns (uint ret) {
+			   ret = 5;
+			}
+		})";
+	ETH_TEST_REQUIRE_NO_THROW(sourceUnit = parseTextAndResolveNames(text), "Parsing and name Resolving failed");
+	for (ASTPointer<ASTNode> const& node: sourceUnit->getNodes())
+		if (ContractDefinition* contract = dynamic_cast<ContractDefinition*>(node.get()))
+		{
+			auto functions = contract->getDefinedFunctions();
+			if (functions.empty())
+				continue;
+			BOOST_CHECK_EQUAL("boo(uint8)", functions[0]->externalSignature());
+		}
+}
+
 BOOST_AUTO_TEST_CASE(function_external_call_allowed_conversion)
 {
 	char const* text = R"(