read configHelperNetworks values for the tests

test/integration/ComputeFlow.test.ts

@@ -1,9 +1,9 @@
-import ProviderInstance, { Provider } from '../../src/provider/Provider'
+import ProviderInstance from '../../src/provider/Provider'
 import Aquarius from '../../src/aquarius/Aquarius'
 import { assert } from 'chai'
 import { NftFactory, NftCreateData } from '../../src/factories/index'
 import { Datatoken } from '../../src/tokens/Datatoken'
-import { getHash, sleep } from '../../src/utils'
+import { configHelperNetworks, getHash } from '../../src/utils'
 import { Nft } from '../../src/tokens/NFT'
 import Web3 from 'web3'
 import { SHA256 } from 'crypto-js'
@@ -20,10 +20,12 @@ const data = JSON.parse(
   )
 )
 
+const config = configHelperNetworks[1]
+
 const addresses = data.development
-const aquarius = new Aquarius('http://127.0.0.1:5000')
+const aquarius = new Aquarius(config.metadataCacheUri)
-const web3 = new Web3('http://127.0.0.1:8545')
+const web3 = new Web3(config.nodeUri)
-const providerUrl = 'http://172.15.0.4:8030'
+const providerUrl = config.providerUri
 const assetUrl = [
   {
     type: 'url',

test/integration/Provider.test.ts

@@ -1,7 +1,10 @@
+import { configHelperNetworks } from '../../src/utils/'
 import { Provider } from '../../src/provider/Provider'
 import { assert } from 'chai'
 import { FileMetadata } from '../../src/@types'
 
+const config = configHelperNetworks[1]
+
 describe('Provider tests', () => {
   let providerInstance: Provider
 
@@ -15,14 +18,14 @@ describe('Provider tests', () => {
   })
 
   it('Alice tests valid provider', async () => {
-    const valid = await providerInstance.isValidProvider('http://127.0.0.1:8030')
+    const valid = await providerInstance.isValidProvider(config.providerUri)
     assert(valid === true)
   })
 
   it('Alice checks fileinfo', async () => {
     const fileinfo: FileMetadata[] = await providerInstance.checkFileUrl(
       'https://dumps.wikimedia.org/enwiki/latest/enwiki-latest-abstract.xml.gz-rss.xml',
-      'http://127.0.0.1:8030'
+      'config.providerUri'
     )
     assert(fileinfo[0].valid === true, 'Sent file is not valid')
   })

test/integration/PublishFlows.test.ts

@@ -3,7 +3,7 @@ import ProviderInstance from '../../src/provider/Provider'
 import Aquarius from '../../src/aquarius/Aquarius'
 import { assert } from 'chai'
 import { NftFactory, NftCreateData } from '../../src/factories/index'
-import { getHash, ZERO_ADDRESS } from '../../src/utils'
+import { configHelperNetworks, getHash, ZERO_ADDRESS } from '../../src/utils'
 import { Nft } from '../../src/tokens/NFT'
 import Web3 from 'web3'
 import { SHA256 } from 'crypto-js'
@@ -27,10 +27,12 @@ const data = JSON.parse(
   )
 )
 
+const config = configHelperNetworks[1]
+
 const addresses = data.development
-const aquarius = new Aquarius('http://127.0.0.1:5000')
+const aquarius = new Aquarius(config.metadataCacheUri)
-const web3 = new Web3('http://127.0.0.1:8545')
+const web3 = new Web3(config.nodeUri)
-const providerUrl = 'http://172.15.0.4:8030'
+const providerUrl = config.providerUri
 let nft: Nft
 let factory: NftFactory
 let accounts: string[]

test/integration/SimplePublishConsumeFlow.test.ts

@@ -3,7 +3,7 @@ import Aquarius from '../../src/aquarius/Aquarius'
 import { assert } from 'chai'
 import { NftFactory, NftCreateData } from '../../src/factories/index'
 import { Datatoken } from '../../src/tokens/Datatoken'
-import { getHash } from '../../src/utils'
+import { configHelperNetworks, getHash } from '../../src/utils'
 import { Nft } from '../../src/tokens/NFT'
 import Web3 from 'web3'
 import { SHA256 } from 'crypto-js'
@@ -20,10 +20,12 @@ const data = JSON.parse(
   )
 )
 
+const config = configHelperNetworks[1]
+
 const addresses = data.development
-const aquarius = new Aquarius('http://127.0.0.1:5000')
+const aquarius = new Aquarius(config.metadataCacheUri)
-const web3 = new Web3('http://127.0.0.1:8545')
+const web3 = new Web3(config.nodeUri)
-const providerUrl = 'http://172.15.0.4:8030'
+const providerUrl = config.providerUri
 const assetUrl = [
   {
     type: 'url',

test/unit/NftFactory.test.ts

@@ -12,7 +12,7 @@ import FixedRate from '@oceanprotocol/contracts/artifacts/contracts/pools/fixedR
 import OPFCommunityFeeCollector from '@oceanprotocol/contracts/artifacts/contracts/communityFee/OPFCommunityFeeCollector.sol/OPFCommunityFeeCollector.json'
 import PoolTemplate from '@oceanprotocol/contracts/artifacts/contracts/pools//balancer/BPool.sol/BPool.json'
 import { NftFactory, NftCreateData, TokenOrder } from '../../src/factories/NFTFactory'
-import { ZERO_ADDRESS, signHash } from '../../src/utils'
+import { configHelperNetworks, ZERO_ADDRESS, signHash } from '../../src/utils'
 import {
   ProviderFees,
   FreCreationParams,
@@ -20,7 +20,9 @@ import {
   PoolCreationParams
 } from '../../src/@types'
 
-const web3 = new Web3('http://127.0.0.1:8545')
+const config = configHelperNetworks[1]
+
+const web3 = new Web3(config.nodeUri)
 
 describe('Nft Factory test', () => {
   let factoryOwner: string

test/unit/pools/Router.test.ts

@@ -11,12 +11,16 @@ import Dispenser from '@oceanprotocol/contracts/artifacts/contracts/pools/dispen
 import FixedRate from '@oceanprotocol/contracts/artifacts/contracts/pools/fixedRate/FixedRateExchange.sol/FixedRateExchange.json'
 import OPFCommunityFeeCollector from '@oceanprotocol/contracts/artifacts/contracts/communityFee/OPFCommunityFeeCollector.sol/OPFCommunityFeeCollector.json'
 import PoolTemplate from '@oceanprotocol/contracts/artifacts/contracts/pools/balancer/BPool.sol/BPool.json'
+import { configHelperNetworks } from '../../../src/utils/'
 import { NftFactory, NftCreateData } from '../../../src/factories/NFTFactory'
 import { Router } from '../../../src/pools/Router'
 import { Erc20CreateParams, PoolCreationParams, Operation } from '../../../src/@types'
 
 const { keccak256 } = require('@ethersproject/keccak256')
-const web3 = new Web3('http://127.0.0.1:8545')
+
+const config = configHelperNetworks[1]
+
+const web3 = new Web3(config.nodeUri)
 
 describe('Router unit test', () => {
   let factoryOwner: string

test/unit/pools/balancer/Pool.test.ts

@@ -12,7 +12,12 @@ import Dispenser from '@oceanprotocol/contracts/artifacts/contracts/pools/dispen
 import FixedRate from '@oceanprotocol/contracts/artifacts/contracts/pools/fixedRate/FixedRateExchange.sol/FixedRateExchange.json'
 import PoolTemplate from '@oceanprotocol/contracts/artifacts/contracts/pools/balancer/BPool.sol/BPool.json'
 import OPFCollector from '@oceanprotocol/contracts/artifacts/contracts/communityFee/OPFCommunityFeeCollector.sol/OPFCommunityFeeCollector.json'
-import { allowance, amountToUnits, approve, LoggerInstance } from '../../../../src/utils'
+import {
+  configHelperNetworks,
+  allowance,
+  amountToUnits,
+  approve
+} from '../../../../src/utils'
 import { NftFactory, NftCreateData } from '../../../../src/factories/NFTFactory'
 import { Pool } from '../../../../src/pools/balancer/Pool'
 import {
@@ -23,7 +28,10 @@ import {
   AmountsInMaxFee,
   AmountsOutMaxFee
 } from '../../../../src/@types'
-const web3 = new Web3('http://127.0.0.1:8545')
+
+const config = configHelperNetworks[1]
+
+const web3 = new Web3(config.nodeUri)
 
 describe('Pool unit test', () => {
   let factoryOwner: string

test/unit/pools/dispenser/Dispenser.test.ts

@@ -10,13 +10,16 @@ import DispenserTemplate from '@oceanprotocol/contracts/artifacts/contracts/pool
 import FixedRate from '@oceanprotocol/contracts/artifacts/contracts/pools/fixedRate/FixedRateExchange.sol/FixedRateExchange.json'
 import PoolTemplate from '@oceanprotocol/contracts/artifacts/contracts/pools/balancer/BPool.sol/BPool.json'
 import OPFCollector from '@oceanprotocol/contracts/artifacts/contracts/communityFee/OPFCommunityFeeCollector.sol/OPFCommunityFeeCollector.json'
+import { configHelperNetworks } from '../../../../src/utils/'
 import { NftFactory, NftCreateData } from '../../../../src/factories/'
 import { Datatoken, DispenserParams } from '../../../../src/tokens/'
 import { Dispenser } from '../../../../src/pools/dispenser/'
 import { TestContractHandler } from '../../../TestContractHandler'
 import { Erc20CreateParams } from '../../../../src/@types'
 
-const web3 = new Web3('http://127.0.0.1:8545')
+const config = configHelperNetworks[1]
+
+const web3 = new Web3(config.nodeUri)
 
 describe('Dispenser flow', () => {
   let factoryOwner: string

test/unit/pools/fixedRate/FixedRateExchange.test.ts

@@ -13,10 +13,14 @@ import Dispenser from '@oceanprotocol/contracts/artifacts/contracts/pools/dispen
 import FixedRate from '@oceanprotocol/contracts/artifacts/contracts/pools/fixedRate/FixedRateExchange.sol/FixedRateExchange.json'
 import PoolTemplate from '@oceanprotocol/contracts/artifacts/contracts/pools/balancer/BPool.sol/BPool.json'
 import OPFCollector from '@oceanprotocol/contracts/artifacts/contracts/communityFee/OPFCommunityFeeCollector.sol/OPFCommunityFeeCollector.json'
+import { configHelperNetworks } from '../../../../src/utils/'
 import { NftFactory, NftCreateData } from '../../../../src/factories/NFTFactory'
 import { FixedRateExchange } from '../../../../src/pools/fixedRate/FixedRateExchange'
 import { FreCreationParams, Erc20CreateParams } from '../../../../src/@types'
-const web3 = new Web3('http://127.0.0.1:8545')
+
+const config = configHelperNetworks[1]
+
+const web3 = new Web3(config.nodeUri)
 
 describe('Fixed Rate unit test', () => {
   let factoryOwner: string

test/unit/pools/ssContracts/SideStaking.test.ts

@@ -12,7 +12,12 @@ import Dispenser from '@oceanprotocol/contracts/artifacts/contracts/pools/dispen
 import FixedRate from '@oceanprotocol/contracts/artifacts/contracts/pools/fixedRate/FixedRateExchange.sol/FixedRateExchange.json'
 import PoolTemplate from '@oceanprotocol/contracts/artifacts/contracts/pools/balancer/BPool.sol/BPool.json'
 import OPFCollector from '@oceanprotocol/contracts/artifacts/contracts/communityFee/OPFCommunityFeeCollector.sol/OPFCommunityFeeCollector.json'
-import { allowance, amountToUnits, approve, LoggerInstance } from '../../../../src/utils'
+import {
+  configHelperNetworks,
+  allowance,
+  amountToUnits,
+  approve
+} from '../../../../src/utils'
 import { NftFactory, NftCreateData } from '../../../../src/factories/NFTFactory'
 import { Pool } from '../../../../src/pools/balancer/Pool'
 import { SideStaking } from '../../../../src/pools/ssContracts/SideStaking'
@@ -23,7 +28,10 @@ import {
   AmountsInMaxFee,
   AmountsOutMaxFee
 } from '../../../../src/@types'
-const web3 = new Web3('http://127.0.0.1:8545')
+
+const config = configHelperNetworks[1]
+
+const web3 = new Web3(config.nodeUri)
 
 describe('SideStaking unit test', () => {
   let factoryOwner: string

test/unit/tokens/Datatoken.test.ts

@@ -15,10 +15,12 @@ import { TestContractHandler } from '../../TestContractHandler'
 import { NftFactory, NftCreateData } from '../../../src/factories/NFTFactory'
 import { Datatoken, Nft, OrderParams, DispenserParams } from '../../../src/tokens'
 import { AbiItem } from 'web3-utils'
-import { ZERO_ADDRESS, signHash } from '../../../src/utils'
+import { configHelperNetworks, ZERO_ADDRESS, signHash } from '../../../src/utils'
 import { ProviderFees, FreCreationParams, FreOrderParams } from '../../../src/@types/'
 
-const web3 = new Web3('http://127.0.0.1:8545')
+const config = configHelperNetworks[1]
+
+const web3 = new Web3(config.nodeUri)
 
 describe('Datatoken', () => {
   let nftOwner: string

test/unit/tokens/Nft.test.ts

@@ -10,13 +10,16 @@ import Dispenser from '@oceanprotocol/contracts/artifacts/contracts/pools/dispen
 import FixedRate from '@oceanprotocol/contracts/artifacts/contracts/pools/fixedRate/FixedRateExchange.sol/FixedRateExchange.json'
 import OPFCollector from '@oceanprotocol/contracts/artifacts/contracts/communityFee/OPFCommunityFeeCollector.sol/OPFCommunityFeeCollector.json'
 import { TestContractHandler } from '../../TestContractHandler'
+import { configHelperNetworks } from '../../../src/utils/'
 import { NftFactory, NftCreateData } from '../../../src/factories/NFTFactory'
 import { Nft } from '../../../src/tokens/NFT'
 import { AbiItem } from 'web3-utils'
 import sha256 from 'crypto-js/sha256'
 import { MetadataAndTokenURI } from '../../../src/@types/Erc721'
 
-const web3 = new Web3('http://127.0.0.1:8545')
+const config = configHelperNetworks[1]
+
+const web3 = new Web3(config.nodeUri)
 
 describe('NFT', () => {
   let nftOwner: string