Remove generation of list of custom errors which would create a dependency on client implementations

Signed-off-by: Mustafa Morca <[email protected]>

Author: psychoplasma

Diff for: codegen/src/main/java/org/web3j/codegen/SolidityFunctionWrapper.java

@@ -270,7 +270,6 @@ public void generateJavaFiles(
         }
 
         addAddressesSupport(classBuilder, addresses);
-        createCustomErrorList(classBuilder, abi);
 
         write(basePackageName, classBuilder.build(), destinationDir);
     }
@@ -442,68 +441,6 @@ private FieldSpec createEventDefinition(
                 .build();
     }
 
-    /**
-     * Creates a list of CustomError variables defined previously.
-     *
-     * <pre>{@code
-     * Given error abi definitions;
-     * [
-     *   {"name": "aa", "type": "error", "inputs": []},
-     *   {"name": "aA", "type": "error", "inputs": []},
-     *   {"name": "bbb", "type": "error", "inputs": []},
-     *   {"name": "bBB", "type": "error", "inputs": [{"type": "string"}]},
-     *   {"name": "bbB", "type": "error", "inputs": []}
-     * ]
-     *
-     * Then the list will be;
-     * public static final List CUSTOM_ERRORS = Arrays.<org.web3j.abi.datatypes.CustomError>asList(
-     *         AA1_ERROR,
-     *         AA_ERROR,
-     *         BBB2_ERROR,
-     *         BBB1_ERROR,
-     *         BBB_ERROR);
-     * }</pre>
-     */
-    void createCustomErrorList(TypeSpec.Builder classBuilder, List<AbiDefinition> abiDefinitions) {
-        Map<String, Integer> customErrorsOccurrences = getDuplicateCustomErrorNames(abiDefinitions);
-
-        // This will create a code string for list items
-        // which includes all the custom error definition names.
-        String listItems =
-                abiDefinitions.stream()
-                        // filter error types from abi
-                        .filter(
-                                abi ->
-                                        TYPE_ERROR.equals(abi.getType())
-                                                && abi.getName() != null
-                                                && !abi.getName().isEmpty())
-                        // get error names
-                        .map(
-                                abi ->
-                                        buildCustomErrorDefinitionName(
-                                                abi.getName(), customErrorsOccurrences))
-                        // reduce to a code string for list definition
-                        .collect(Collectors.joining(",\n"));
-
-        if (listItems.isEmpty()) {
-            return;
-        }
-
-        CodeBlock codeBlock =
-                CodeBlock.builder()
-                        .addStatement(
-                                "$T.<$T>asList(\n" + listItems + ")",
-                                Arrays.class,
-                                CustomError.class)
-                        .build();
-
-        classBuilder.addField(
-                FieldSpec.builder(List.class, "CUSTOM_ERRORS")
-                        .addModifiers(Modifier.PUBLIC, Modifier.STATIC, Modifier.FINAL)
-                        .initializer(codeBlock)
-                        .build());
-    }
-
     void buildCustomErrorDefinitions(
             @NotNull AbiDefinition abiDefinition,
             TypeSpec.Builder classBuilder,

Diff for: codegen/src/test/java/org/web3j/codegen/SolidityFunctionWrapperTest.java

@@ -1260,71 +1260,4 @@ public void testBuildCustomErrorDefinitionsWithDuplicateNames() throws Exception
 
         assertEquals(expectedJavaCode, builder.build().toString());
     }
-
-    @Test
-    public void testCreateCustomErrorList() {
-        List<AbiDefinition> abiDefinitions =
-                List.of(
-                        new AbiDefinition(
-                                false,
-                                List.of(new NamedType("reason", "string")),
-                                "Error",
-                                Collections.emptyList(),
-                                "error",
-                                false),
-                        new AbiDefinition(
-                                false,
-                                Collections.emptyList(),
-                                "",
-                                Collections.emptyList(),
-                                "error",
-                                false),
-                        new AbiDefinition(
-                                false,
-                                Collections.emptyList(),
-                                "Empty",
-                                Collections.emptyList(),
-                                "error",
-                                false),
-                        new AbiDefinition(
-                                false,
-                                List.of(new NamedType("account", "address")),
-                                "invalidAccess",
-                                Collections.emptyList(),
-                                "error",
-                                false),
-                        new AbiDefinition(
-                                false,
-                                Arrays.asList(
-                                        new NamedType("account", "address"),
-                                        new NamedType("reason", "string")),
-                                "InvalidAccess",
-                                Collections.emptyList(),
-                                "error",
-                                false));
-        String expectedJavaCode =
-                "class MyContract {\n"
-                        + "  public static final java.util.List CUSTOM_ERRORS = java.util.Arrays.<org.web3j.abi.datatypes.CustomError>asList(\n"
-                        + "      ERROR_ERROR,\n"
-                        + "      EMPTY_ERROR,\n"
-                        + "      INVALIDACCESS1_ERROR,\n"
-                        + "      INVALIDACCESS_ERROR);\n"
-                        + "  ;\n}\n";
-
-        TypeSpec.Builder builder = TypeSpec.classBuilder("MyContract");
-        solidityFunctionWrapper.createCustomErrorList(builder, abiDefinitions);
-
-        assertEquals(expectedJavaCode, builder.build().toString());
-    }
-
-    @Test
-    public void testCreateCustomErrorListWithoutCustomErrors() {
-        List<AbiDefinition> abiDefinitions = List.of();
-        String expectedJavaCode = "class MyContract {\n}\n";
-
-        TypeSpec.Builder builder = TypeSpec.classBuilder("MyContract");
-        solidityFunctionWrapper.createCustomErrorList(builder, abiDefinitions);
-
-        assertEquals(expectedJavaCode, builder.build().toString());
-    }
 }