From 65ee3daef35b86769da79053964d9469204bc77e Mon Sep 17 00:00:00 2001
From: Alain Nicolas <alain.nicolas@consensys.net>
Date: Tue, 24 Oct 2023 11:58:20 +0200
Subject: [PATCH] fix: Wrong conflict resolution

---
 sdk/src/dataMapper/SchemaDataMapper.ts |  5 ++---
 sdk/src/utils/errorHandler.ts          | 14 --------------
 2 files changed, 2 insertions(+), 17 deletions(-)
 delete mode 100644 sdk/src/utils/errorHandler.ts

diff --git a/sdk/src/dataMapper/SchemaDataMapper.ts b/sdk/src/dataMapper/SchemaDataMapper.ts
index 463482ce..d6985492 100644
--- a/sdk/src/dataMapper/SchemaDataMapper.ts
+++ b/sdk/src/dataMapper/SchemaDataMapper.ts
@@ -1,10 +1,10 @@
 import { Address } from "viem";
 import { Schema_filter, Schema_orderBy } from "../../.graphclient";
 import { Schema } from "../types";
-import { handleError } from "../utils/errorHandler";
 import BaseDataMapper from "./BaseDataMapper";
 import { abiSchemaRegistry } from "../abi/SchemaRegistry";
 import { executeTransaction } from "../utils/transactionSender";
+import { handleSimulationError } from "../utils/simulationErrorHandler";
 
 export default class SchemaDataMapper extends BaseDataMapper<Schema, Schema_filter, Schema_orderBy> {
   typeName = "schema";
@@ -63,7 +63,6 @@ export default class SchemaDataMapper extends BaseDataMapper<Schema, Schema_filt
     return this.executeReadMethod("schemaIds", [index]);
   }
 
-  // TODO: Use correct type for args
   private async executeReadMethod(functionName: string, args: unknown[]) {
     return this.web3Client.readContract({
       abi: abiSchemaRegistry,
@@ -85,7 +84,7 @@ export default class SchemaDataMapper extends BaseDataMapper<Schema, Schema_filt
 
       return request;
     } catch (err) {
-      handleError(err);
+      handleSimulationError(err);
     }
   }
 }
diff --git a/sdk/src/utils/errorHandler.ts b/sdk/src/utils/errorHandler.ts
deleted file mode 100644
index 147880af..00000000
--- a/sdk/src/utils/errorHandler.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { BaseError, ContractFunctionRevertedError } from "viem";
-
-export function handleError(err: unknown): never {
-  if (err instanceof BaseError) {
-    const revertError = err.walk((err) => err instanceof ContractFunctionRevertedError);
-    if (revertError instanceof ContractFunctionRevertedError) {
-      const errorName = revertError.data?.errorName ?? "";
-      console.error(`Failing with ${errorName}`);
-    }
-  }
-  console.error(err);
-
-  throw new Error("Simulation failed");
-}