From 252ff6a0f4cfd4d4c1a54e5dfd92b1b5f0dbb64c Mon Sep 17 00:00:00 2001
From: "Miquel A. Cabot" <miquel.cabot@gmail.com>
Date: Thu, 9 Jun 2022 13:04:14 +0200
Subject: [PATCH] move functions from ContractUtils to Datatoken

---
 src/contracts/tokens/Datatoken.ts | 14 ++++++++++++--
 src/utils/ContractUtils.ts        | 10 ----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/contracts/tokens/Datatoken.ts b/src/contracts/tokens/Datatoken.ts
index fe99228e..7c4d092b 100644
--- a/src/contracts/tokens/Datatoken.ts
+++ b/src/contracts/tokens/Datatoken.ts
@@ -5,7 +5,7 @@ import { Contract } from 'web3-eth-contract'
 import Decimal from 'decimal.js'
 import ERC20Template from '@oceanprotocol/contracts/artifacts/contracts/templates/ERC20Template.sol/ERC20Template.json'
 import ERC20TemplateEnterprise from '@oceanprotocol/contracts/artifacts/contracts/templates/ERC20TemplateEnterprise.sol/ERC20TemplateEnterprise.json'
-import { LoggerInstance, getFreOrderParams, estimateGas, ZERO_ADDRESS } from '../../utils'
+import { LoggerInstance, estimateGas, ZERO_ADDRESS } from '../../utils'
 import {
   ConsumeMarketFee,
   FreOrderParams,
@@ -907,7 +907,7 @@ export class Datatoken extends SmartContract {
   ): Promise<TransactionReceipt> {
     const dtContract = this.getContract(dtAddress, null, this.abiEnterprise)
     try {
-      const freContractParams = getFreOrderParams(freParams)
+      const freContractParams = this.getFreOrderParams(freParams)
 
       const estGas = await estimateGas(
         address,
@@ -1243,4 +1243,14 @@ export class Datatoken extends SmartContract {
     }
     return returnValues
   }
+
+  getFreOrderParams(freParams: FreOrderParams): any {
+    return {
+      exchangeContract: freParams.exchangeContract,
+      exchangeId: freParams.exchangeId,
+      maxBaseTokenAmount: Web3.utils.toWei(freParams.maxBaseTokenAmount),
+      swapMarketFee: Web3.utils.toWei(freParams.swapMarketFee),
+      marketFeeAddress: freParams.marketFeeAddress
+    }
+  }
 }
diff --git a/src/utils/ContractUtils.ts b/src/utils/ContractUtils.ts
index 8b3652b3..ff0a8ee4 100644
--- a/src/utils/ContractUtils.ts
+++ b/src/utils/ContractUtils.ts
@@ -32,16 +32,6 @@ export async function getFairGasPrice(web3: Web3, config: Config): Promise<strin
   else return x.toString(10)
 }
 
-export function getFreOrderParams(freParams: FreOrderParams): any {
-  return {
-    exchangeContract: freParams.exchangeContract,
-    exchangeId: freParams.exchangeId,
-    maxBaseTokenAmount: Web3.utils.toWei(freParams.maxBaseTokenAmount),
-    swapMarketFee: Web3.utils.toWei(freParams.swapMarketFee),
-    marketFeeAddress: freParams.marketFeeAddress
-  }
-}
-
 export async function unitsToAmount(
   web3: Web3,
   token: string,