From cd8f892d3806c3b5ed61eaed7d255416fc7fefa5 Mon Sep 17 00:00:00 2001
From: Jamie Hewitt <jamie.hewitt15@gmail.com>
Date: Wed, 18 May 2022 16:28:32 +0300
Subject: [PATCH] Using new generic gas estimate function

---
 src/tokens/Datatoken.ts | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/tokens/Datatoken.ts b/src/tokens/Datatoken.ts
index 0a89d052..1e7143a9 100644
--- a/src/tokens/Datatoken.ts
+++ b/src/tokens/Datatoken.ts
@@ -1330,23 +1330,16 @@ export class Datatoken {
     address: string
   ): Promise<number> {
     // Estimate gas cost for publishMarketFeeAddress method
-    const gasLimitDefault = this.GASLIMIT_DEFAULT
     const dtContract = new this.web3.eth.Contract(this.datatokensAbi, datatokenAddress, {
       from: address
     })
-    let estGas
-    try {
-      estGas = await dtContract.methods
-        .setPublishingMarketFee(
-          publishMarketFeeAddress,
-          publishMarketFeeToken,
-          publishMarketFeeAmount
-        )
-        .estimateGas({ from: address }, (err, estGas) => (err ? gasLimitDefault : estGas))
-    } catch (error) {
-      estGas = gasLimitDefault
-    }
-    return estGas
+    return estimateGas(
+      address,
+      dtContract.methods.setPublishingMarketFee,
+      publishMarketFeeAddress,
+      publishMarketFeeToken,
+      publishMarketFeeAmount
+    )
   }
 
   /**