apply pr suggestions

nucypher · Jun 28, 2023 · 162e2ba · 162e2ba
1 parent 37a2b72
commit 162e2ba
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/src/conditions/base/contract.ts b/src/conditions/base/contract.ts
@@ -40,12 +40,16 @@ const functionAbiSchema = Joi.object({
   // Now we just need to validate against the parent schema
   // Validate method name
   const method = helper.state.ancestors[0].method;
-  const abiMethodName = Object.keys(asInterface.functions).find((name) =>
-    name.startsWith(`${method}(`)
-  );
-  const functionFragment = abiMethodName
-    ? asInterface.functions[abiMethodName]
-    : null;
+
+  let functionFragment;
+  try {
+    functionFragment = asInterface.getFunction(method);
+  } catch (e) {
+    return helper.message({
+      custom: `"functionAbi" contains ambiguous "${method}"`,
+    });
+  }
+
   if (!functionFragment) {
     return helper.message({
       custom: `"functionAbi" not valid for method: "${method}"`,