diff --git a/src/utils/ConfigHelper.ts b/src/config/ConfigHelper.ts similarity index 98% rename from src/utils/ConfigHelper.ts rename to src/config/ConfigHelper.ts index b464f8d9..01ce2f87 100644 --- a/src/utils/ConfigHelper.ts +++ b/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, diff --git a/src/config/index.ts b/src/config/index.ts index a871693a..3ac42305 100644 --- a/src/config/index.ts +++ b/src/config/index.ts @@ -1 +1,2 @@ export * from './Config' +export * from './ConfigHelper' diff --git a/src/contracts/factories/NFTFactory.ts b/src/contracts/factories/NFTFactory.ts index 7112c04e..cca80872 100644 --- a/src/contracts/factories/NFTFactory.ts +++ b/src/contracts/factories/NFTFactory.ts @@ -12,10 +12,9 @@ import { getPoolCreationParams, setContractDefaults, estimateGas, - ZERO_ADDRESS, - ConfigHelper + ZERO_ADDRESS } from '../../utils' -import { Config } from '../../config' +import { Config, ConfigHelper } from '../../config' import { ProviderFees, FreCreationParams, diff --git a/src/contracts/pools/Dispenser.ts b/src/contracts/pools/Dispenser.ts index ac01d8e7..d50a0668 100644 --- a/src/contracts/pools/Dispenser.ts +++ b/src/contracts/pools/Dispenser.ts @@ -8,11 +8,10 @@ import { LoggerInstance as logger, getFairGasPrice, setContractDefaults, - estimateGas, - ConfigHelper + estimateGas } from '../../utils/' import { Datatoken } from '..' -import { Config } from '../../config/index.js' +import { Config, ConfigHelper } from '../../config' export interface DispenserToken { active: boolean diff --git a/src/contracts/pools/FixedRateExchange.ts b/src/contracts/pools/FixedRateExchange.ts index 07172833..b43e5f4b 100644 --- a/src/contracts/pools/FixedRateExchange.ts +++ b/src/contracts/pools/FixedRateExchange.ts @@ -10,10 +10,9 @@ import { amountToUnits, unitsToAmount, estimateGas, - ZERO_ADDRESS, - ConfigHelper + ZERO_ADDRESS } from '../../utils' -import { Config } from '../../config/index.js' +import { Config, ConfigHelper } from '../../config' import { PriceAndFees } from '../..' export interface FixedPriceExchange { diff --git a/src/contracts/pools/Pool.ts b/src/contracts/pools/Pool.ts index 9fa7c989..1af63c4a 100644 --- a/src/contracts/pools/Pool.ts +++ b/src/contracts/pools/Pool.ts @@ -8,8 +8,7 @@ import { unitsToAmount, amountToUnits, LoggerInstance, - estimateGas, - ConfigHelper + estimateGas } 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, diff --git a/src/contracts/pools/Router.ts b/src/contracts/pools/Router.ts index 40b3a226..69972d70 100644 --- a/src/contracts/pools/Router.ts +++ b/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 { - getFairGasPrice, - setContractDefaults, - ConfigHelper, - estimateGas -} from '../../utils' +import { getFairGasPrice, setContractDefaults, 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 diff --git a/src/contracts/pools/SideStaking.ts b/src/contracts/pools/SideStaking.ts index f38e803c..60d51c9c 100644 --- a/src/contracts/pools/SideStaking.ts +++ b/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 { - LoggerInstance, - getFairGasPrice, - ConfigHelper, - estimateGas, - unitsToAmount -} from '../../utils' +import { LoggerInstance, getFairGasPrice, 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[] diff --git a/src/contracts/tokens/Datatoken.ts b/src/contracts/tokens/Datatoken.ts index 9ecd2530..21912fb5 100644 --- a/src/contracts/tokens/Datatoken.ts +++ b/src/contracts/tokens/Datatoken.ts @@ -11,8 +11,7 @@ import { setContractDefaults, getFreOrderParams, estimateGas, - ZERO_ADDRESS, - ConfigHelper + ZERO_ADDRESS } 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 diff --git a/src/contracts/tokens/NFT.ts b/src/contracts/tokens/NFT.ts index b5b07018..202d9f51 100644 --- a/src/contracts/tokens/NFT.ts +++ b/src/contracts/tokens/NFT.ts @@ -7,12 +7,11 @@ import { getFairGasPrice, generateDtName, setContractDefaults, - estimateGas, - ConfigHelper + estimateGas } from '../../utils' import { Contract } from 'web3-eth-contract' import { MetadataProof, MetadataAndTokenURI } from '../../@types' -import { Config } from '../../config' +import { Config, ConfigHelper } from '../../config' /** * ERC721 ROLES diff --git a/src/utils/index.ts b/src/utils/index.ts index 7085dbc0..2ef7951e 100644 --- a/src/utils/index.ts +++ b/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' diff --git a/test/config.ts b/test/config.ts index f86adce1..2fad75f5 100644 --- a/test/config.ts +++ b/test/config.ts @@ -1,12 +1,8 @@ import Web3 from 'web3' import fs from 'fs' import { homedir } from 'os' -import { - ConfigHelper, - configHelperNetworks, - LoggerInstance, - LogLevel -} from '../src/utils' +import { ConfigHelper, configHelperNetworks } from '..' +import { LoggerInstance, LogLevel } from '../src/utils' LoggerInstance.setLevel(LogLevel.Error)