From e13ad9b6828ffc129b7935c67e57a57b685ad000 Mon Sep 17 00:00:00 2001
From: Alain Nicolas <alain.nicolas@consensys.net>
Date: Mon, 23 Oct 2023 19:03:41 +0200
Subject: [PATCH] fix: Resolve conflicts

---
 sdk/src/dataMapper/AttestationDataMapper.ts |  2 --
 sdk/src/dataMapper/PortalDataMapper.ts      | 23 +--------------------
 2 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/sdk/src/dataMapper/AttestationDataMapper.ts b/sdk/src/dataMapper/AttestationDataMapper.ts
index a27e5651..0d917165 100644
--- a/sdk/src/dataMapper/AttestationDataMapper.ts
+++ b/sdk/src/dataMapper/AttestationDataMapper.ts
@@ -112,7 +112,6 @@ export default class AttestationDataMapper extends BaseDataMapper<
     return await this.executeReadMethod("balanceOfBatch", [accounts, ids]);
   }
 
-  // TODO: Use correct type for args
   private async executeReadMethod(functionName: string, args: unknown[]) {
     return await this.web3Client.readContract({
       abi: abiAttestationRegistry,
@@ -122,7 +121,6 @@ export default class AttestationDataMapper extends BaseDataMapper<
     });
   }
 
-  // TODO: Use correct type for args
   private async simulateContract(functionName: string, args: unknown[]) {
     try {
       const { request } = await this.web3Client.simulateContract({
diff --git a/sdk/src/dataMapper/PortalDataMapper.ts b/sdk/src/dataMapper/PortalDataMapper.ts
index 90613d1c..45e8b8a0 100644
--- a/sdk/src/dataMapper/PortalDataMapper.ts
+++ b/sdk/src/dataMapper/PortalDataMapper.ts
@@ -143,15 +143,6 @@ export default class PortalDataMapper extends BaseDataMapper<Portal, Portal_filt
     return await this.executeTransaction(request);
   }
 
-  async register() {
-    throw new Error("Not implemented");
-  }
-
-  async clone() {
-    throw new Error("Not implemented");
-  }
-
-  // TODO: Use correct type for args
   private async simulateContract(portalAddress: Address, functionName: string, args: unknown[]) {
     try {
       const { request } = await this.web3Client.simulateContract({
@@ -168,11 +159,6 @@ export default class PortalDataMapper extends BaseDataMapper<Portal, Portal_filt
     }
   }
 
-  async bulkRevoke(portalAddress: Address, attestationIds: string[]) {
-    const request = await this.simulateBulkRevoke(portalAddress, attestationIds);
-    return await this.executeTransaction(request);
-  }
-
   async simulateRegister(id: Address, name: string, description: string, isRevocable: boolean, ownerName: string) {
     return this.simulatePortalRegistryContract("register", [id, name, description, isRevocable, ownerName]);
   }
@@ -238,17 +224,10 @@ export default class PortalDataMapper extends BaseDataMapper<Portal, Portal_filt
 
       return request;
     } catch (err) {
-      this.handleError(err);
+      handleError(err);
     }
   }
 
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  private async executeTransaction(request: any) {
-    const hash: Hash = await this.walletClient.writeContract(request);
-    console.log(`Transaction sent with hash ${hash}`);
-    return hash;
-  }
-
   // TODO: Use correct type for request
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   private async executeTransaction(request: any) {