move ConfigHelper to /config

src/config/ConfigHelper.ts

@@ -1,7 +1,7 @@
-import Config from '../config/Config'
+import { Config } from './Config'
 // eslint-disable-next-line import/no-named-default
 import { default as DefaultContractsAddresses } from '@oceanprotocol/contracts/addresses/address.json'
-import LoggerInstance from './Logger'
+import { LoggerInstance } from '..'
 
 const configHelperNetworksBase: Config = {
   chainId: null,

src/config/index.ts

@@ -1 +1,2 @@
 export * from './Config'
+export * from './ConfigHelper'

src/contracts/factories/NFTFactory.ts

@@ -12,10 +12,9 @@ import {
   getPoolCreationParams,
   setContractDefaults,
   estimateGas,
-  ZERO_ADDRESS,
+  ZERO_ADDRESS
-  ConfigHelper
 } from '../../utils'
-import { Config } from '../../config'
+import { Config, ConfigHelper } from '../../config'
 import {
   ProviderFees,
   FreCreationParams,

src/contracts/pools/Dispenser.ts

@@ -8,11 +8,10 @@ import {
   LoggerInstance as logger,
   getFairGasPrice,
   setContractDefaults,
-  estimateGas,
+  estimateGas
-  ConfigHelper
 } from '../../utils/'
 import { Datatoken } from '..'
-import { Config } from '../../config/index.js'
+import { Config, ConfigHelper } from '../../config'
 
 export interface DispenserToken {
   active: boolean

src/contracts/pools/FixedRateExchange.ts

@@ -10,10 +10,9 @@ import {
   amountToUnits,
   unitsToAmount,
   estimateGas,
-  ZERO_ADDRESS,
+  ZERO_ADDRESS
-  ConfigHelper
 } from '../../utils'
-import { Config } from '../../config/index.js'
+import { Config, ConfigHelper } from '../../config'
 import { PriceAndFees } from '../..'
 
 export interface FixedPriceExchange {

src/contracts/pools/Pool.ts

@@ -8,8 +8,7 @@ import {
   unitsToAmount,
   amountToUnits,
   LoggerInstance,
-  estimateGas,
+  estimateGas
-  ConfigHelper
 } from '../../utils'
 import BigNumber from 'bignumber.js'
 import PoolTemplate from '@oceanprotocol/contracts/artifacts/contracts/pools/balancer/BPool.sol/BPool.json'
@@ -21,7 +20,7 @@ import {
   AmountsOutMaxFee,
   PoolPriceAndFees
 } from '../../@types'
-import { Config } from '../../config'
+import { Config, ConfigHelper } from '../../config'
 import {
   getMaxAddLiquidity,
   getMaxRemoveLiquidity,

src/contracts/pools/Router.ts

@@ -3,14 +3,9 @@ import Web3 from 'web3'
 import { TransactionReceipt } from 'web3-core'
 import { AbiItem } from 'web3-utils'
 import defaultRouter from '@oceanprotocol/contracts/artifacts/contracts/pools/FactoryRouter.sol/FactoryRouter.json'
-import {
+import { getFairGasPrice, setContractDefaults, estimateGas } from '../../utils'
-  getFairGasPrice,
-  setContractDefaults,
-  ConfigHelper,
-  estimateGas
-} from '../../utils'
 import { Operation } from '../../@types/Router'
-import { Config } from '../../config/index.js'
+import { Config, ConfigHelper } from '../../config'
 
 /**
  * Provides an interface for FactoryRouter contract

src/contracts/pools/SideStaking.ts

@@ -2,15 +2,9 @@ import Web3 from 'web3'
 import { AbiItem } from 'web3-utils/types'
 import { TransactionReceipt } from 'web3-core'
 import { Contract } from 'web3-eth-contract'
-import {
+import { LoggerInstance, getFairGasPrice, estimateGas, unitsToAmount } from '../../utils'
-  LoggerInstance,
-  getFairGasPrice,
-  ConfigHelper,
-  estimateGas,
-  unitsToAmount
-} from '../../utils'
 import SideStakingTemplate from '@oceanprotocol/contracts/artifacts/contracts/pools/ssContracts/SideStaking.sol/SideStaking.json'
-import { Config } from '../../config'
+import { Config, ConfigHelper } from '../../config'
 
 export class SideStaking {
   public ssAbi: AbiItem | AbiItem[]

src/contracts/tokens/Datatoken.ts

@@ -11,8 +11,7 @@ import {
   setContractDefaults,
   getFreOrderParams,
   estimateGas,
-  ZERO_ADDRESS,
+  ZERO_ADDRESS
-  ConfigHelper
 } from '../../utils'
 import {
   ConsumeMarketFee,
@@ -22,7 +21,7 @@ import {
   PublishingMarketFee
 } from '../../@types'
 import { Nft } from './NFT'
-import { Config } from '../../config'
+import { Config, ConfigHelper } from '../../config'
 
 /**
  * ERC20 ROLES

src/contracts/tokens/NFT.ts

@@ -7,12 +7,11 @@ import {
   getFairGasPrice,
   generateDtName,
   setContractDefaults,
-  estimateGas,
+  estimateGas
-  ConfigHelper
 } from '../../utils'
 import { Contract } from 'web3-eth-contract'
 import { MetadataProof, MetadataAndTokenURI } from '../../@types'
-import { Config } from '../../config'
+import { Config, ConfigHelper } from '../../config'
 
 /**
  * ERC721 ROLES

src/utils/index.ts

@@ -2,7 +2,6 @@ export * from './Logger'
 export * from './DatatokenName'
 export * from './ContractUtils'
 export * from './FetchHelper'
-export * from './ConfigHelper'
 export * from './DdoHelpers'
 export * from './Constants'
 export * from './SignatureUtils'

test/config.ts

@@ -1,12 +1,8 @@
 import Web3 from 'web3'
 import fs from 'fs'
 import { homedir } from 'os'
-import {
+import { ConfigHelper, configHelperNetworks } from '..'
-  ConfigHelper,
+import { LoggerInstance, LogLevel } from '../src/utils'
-  configHelperNetworks,
-  LoggerInstance,
-  LogLevel
-} from '../src/utils'
 
 LoggerInstance.setLevel(LogLevel.Error)