Issue-1216: wrong method signature for multidimensional arrays

- review changes
ethereum · Oct 26, 2018 · 24012e4 · 24012e4
1 parent 0790224
commit 24012e4
Showing 1 changed file with 27 additions and 0 deletions.
diff --git a/ethereumj-core/src/main/java/org/ethereum/solidity/SolidityType.java b/ethereumj-core/src/main/java/org/ethereum/solidity/SolidityType.java
@@ -135,6 +135,23 @@ public byte[] encode(Object value) {
                 throw new RuntimeException("List value expected for type " + getName());
             }
         }
+
+        @Override
+        public String getCanonicalName() {
+            return getArrayCanonicalName("");
+        }
+
+        String getArrayCanonicalName(String parentDimStr) {
+            String myDimStr = parentDimStr + getCanonicalDimension();
+            if (getElementType() instanceof ArrayType) {
+                return ((ArrayType) getElementType()).
+                        getArrayCanonicalName(myDimStr);
+            } else {
+                return getElementType().getCanonicalName() + myDimStr;
+            }
+        }
+
+        protected abstract String getCanonicalDimension();
 
         public SolidityType getElementType() {
             return elementType;
@@ -164,6 +181,11 @@ public String getCanonicalName() {
                 return elementType.getCanonicalName() + "[" + size + "]";
             }
         }
+
+        @Override
+        protected String getCanonicalDimension() {
+            return "[" + size + "]";
+        }
 
         @Override
         public byte[] encodeList(List l) {
@@ -207,6 +229,11 @@ public String getCanonicalName() {
                 return elementType.getCanonicalName() + "[]";
             }
         }
+
+        @Override
+        protected String getCanonicalDimension() {
+            return "[]";
+        }
 
         @Override
         public byte[] encodeList(List l) {