Merge pull request #1492 from oceanprotocol/issue-1474-refactoring-restructure-file-location

Issue-#1474: Refactoring (1). Restructure file location

src/config/ConfigHelper.ts

@@ -1,7 +1,7 @@
-import Config from '../models/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 '../utils'
 
 const configHelperNetworksBase: Config = {
   chainId: null,

src/config/index.ts

@@ -0,0 +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'
-} from '../utils'
+import { Config, ConfigHelper } from '../../config'
-import { Config } from '../models/index.js'
 import {
   ProviderFees,
   FreCreationParams,
@@ -23,7 +22,7 @@ import {
   PoolCreationParams,
   DispenserCreationParams,
   ConsumeMarketFee
-} from '../@types/index.js'
+} from '../../@types'
 
 interface Template {
   templateAddress: string

src/contracts/index.ts

@@ -0,0 +1,8 @@
+export * from './factories/NFTFactory'
+export * from './pools/Dispenser'
+export * from './pools/FixedRateExchange'
+export * from './pools/Pool'
+export * from './pools/Router'
+export * from './pools/SideStaking'
+export * from './tokens/Datatoken'
+export * from './tokens/NFT'

src/contracts/pools/Dispenser.ts

@@ -8,11 +8,10 @@ import {
   LoggerInstance as logger,
   getFairGasPrice,
   setContractDefaults,
-  estimateGas,
+  estimateGas
-  ConfigHelper
 } from '../../utils/'
-import { Datatoken } from '../../tokens'
+import { Datatoken } from '..'
-import { Config } from '../../models/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 '../../models/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 '../../models'
+import { Config, ConfigHelper } from '../../config'
 import {
   getMaxAddLiquidity,
   getMaxRemoveLiquidity,

src/contracts/pools/Router.ts

@@ -3,9 +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 { Operation } from '../../@types/Router'
-import { Config } from '../models/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 '../../models'
+import { Config, ConfigHelper } from '../../config'
 
 export class SideStaking {
   public ssAbi: AbiItem | AbiItem[]

src/contracts/tokens/Datatoken.ts

@@ -11,18 +11,17 @@ import {
   setContractDefaults,
   getFreOrderParams,
   estimateGas,
-  ZERO_ADDRESS,
+  ZERO_ADDRESS
-  ConfigHelper
+} from '../../utils'
-} from '../utils'
 import {
   ConsumeMarketFee,
   FreOrderParams,
   FreCreationParams,
   ProviderFees,
   PublishingMarketFee
-} from '../@types'
+} from '../../@types'
 import { Nft } from './NFT'
-import { Config } from '../models/index.js'
+import { Config, ConfigHelper } from '../../config'
 
 /**
  * ERC20 ROLES

src/contracts/tokens/NFT.ts

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

src/factories/index.ts

@@ -1 +0,0 @@
-export * from './NFTFactory'

src/index.ts

@@ -1,8 +1,5 @@
-export * from './aquarius'
-export * from './pools'
-export * from './tokens'
-export * from './factories'
-export * from './models'
-export * from './utils'
 export * from './@types'
-export * from './provider'
+export * from './services'
+export * from './contracts'
+export * from './config'
+export * from './utils'

src/models/index.ts

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

src/pools/balancer/index.ts

@@ -1 +0,0 @@
-export * from './Pool'

src/pools/dispenser/index.ts

@@ -1 +0,0 @@
-export * from './Dispenser'

src/pools/fixedRate/index.ts

@@ -1 +0,0 @@
-export * from './FixedRateExchange'

src/pools/index.ts

@@ -1,5 +0,0 @@
-export * from './balancer'
-export * from './dispenser'
-export * from './fixedRate'
-export * from './ssContracts'
-export * from './Router'

src/pools/ssContracts/index.ts

@@ -1 +0,0 @@
-export * from './SideStaking'

src/provider/index.ts

@@ -1 +0,0 @@
-export * from './Provider'

src/services/index.ts

@@ -1 +1,2 @@
 export * from './Aquarius'
+export * from './Provider'

src/tokens/index.ts

@@ -1,2 +0,0 @@
-export * from './Datatoken'
-export * from './NFT'

src/utils/ContractUtils.ts

@@ -8,7 +8,7 @@ import {
   FreOrderParams,
   PoolCreationParams
 } from '../@types'
-import { Config } from '../models'
+import { Config } from '../config'
 import { minAbi } from './minAbi'
 import LoggerInstance from './Logger'
 import { GASLIMIT_DEFAULT, ZERO_ADDRESS } from './Constants'

src/utils/DatatokenName.ts

@@ -1,4 +1,4 @@
-import wordListDefault from '../data/words.json'
+import wordListDefault from './data/words.json'
 
 /**
  * Generate new datatoken name & symbol from a word list

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 '../src/config'
-  ConfigHelper,
+import { LoggerInstance, LogLevel } from '../src/utils'
-  configHelperNetworks,
-  LoggerInstance,
-  LogLevel
-} from '../src/utils'
 
 LoggerInstance.setLevel(LogLevel.Error)