fix artifacts path in all test files

oceanprotocol · Jan 11, 2022 · 24425fc · 24425fc
1 parent b7b7d8f
commit 24425fc
Show file tree

Hide file tree

Showing 12 changed files with 75 additions and 77 deletions.
diff --git a/test/TestContractHandler.ts b/test/TestContractHandler.ts
@@ -1,7 +1,7 @@
 import Web3 from 'web3'
 import { Contract } from 'web3-eth-contract'
 import { AbiItem } from 'web3-utils/types'
-import MockERC20 from '../artifacts/utils/mock/MockERC20Decimals.sol/MockERC20Decimals.json'
+import MockERC20 from '../src/artifacts/utils/mock/MockERC20Decimals.sol/MockERC20Decimals.json'
 
 const oceanAddress = '0x967da4048cd07ab37855c090aaf366e4ce1b9f48'
 export class TestContractHandler {

diff --git a/test/integration/Provider.test.ts b/test/integration/Provider.test.ts
@@ -1,4 +1,3 @@
-import config from './config'
 import { Provider } from '../../src/provider/Provider'
 import { assert } from 'chai'
 import { fetchData } from '../../src/utils'

diff --git a/test/integration/PublishFlows.test.ts b/test/integration/PublishFlows.test.ts
@@ -1,4 +1,4 @@
-import MockERC20 from '../artifacts/utils/mock/MockERC20Decimals.sol/MockERC20Decimals.json'
+import MockERC20 from '../../src/artifacts/utils/mock/MockERC20Decimals.sol/MockERC20Decimals.json'
 import ProviderInstance from '../../src/provider/Provider'
 import Aquarius from '../../src/aquarius/Aquarius'
 import { assert } from 'chai'

diff --git a/test/integration/SimplePublishConsumeFlow.test.ts b/test/integration/SimplePublishConsumeFlow.test.ts
@@ -1,4 +1,3 @@
-import config from './config'
 import ProviderInstance, { Provider } from '../../src/provider/Provider'
 import Aquarius from '../../src/aquarius/Aquarius'
 import { assert } from 'chai'

diff --git a/test/unit/NftFactory.test.ts b/test/unit/NftFactory.test.ts
@@ -2,15 +2,15 @@ import { assert, expect } from 'chai'
 import { AbiItem } from 'web3-utils/types'
 import { TestContractHandler } from '../TestContractHandler'
 import Web3 from 'web3'
-import ERC721Factory from '../artifacts/ERC721Factory.sol/ERC721Factory.json'
-import ERC721Template from '../artifacts/templates/ERC721Template.sol/ERC721Template.json'
-import SideStaking from '../artifacts/pools/ssContracts/SideStaking.sol/SideStaking.json'
-import Router from '../artifacts/pools/FactoryRouter.sol/FactoryRouter.json'
-import ERC20Template from '../artifacts/templates/ERC20Template.sol/ERC20Template.json'
-import Dispenser from '../artifacts/pools/dispenser/Dispenser.sol/Dispenser.json'
-import FixedRate from '../artifacts/pools/fixedRate/FixedRateExchange.sol/FixedRateExchange.json'
-import OPFCommunityFeeCollector from '../artifacts/communityFee/OPFCommunityFeeCollector.sol/OPFCommunityFeeCollector.json'
-import PoolTemplate from '../artifacts/pools//balancer/BPool.sol/BPool.json'
+import ERC721Factory from '../../src/artifacts/ERC721Factory.sol/ERC721Factory.json'
+import ERC721Template from '../../src/artifacts/templates/ERC721Template.sol/ERC721Template.json'
+import SideStaking from '../../src/artifacts/pools/ssContracts/SideStaking.sol/SideStaking.json'
+import Router from '../../src/artifacts/pools/FactoryRouter.sol/FactoryRouter.json'
+import ERC20Template from '../../src/artifacts/templates/ERC20Template.sol/ERC20Template.json'
+import Dispenser from '../../src/artifacts/pools/dispenser/Dispenser.sol/Dispenser.json'
+import FixedRate from '../../src/artifacts/pools/fixedRate/FixedRateExchange.sol/FixedRateExchange.json'
+import OPFCommunityFeeCollector from '../../src/artifacts/communityFee/OPFCommunityFeeCollector.sol/OPFCommunityFeeCollector.json'
+import PoolTemplate from '../../src/artifacts/pools//balancer/BPool.sol/BPool.json'
 import { NftFactory, NftCreateData, TokenOrder } from '../../src/factories/NFTFactory'
 import {
   FreCreationParams,

diff --git a/test/unit/pools/Router.test.ts b/test/unit/pools/Router.test.ts
@@ -2,15 +2,15 @@ import { assert, expect } from 'chai'
 import { AbiItem } from 'web3-utils/types'
 import Web3 from 'web3'
 import { TestContractHandler } from '../../TestContractHandler'
-import ERC721Factory from '../../artifacts/ERC721Factory.sol/ERC721Factory.json'
-import ERC721Template from '../../artifacts/templates/ERC721Template.sol/ERC721Template.json'
-import SideStaking from '../../artifacts/pools/ssContracts/SideStaking.sol/SideStaking.json'
-import FactoryRouter from '../../artifacts/pools/FactoryRouter.sol/FactoryRouter.json'
-import ERC20Template from '../../artifacts/templates/ERC20Template.sol/ERC20Template.json'
-import Dispenser from '../../artifacts/pools/dispenser/Dispenser.sol/Dispenser.json'
-import FixedRate from '../../artifacts/pools/fixedRate/FixedRateExchange.sol/FixedRateExchange.json'
-import OPFCommunityFeeCollector from '../../artifacts/communityFee/OPFCommunityFeeCollector.sol/OPFCommunityFeeCollector.json'
-import PoolTemplate from '../../artifacts/pools/balancer/BPool.sol/BPool.json'
+import ERC721Factory from '../../../src/artifacts/ERC721Factory.sol/ERC721Factory.json'
+import ERC721Template from '../../../src/artifacts/templates/ERC721Template.sol/ERC721Template.json'
+import SideStaking from '../../../src/artifacts/pools/ssContracts/SideStaking.sol/SideStaking.json'
+import FactoryRouter from '../../../src/artifacts/pools/FactoryRouter.sol/FactoryRouter.json'
+import ERC20Template from '../../../src/artifacts/templates/ERC20Template.sol/ERC20Template.json'
+import Dispenser from '../../../src/artifacts/pools/dispenser/Dispenser.sol/Dispenser.json'
+import FixedRate from '../../../src/artifacts/pools/fixedRate/FixedRateExchange.sol/FixedRateExchange.json'
+import OPFCommunityFeeCollector from '../../../src/artifacts/communityFee/OPFCommunityFeeCollector.sol/OPFCommunityFeeCollector.json'
+import PoolTemplate from '../../../src/artifacts/pools/balancer/BPool.sol/BPool.json'
 import { NftFactory, NftCreateData } from '../../../src/factories/NFTFactory'
 import { Router } from '../../../src/pools/Router'
 import { Erc20CreateParams, PoolCreationParams, Operation } from '../../../src/interfaces'

diff --git a/test/unit/pools/balancer/Pool.test.ts b/test/unit/pools/balancer/Pool.test.ts
@@ -3,15 +3,15 @@ import { AbiItem } from 'web3-utils/types'
 import { TestContractHandler } from '../../../TestContractHandler'
 import { Contract } from 'web3-eth-contract'
 import Web3 from 'web3'
-import ERC721Factory from '../../../artifacts/ERC721Factory.sol/ERC721Factory.json'
-import ERC721Template from '../../../artifacts/templates/ERC721Template.sol/ERC721Template.json'
-import SideStaking from '../../../artifacts/pools/ssContracts/SideStaking.sol/SideStaking.json'
-import FactoryRouter from '../../../artifacts/pools/FactoryRouter.sol/FactoryRouter.json'
-import ERC20Template from '../../../artifacts/templates/ERC20Template.sol/ERC20Template.json'
-import Dispenser from '../../../artifacts/pools/dispenser/Dispenser.sol/Dispenser.json'
-import FixedRate from '../../../artifacts/pools/fixedRate/FixedRateExchange.sol/FixedRateExchange.json'
-import PoolTemplate from '../../../artifacts/pools/balancer/BPool.sol/BPool.json'
-import OPFCollector from '../../../artifacts/communityFee/OPFCommunityFeeCollector.sol/OPFCommunityFeeCollector.json'
+import ERC721Factory from '../../../../src/artifacts/ERC721Factory.sol/ERC721Factory.json'
+import ERC721Template from '../../../../src/artifacts/templates/ERC721Template.sol/ERC721Template.json'
+import SideStaking from '../../../../src/artifacts/pools/ssContracts/SideStaking.sol/SideStaking.json'
+import FactoryRouter from '../../../../src/artifacts/pools/FactoryRouter.sol/FactoryRouter.json'
+import ERC20Template from '../../../../src/artifacts/templates/ERC20Template.sol/ERC20Template.json'
+import Dispenser from '../../../../src/artifacts/pools/dispenser/Dispenser.sol/Dispenser.json'
+import FixedRate from '../../../../src/artifacts/pools/fixedRate/FixedRateExchange.sol/FixedRateExchange.json'
+import PoolTemplate from '../../../../src/artifacts/pools/balancer/BPool.sol/BPool.json'
+import OPFCollector from '../../../../src/artifacts/communityFee/OPFCommunityFeeCollector.sol/OPFCommunityFeeCollector.json'
 import { LoggerInstance } from '../../../../src/utils'
 import { NftFactory, NftCreateData } from '../../../../src/factories/NFTFactory'
 import { Pool } from '../../../../src/pools/balancer/Pool'

diff --git a/test/unit/pools/dispenser/Dispenser.test.ts b/test/unit/pools/dispenser/Dispenser.test.ts
@@ -1,15 +1,15 @@
 import Web3 from 'web3'
 import { AbiItem } from 'web3-utils'
 import { assert, expect } from 'chai'
-import ERC721Factory from '../../../artifacts/ERC721Factory.sol/ERC721Factory.json'
-import ERC721Template from '../../../artifacts/templates/ERC721Template.sol/ERC721Template.json'
-import SideStaking from '../../../artifacts/pools/ssContracts/SideStaking.sol/SideStaking.json'
-import FactoryRouter from '../../../artifacts/pools/FactoryRouter.sol/FactoryRouter.json'
-import ERC20Template from '../../../artifacts/templates/ERC20Template.sol/ERC20Template.json'
-import DispenserTemplate from '../../../artifacts/pools/dispenser/Dispenser.sol/Dispenser.json'
-import FixedRate from '../../../artifacts/pools/fixedRate/FixedRateExchange.sol/FixedRateExchange.json'
-import PoolTemplate from '../../../artifacts/pools/balancer/BPool.sol/BPool.json'
-import OPFCollector from '../../../artifacts/communityFee/OPFCommunityFeeCollector.sol/OPFCommunityFeeCollector.json'
+import ERC721Factory from '../../../../src/artifacts/ERC721Factory.sol/ERC721Factory.json'
+import ERC721Template from '../../../../src/artifacts/templates/ERC721Template.sol/ERC721Template.json'
+import SideStaking from '../../../../src/artifacts/pools/ssContracts/SideStaking.sol/SideStaking.json'
+import FactoryRouter from '../../../../src/artifacts/pools/FactoryRouter.sol/FactoryRouter.json'
+import ERC20Template from '../../../../src/artifacts/templates/ERC20Template.sol/ERC20Template.json'
+import DispenserTemplate from '../../../../src/artifacts/pools/dispenser/Dispenser.sol/Dispenser.json'
+import FixedRate from '../../../../src/artifacts/pools/fixedRate/FixedRateExchange.sol/FixedRateExchange.json'
+import PoolTemplate from '../../../../src/artifacts/pools/balancer/BPool.sol/BPool.json'
+import OPFCollector from '../../../../src/artifacts/communityFee/OPFCommunityFeeCollector.sol/OPFCommunityFeeCollector.json'
 import { NftFactory, NftCreateData } from '../../../../src/factories/'
 import { Datatoken, DispenserParams } from '../../../../src/tokens/'
 import { Dispenser } from '../../../../src/pools/dispenser/'

diff --git a/test/unit/pools/fixedRate/FixedRateExchange.test.ts b/test/unit/pools/fixedRate/FixedRateExchange.test.ts
@@ -4,15 +4,15 @@ import { TestContractHandler } from '../../../TestContractHandler'
 import { Contract } from 'web3-eth-contract'
 import Web3 from 'web3'
 import BN from 'bn.js'
-import ERC721Factory from '../../../artifacts/ERC721Factory.sol/ERC721Factory.json'
-import ERC721Template from '../../../artifacts/templates/ERC721Template.sol/ERC721Template.json'
-import SSContract from '../../../artifacts/pools/ssContracts/SideStaking.sol/SideStaking.json'
-import FactoryRouter from '../../../artifacts/pools/FactoryRouter.sol/FactoryRouter.json'
-import ERC20Template from '../../../artifacts/templates/ERC20Template.sol/ERC20Template.json'
-import Dispenser from '../../../artifacts/pools/dispenser/Dispenser.sol/Dispenser.json'
-import FixedRate from '../../../artifacts/pools/fixedRate/FixedRateExchange.sol/FixedRateExchange.json'
-import PoolTemplate from '../../../artifacts/pools/balancer/BPool.sol/BPool.json'
-import OPFCollector from '../../../artifacts/communityFee/OPFCommunityFeeCollector.sol/OPFCommunityFeeCollector.json'
+import ERC721Factory from '../../../../src/artifacts/ERC721Factory.sol/ERC721Factory.json'
+import ERC721Template from '../../../../src/artifacts/templates/ERC721Template.sol/ERC721Template.json'
+import SSContract from '../../../../src/artifacts/pools/ssContracts/SideStaking.sol/SideStaking.json'
+import FactoryRouter from '../../../../src/artifacts/pools/FactoryRouter.sol/FactoryRouter.json'
+import ERC20Template from '../../../../src/artifacts/templates/ERC20Template.sol/ERC20Template.json'
+import Dispenser from '../../../../src/artifacts/pools/dispenser/Dispenser.sol/Dispenser.json'
+import FixedRate from '../../../../src/artifacts/pools/fixedRate/FixedRateExchange.sol/FixedRateExchange.json'
+import PoolTemplate from '../../../../src/artifacts/pools/balancer/BPool.sol/BPool.json'
+import OPFCollector from '../../../../src/artifacts/communityFee/OPFCommunityFeeCollector.sol/OPFCommunityFeeCollector.json'
 import { NftFactory, NftCreateData } from '../../../../src/factories/NFTFactory'
 import { FixedRateExchange } from '../../../../src/pools/fixedRate/FixedRateExchange'
 import { FreCreationParams, Erc20CreateParams } from '../../../../src/interfaces'

diff --git a/test/unit/pools/ssContracts/SideStaking.test.ts b/test/unit/pools/ssContracts/SideStaking.test.ts
@@ -3,15 +3,15 @@ import { AbiItem } from 'web3-utils/types'
 import { TestContractHandler } from '../../../TestContractHandler'
 import { Contract } from 'web3-eth-contract'
 import Web3 from 'web3'
-import ERC721Factory from '../../../artifacts/ERC721Factory.sol/ERC721Factory.json'
-import ERC721Template from '../../../artifacts/templates/ERC721Template.sol/ERC721Template.json'
-import SSContract from '../../../artifacts/pools/ssContracts/SideStaking.sol/SideStaking.json'
-import FactoryRouter from '../../../artifacts/pools/FactoryRouter.sol/FactoryRouter.json'
-import ERC20Template from '../../../artifacts/templates/ERC20Template.sol/ERC20Template.json'
-import Dispenser from '../../../artifacts/pools/dispenser/Dispenser.sol/Dispenser.json'
-import FixedRate from '../../../artifacts/pools/fixedRate/FixedRateExchange.sol/FixedRateExchange.json'
-import PoolTemplate from '../../../artifacts/pools/balancer/BPool.sol/BPool.json'
-import OPFCollector from '../../../artifacts/communityFee/OPFCommunityFeeCollector.sol/OPFCommunityFeeCollector.json'
+import ERC721Factory from '../../../../src/artifacts/ERC721Factory.sol/ERC721Factory.json'
+import ERC721Template from '../../../../src/artifacts/templates/ERC721Template.sol/ERC721Template.json'
+import SSContract from '../../../../src/artifacts/pools/ssContracts/SideStaking.sol/SideStaking.json'
+import FactoryRouter from '../../../../src/artifacts/pools/FactoryRouter.sol/FactoryRouter.json'
+import ERC20Template from '../../../../src/artifacts/templates/ERC20Template.sol/ERC20Template.json'
+import Dispenser from '../../../../src/artifacts/pools/dispenser/Dispenser.sol/Dispenser.json'
+import FixedRate from '../../../../src/artifacts/pools/fixedRate/FixedRateExchange.sol/FixedRateExchange.json'
+import PoolTemplate from '../../../../src/artifacts/pools/balancer/BPool.sol/BPool.json'
+import OPFCollector from '../../../../src/artifacts/communityFee/OPFCommunityFeeCollector.sol/OPFCommunityFeeCollector.json'
 import { LoggerInstance } from '../../../../src/utils'
 import { NftFactory, NftCreateData } from '../../../../src/factories/NFTFactory'
 import { Pool } from '../../../../src/pools/balancer/Pool'

diff --git a/test/unit/tokens/Datatoken.test.ts b/test/unit/tokens/Datatoken.test.ts
@@ -1,15 +1,15 @@
 import { assert } from 'chai'
 import Web3 from 'web3'
-import ERC20TemplateEnterprise from '../../artifacts/templates/ERC20TemplateEnterprise.sol/ERC20TemplateEnterprise.json'
-import PoolTemplate from '../../artifacts/pools/balancer/BPool.sol/BPool.json'
-import ERC721Factory from '../../artifacts/ERC721Factory.sol/ERC721Factory.json'
-import ERC721Template from '../../artifacts/templates/ERC721Template.sol/ERC721Template.json'
-import SideStaking from '../../artifacts/pools/ssContracts/SideStaking.sol/SideStaking.json'
-import Router from '../../artifacts/pools/FactoryRouter.sol/FactoryRouter.json'
-import ERC20Template from '../../artifacts/templates/ERC20Template.sol/ERC20Template.json'
-import Dispenser from '../../artifacts/pools/dispenser/Dispenser.sol/Dispenser.json'
-import FixedRate from '../../artifacts/pools/fixedRate/FixedRateExchange.sol/FixedRateExchange.json'
-import OPFCollector from '../../artifacts/communityFee/OPFCommunityFeeCollector.sol/OPFCommunityFeeCollector.json'
+import ERC20TemplateEnterprise from '../../../src/artifacts/templates/ERC20TemplateEnterprise.sol/ERC20TemplateEnterprise.json'
+import PoolTemplate from '../../../src/artifacts/pools/balancer/BPool.sol/BPool.json'
+import ERC721Factory from '../../../src/artifacts/ERC721Factory.sol/ERC721Factory.json'
+import ERC721Template from '../../../src/artifacts/templates/ERC721Template.sol/ERC721Template.json'
+import SideStaking from '../../../src/artifacts/pools/ssContracts/SideStaking.sol/SideStaking.json'
+import Router from '../../../src/artifacts/pools/FactoryRouter.sol/FactoryRouter.json'
+import ERC20Template from '../../../src/artifacts/templates/ERC20Template.sol/ERC20Template.json'
+import Dispenser from '../../../src/artifacts/pools/dispenser/Dispenser.sol/Dispenser.json'
+import FixedRate from '../../../src/artifacts/pools/fixedRate/FixedRateExchange.sol/FixedRateExchange.json'
+import OPFCollector from '../../../src/artifacts/communityFee/OPFCommunityFeeCollector.sol/OPFCommunityFeeCollector.json'
 
 import { TestContractHandler } from '../../TestContractHandler'
 import { NftFactory, NftCreateData } from '../../../src/factories/NFTFactory'

diff --git a/test/unit/tokens/Nft.test.ts b/test/unit/tokens/Nft.test.ts
@@ -1,14 +1,14 @@
 import { assert } from 'chai'
 import Web3 from 'web3'
-import PoolTemplate from '../../artifacts/pools/balancer/BPool.sol/BPool.json'
-import ERC721Factory from '../../artifacts/ERC721Factory.sol/ERC721Factory.json'
-import ERC721Template from '../../artifacts/templates/ERC721Template.sol/ERC721Template.json'
-import SideStaking from '../../artifacts/pools/ssContracts/SideStaking.sol/SideStaking.json'
-import Router from '../../artifacts/pools/FactoryRouter.sol/FactoryRouter.json'
-import ERC20Template from '../../artifacts/templates/ERC20Template.sol/ERC20Template.json'
-import Dispenser from '../../artifacts/pools/dispenser/Dispenser.sol/Dispenser.json'
-import FixedRate from '../../artifacts/pools/fixedRate/FixedRateExchange.sol/FixedRateExchange.json'
-import OPFCollector from '../../artifacts/communityFee/OPFCommunityFeeCollector.sol/OPFCommunityFeeCollector.json'
+import PoolTemplate from '../../../src/artifacts/pools/balancer/BPool.sol/BPool.json'
+import ERC721Factory from '../../../src/artifacts/ERC721Factory.sol/ERC721Factory.json'
+import ERC721Template from '../../../src/artifacts/templates/ERC721Template.sol/ERC721Template.json'
+import SideStaking from '../../../src/artifacts/pools/ssContracts/SideStaking.sol/SideStaking.json'
+import Router from '../../../src/artifacts/pools/FactoryRouter.sol/FactoryRouter.json'
+import ERC20Template from '../../../src/artifacts/templates/ERC20Template.sol/ERC20Template.json'
+import Dispenser from '../../../src/artifacts/pools/dispenser/Dispenser.sol/Dispenser.json'
+import FixedRate from '../../../src/artifacts/pools/fixedRate/FixedRateExchange.sol/FixedRateExchange.json'
+import OPFCollector from '../../../src/artifacts/communityFee/OPFCommunityFeeCollector.sol/OPFCommunityFeeCollector.json'
 import { TestContractHandler } from '../../TestContractHandler'
 import { NftFactory, NftCreateData } from '../../../src/factories/NFTFactory'
 import { Nft } from '../../../src/tokens/NFT'