WA-36: Fixed bug when multiple function have same name (#40)

5afe · Oct 19, 2017 · fa21e47 · fa21e47
1 parent 493e6a0
commit fa21e47
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 23 deletions.
diff --git a/bivrost-abi-parser/src/main/kotlin/pm/gnosis/AbiParser.kt b/bivrost-abi-parser/src/main/kotlin/pm/gnosis/AbiParser.kt
@@ -99,6 +99,7 @@ class AbiParser {
                 build.writeTo(output)
             }
         }
+
         companion object {
             const val VARIABLE_NAME_ITEM_DECODER = "itemDecoder"
         }
@@ -208,27 +209,34 @@ class AbiParser {
         }
 
         private fun generateFunctionObjects(context: GeneratorContext) =
-                context.root.abi.filter { it.type == "function" }.map { functionJson ->
-                    val functionObject = TypeSpec.objectBuilder(functionJson.name.capitalize())
-
-                    //Add method id
-                    val methodId = "${functionJson.name}${generateMethodSignature(functionJson.inputs)}".generateSolidityMethodId()
-                    functionObject.addProperty(PropertySpec.builder("METHOD_ID", String::class, KModifier.CONST).initializer("\"$methodId\"").build())
-                    functionObject.addFun(generateFunctionEncoder(functionJson, context))
-                    if (functionJson.outputs.isNotEmpty()) {
-                        val returnHolder = generateParameterHolder("Return", functionJson.outputs, context)
-                        functionObject.addFun(generateParameterDecoder("decode", functionJson.outputs, returnHolder.name!!, context))
-                        functionObject.addType(returnHolder)
-                    }
-
-                    if (functionJson.inputs.isNotEmpty()) {
-                        val argumentsHolder = generateParameterHolder("Arguments", functionJson.inputs, context)
-                        functionObject.addFun(generateParameterDecoder("decodeArguments", functionJson.inputs, argumentsHolder.name!!, context))
-                        functionObject.addType(argumentsHolder)
-                    }
-
-                    functionObject.build()
-                }.toList()
+                context.root.abi
+                        .filter { it.type == "function" }
+                        .groupBy { it.name }
+                        .flatMap { (_, value) -> value.map { Pair(it, value.size > 1) } }
+                        .map { (functionJson, useMethodId) ->
+
+                            //Add method id
+                            val methodId = "${functionJson.name}${generateMethodSignature(functionJson.inputs)}".generateSolidityMethodId()
+                            val baseName = functionJson.name.capitalize()
+                            val name = if (useMethodId) "${baseName}_$methodId" else baseName
+                            val functionObject = TypeSpec.objectBuilder(name)
+
+                            functionObject.addProperty(PropertySpec.builder("METHOD_ID", String::class, KModifier.CONST).initializer("\"$methodId\"").build())
+                            functionObject.addFun(generateFunctionEncoder(functionJson, context))
+                            if (functionJson.outputs.isNotEmpty()) {
+                                val returnHolder = generateParameterHolder("Return", functionJson.outputs, context)
+                                functionObject.addFun(generateParameterDecoder("decode", functionJson.outputs, returnHolder.name!!, context))
+                                functionObject.addType(returnHolder)
+                            }
+
+                            if (functionJson.inputs.isNotEmpty()) {
+                                val argumentsHolder = generateParameterHolder("Arguments", functionJson.inputs, context)
+                                functionObject.addFun(generateParameterDecoder("decodeArguments", functionJson.inputs, argumentsHolder.name!!, context))
+                                functionObject.addType(argumentsHolder)
+                            }
+
+                            functionObject.build()
+                        }.toList()
 
         private fun generateMethodSignature(parameters: List<ParameterJson>): String =
                 "(${parameters.joinToString(",") {

diff --git a/build.gradle b/build.gradle
@@ -2,11 +2,11 @@ buildscript {
     ext.versions = [
             'minSdk'       : 14,
             'compileSdk'   : 26,
-            'buildTools'   : '26.0.1',
+            'buildTools'   : '26.0.2',
 
             'kotlin'       : '1.1.4-3',
 
-            'androidPlugin': '3.0.0-beta6',
+            'androidPlugin': '3.0.0-beta7',
     ]
 
     ext.deps = [

diff --git a/sample/app/abi/test.json b/sample/app/abi/test.json
@@ -74,6 +74,23 @@
       "payable": false,
       "type": "function"
     },
+    {
+      "constant": false,
+      "inputs": [
+        {
+          "name": "owner",
+          "type": "address"
+        },
+        {
+          "name": "reason",
+          "type": "string"
+        }
+      ],
+      "name": "removeOwner",
+      "outputs": [],
+      "payable": false,
+      "type": "function"
+    },
     {
       "constant": false,
       "inputs": [