diff --git a/artifacts/ERC721Factory.sol/ERC721Factory.dbg.json b/src/artifacts/ERC721Factory.sol/ERC721Factory.dbg.json similarity index 100% rename from artifacts/ERC721Factory.sol/ERC721Factory.dbg.json rename to src/artifacts/ERC721Factory.sol/ERC721Factory.dbg.json diff --git a/artifacts/ERC721Factory.sol/ERC721Factory.json b/src/artifacts/ERC721Factory.sol/ERC721Factory.json similarity index 100% rename from artifacts/ERC721Factory.sol/ERC721Factory.json rename to src/artifacts/ERC721Factory.sol/ERC721Factory.json diff --git a/artifacts/addresses/address.json b/src/artifacts/addresses/address.json similarity index 100% rename from artifacts/addresses/address.json rename to src/artifacts/addresses/address.json diff --git a/artifacts/communityFee/OPFCommunityFeeCollector.sol/OPFCommunityFeeCollector.dbg.json b/src/artifacts/communityFee/OPFCommunityFeeCollector.sol/OPFCommunityFeeCollector.dbg.json similarity index 100% rename from artifacts/communityFee/OPFCommunityFeeCollector.sol/OPFCommunityFeeCollector.dbg.json rename to src/artifacts/communityFee/OPFCommunityFeeCollector.sol/OPFCommunityFeeCollector.dbg.json diff --git a/artifacts/communityFee/OPFCommunityFeeCollector.sol/OPFCommunityFeeCollector.json b/src/artifacts/communityFee/OPFCommunityFeeCollector.sol/OPFCommunityFeeCollector.json similarity index 100% rename from artifacts/communityFee/OPFCommunityFeeCollector.sol/OPFCommunityFeeCollector.json rename to src/artifacts/communityFee/OPFCommunityFeeCollector.sol/OPFCommunityFeeCollector.json diff --git a/artifacts/pools/FactoryRouter.sol/FactoryRouter.dbg.json b/src/artifacts/pools/FactoryRouter.sol/FactoryRouter.dbg.json similarity index 100% rename from artifacts/pools/FactoryRouter.sol/FactoryRouter.dbg.json rename to src/artifacts/pools/FactoryRouter.sol/FactoryRouter.dbg.json diff --git a/artifacts/pools/FactoryRouter.sol/FactoryRouter.json b/src/artifacts/pools/FactoryRouter.sol/FactoryRouter.json similarity index 100% rename from artifacts/pools/FactoryRouter.sol/FactoryRouter.json rename to src/artifacts/pools/FactoryRouter.sol/FactoryRouter.json diff --git a/artifacts/pools/balancer/BPool.sol/BPool.dbg.json b/src/artifacts/pools/balancer/BPool.sol/BPool.dbg.json similarity index 100% rename from artifacts/pools/balancer/BPool.sol/BPool.dbg.json rename to src/artifacts/pools/balancer/BPool.sol/BPool.dbg.json diff --git a/artifacts/pools/balancer/BPool.sol/BPool.json b/src/artifacts/pools/balancer/BPool.sol/BPool.json similarity index 100% rename from artifacts/pools/balancer/BPool.sol/BPool.json rename to src/artifacts/pools/balancer/BPool.sol/BPool.json diff --git a/artifacts/pools/dispenser/Dispenser.sol/Dispenser.dbg.json b/src/artifacts/pools/dispenser/Dispenser.sol/Dispenser.dbg.json similarity index 100% rename from artifacts/pools/dispenser/Dispenser.sol/Dispenser.dbg.json rename to src/artifacts/pools/dispenser/Dispenser.sol/Dispenser.dbg.json diff --git a/artifacts/pools/dispenser/Dispenser.sol/Dispenser.json b/src/artifacts/pools/dispenser/Dispenser.sol/Dispenser.json similarity index 100% rename from artifacts/pools/dispenser/Dispenser.sol/Dispenser.json rename to src/artifacts/pools/dispenser/Dispenser.sol/Dispenser.json diff --git a/artifacts/pools/fixedRate/FixedRateExchange.sol/FixedRateExchange.dbg.json b/src/artifacts/pools/fixedRate/FixedRateExchange.sol/FixedRateExchange.dbg.json similarity index 100% rename from artifacts/pools/fixedRate/FixedRateExchange.sol/FixedRateExchange.dbg.json rename to src/artifacts/pools/fixedRate/FixedRateExchange.sol/FixedRateExchange.dbg.json diff --git a/artifacts/pools/fixedRate/FixedRateExchange.sol/FixedRateExchange.json b/src/artifacts/pools/fixedRate/FixedRateExchange.sol/FixedRateExchange.json similarity index 100% rename from artifacts/pools/fixedRate/FixedRateExchange.sol/FixedRateExchange.json rename to src/artifacts/pools/fixedRate/FixedRateExchange.sol/FixedRateExchange.json diff --git a/artifacts/pools/ssContracts/SideStaking.sol/SideStaking.dbg.json b/src/artifacts/pools/ssContracts/SideStaking.sol/SideStaking.dbg.json similarity index 100% rename from artifacts/pools/ssContracts/SideStaking.sol/SideStaking.dbg.json rename to src/artifacts/pools/ssContracts/SideStaking.sol/SideStaking.dbg.json diff --git a/artifacts/pools/ssContracts/SideStaking.sol/SideStaking.json b/src/artifacts/pools/ssContracts/SideStaking.sol/SideStaking.json similarity index 100% rename from artifacts/pools/ssContracts/SideStaking.sol/SideStaking.json rename to src/artifacts/pools/ssContracts/SideStaking.sol/SideStaking.json diff --git a/artifacts/templates/ERC20Template.sol/ERC20Template.dbg.json b/src/artifacts/templates/ERC20Template.sol/ERC20Template.dbg.json similarity index 100% rename from artifacts/templates/ERC20Template.sol/ERC20Template.dbg.json rename to src/artifacts/templates/ERC20Template.sol/ERC20Template.dbg.json diff --git a/artifacts/templates/ERC20Template.sol/ERC20Template.json b/src/artifacts/templates/ERC20Template.sol/ERC20Template.json similarity index 100% rename from artifacts/templates/ERC20Template.sol/ERC20Template.json rename to src/artifacts/templates/ERC20Template.sol/ERC20Template.json diff --git a/artifacts/templates/ERC20TemplateEnterprise.sol/ERC20TemplateEnterprise.dbg.json b/src/artifacts/templates/ERC20TemplateEnterprise.sol/ERC20TemplateEnterprise.dbg.json similarity index 100% rename from artifacts/templates/ERC20TemplateEnterprise.sol/ERC20TemplateEnterprise.dbg.json rename to src/artifacts/templates/ERC20TemplateEnterprise.sol/ERC20TemplateEnterprise.dbg.json diff --git a/artifacts/templates/ERC20TemplateEnterprise.sol/ERC20TemplateEnterprise.json b/src/artifacts/templates/ERC20TemplateEnterprise.sol/ERC20TemplateEnterprise.json similarity index 100% rename from artifacts/templates/ERC20TemplateEnterprise.sol/ERC20TemplateEnterprise.json rename to src/artifacts/templates/ERC20TemplateEnterprise.sol/ERC20TemplateEnterprise.json diff --git a/artifacts/templates/ERC721Template.sol/ERC721Template.dbg.json b/src/artifacts/templates/ERC721Template.sol/ERC721Template.dbg.json similarity index 100% rename from artifacts/templates/ERC721Template.sol/ERC721Template.dbg.json rename to src/artifacts/templates/ERC721Template.sol/ERC721Template.dbg.json diff --git a/artifacts/templates/ERC721Template.sol/ERC721Template.json b/src/artifacts/templates/ERC721Template.sol/ERC721Template.json similarity index 100% rename from artifacts/templates/ERC721Template.sol/ERC721Template.json rename to src/artifacts/templates/ERC721Template.sol/ERC721Template.json diff --git a/artifacts/utils/mock/MockERC20.sol/MockERC20.dbg.json b/src/artifacts/utils/mock/MockERC20.sol/MockERC20.dbg.json similarity index 100% rename from artifacts/utils/mock/MockERC20.sol/MockERC20.dbg.json rename to src/artifacts/utils/mock/MockERC20.sol/MockERC20.dbg.json diff --git a/artifacts/utils/mock/MockERC20.sol/MockERC20.json b/src/artifacts/utils/mock/MockERC20.sol/MockERC20.json similarity index 100% rename from artifacts/utils/mock/MockERC20.sol/MockERC20.json rename to src/artifacts/utils/mock/MockERC20.sol/MockERC20.json diff --git a/artifacts/utils/mock/MockERC20Decimals.sol/MockERC20Decimals.dbg.json b/src/artifacts/utils/mock/MockERC20Decimals.sol/MockERC20Decimals.dbg.json similarity index 100% rename from artifacts/utils/mock/MockERC20Decimals.sol/MockERC20Decimals.dbg.json rename to src/artifacts/utils/mock/MockERC20Decimals.sol/MockERC20Decimals.dbg.json diff --git a/artifacts/utils/mock/MockERC20Decimals.sol/MockERC20Decimals.json b/src/artifacts/utils/mock/MockERC20Decimals.sol/MockERC20Decimals.json similarity index 100% rename from artifacts/utils/mock/MockERC20Decimals.sol/MockERC20Decimals.json rename to src/artifacts/utils/mock/MockERC20Decimals.sol/MockERC20Decimals.json diff --git a/artifacts/utils/mock/MockExchange.sol/MockExchange.dbg.json b/src/artifacts/utils/mock/MockExchange.sol/MockExchange.dbg.json similarity index 100% rename from artifacts/utils/mock/MockExchange.sol/MockExchange.dbg.json rename to src/artifacts/utils/mock/MockExchange.sol/MockExchange.dbg.json diff --git a/artifacts/utils/mock/MockExchange.sol/MockExchange.json b/src/artifacts/utils/mock/MockExchange.sol/MockExchange.json similarity index 100% rename from artifacts/utils/mock/MockExchange.sol/MockExchange.json rename to src/artifacts/utils/mock/MockExchange.sol/MockExchange.json diff --git a/artifacts/utils/mock/MockOcean.sol/MockOcean.dbg.json b/src/artifacts/utils/mock/MockOcean.sol/MockOcean.dbg.json similarity index 100% rename from artifacts/utils/mock/MockOcean.sol/MockOcean.dbg.json rename to src/artifacts/utils/mock/MockOcean.sol/MockOcean.dbg.json diff --git a/artifacts/utils/mock/MockOcean.sol/MockOcean.json b/src/artifacts/utils/mock/MockOcean.sol/MockOcean.json similarity index 100% rename from artifacts/utils/mock/MockOcean.sol/MockOcean.json rename to src/artifacts/utils/mock/MockOcean.sol/MockOcean.json diff --git a/artifacts/utils/mock/MockOldDT.sol/MockOldDT.dbg.json b/src/artifacts/utils/mock/MockOldDT.sol/MockOldDT.dbg.json similarity index 100% rename from artifacts/utils/mock/MockOldDT.sol/MockOldDT.dbg.json rename to src/artifacts/utils/mock/MockOldDT.sol/MockOldDT.dbg.json diff --git a/artifacts/utils/mock/MockOldDT.sol/MockOldDT.json b/src/artifacts/utils/mock/MockOldDT.sol/MockOldDT.json similarity index 100% rename from artifacts/utils/mock/MockOldDT.sol/MockOldDT.json rename to src/artifacts/utils/mock/MockOldDT.sol/MockOldDT.json diff --git a/src/factories/NFTFactory.ts b/src/factories/NFTFactory.ts index dba36082..aff0d264 100644 --- a/src/factories/NFTFactory.ts +++ b/src/factories/NFTFactory.ts @@ -2,7 +2,7 @@ import { Contract } from 'web3-eth-contract' import Web3 from 'web3' import { TransactionReceipt } from 'web3-core' import { AbiItem } from 'web3-utils' -import defaultFactory721Abi from '../../artifacts/ERC721Factory.sol/ERC721Factory.json' +import defaultFactory721Abi from '../artifacts/ERC721Factory.sol/ERC721Factory.json' import { LoggerInstance, getFairGasPrice, diff --git a/src/pools/Router.ts b/src/pools/Router.ts index 24b9c414..b6d8562b 100644 --- a/src/pools/Router.ts +++ b/src/pools/Router.ts @@ -2,7 +2,7 @@ import { Contract } from 'web3-eth-contract' import Web3 from 'web3' import { TransactionReceipt } from 'web3-core' import { AbiItem } from 'web3-utils' -import defaultRouter from '../../artifacts/pools/FactoryRouter.sol/FactoryRouter.json' +import defaultRouter from '../artifacts/pools/FactoryRouter.sol/FactoryRouter.json' import { getFairGasPrice } from '../utils' import { Operation } from '../interfaces/RouterInterface' diff --git a/src/pools/balancer/Pool.ts b/src/pools/balancer/Pool.ts index 5f58cda3..79effc2a 100644 --- a/src/pools/balancer/Pool.ts +++ b/src/pools/balancer/Pool.ts @@ -4,8 +4,8 @@ import { TransactionReceipt } from 'web3-core' import { Contract } from 'web3-eth-contract' import { Logger, getFairGasPrice, LoggerInstance } from '../../utils' import BigNumber from 'bignumber.js' -import PoolTemplate from '../../../artifacts/pools/balancer/BPool.sol/BPool.json' -import defaultErc20Abi from '../../../artifacts/templates/ERC20Template.sol/ERC20Template.json' +import PoolTemplate from '../../artifacts/pools/balancer/BPool.sol/BPool.json' +import defaultErc20Abi from '../../artifacts/templates/ERC20Template.sol/ERC20Template.json' import Decimal from 'decimal.js' import { CurrentFees, diff --git a/src/pools/dispenser/Dispenser.ts b/src/pools/dispenser/Dispenser.ts index 16a73fac..3d05fa50 100644 --- a/src/pools/dispenser/Dispenser.ts +++ b/src/pools/dispenser/Dispenser.ts @@ -3,7 +3,7 @@ import { AbiItem } from 'web3-utils' import { Contract } from 'web3-eth-contract' import { TransactionReceipt } from 'web3-eth' import Decimal from 'decimal.js' -import defaultDispenserAbi from '../../../artifacts/pools/dispenser/Dispenser.sol/Dispenser.json' +import defaultDispenserAbi from '../../artifacts/pools/dispenser/Dispenser.sol/Dispenser.json' import { LoggerInstance as logger, getFairGasPrice } from '../../utils/' import { Datatoken } from '../../tokens' diff --git a/src/pools/fixedRate/FixedRateExchange.ts b/src/pools/fixedRate/FixedRateExchange.ts index d9e15752..2e34b408 100644 --- a/src/pools/fixedRate/FixedRateExchange.ts +++ b/src/pools/fixedRate/FixedRateExchange.ts @@ -1,5 +1,5 @@ -import defaultFixedRateExchangeAbi from '../../../artifacts/pools/fixedRate/FixedRateExchange.sol/FixedRateExchange.json' -import defaultErc20Abi from '../../../artifacts/templates/ERC20Template.sol/ERC20Template.json' +import defaultFixedRateExchangeAbi from '../../artifacts/pools/fixedRate/FixedRateExchange.sol/FixedRateExchange.json' +import defaultErc20Abi from '../../artifacts/templates/ERC20Template.sol/ERC20Template.json' import BigNumber from 'bignumber.js' import { TransactionReceipt } from 'web3-core' import { Contract } from 'web3-eth-contract' diff --git a/src/pools/ssContracts/SideStaking.ts b/src/pools/ssContracts/SideStaking.ts index 6e60b3fb..05a925cf 100644 --- a/src/pools/ssContracts/SideStaking.ts +++ b/src/pools/ssContracts/SideStaking.ts @@ -4,8 +4,8 @@ import { TransactionReceipt } from 'web3-core' import { Contract } from 'web3-eth-contract' import { LoggerInstance, getFairGasPrice } from '../../utils' import BigNumber from 'bignumber.js' -import SideStakingTemplate from '../../../artifacts/pools/ssContracts/SideStaking.sol/SideStaking.json' -import defaultErc20Abi from '../../../artifacts/templates/ERC20Template.sol/ERC20Template.json' +import SideStakingTemplate from '../../artifacts/pools/ssContracts/SideStaking.sol/SideStaking.json' +import defaultErc20Abi from '../../artifacts/templates/ERC20Template.sol/ERC20Template.json' export class SideStaking { public ssAbi: AbiItem | AbiItem[] diff --git a/src/tokens/Datatoken.ts b/src/tokens/Datatoken.ts index 93748943..589ac190 100644 --- a/src/tokens/Datatoken.ts +++ b/src/tokens/Datatoken.ts @@ -3,8 +3,8 @@ import { AbiItem } from 'web3-utils' import { TransactionReceipt } from 'web3-eth' import { Contract } from 'web3-eth-contract' import Decimal from 'decimal.js' -import defaultDatatokensAbi from '../../artifacts/templates/ERC20Template.sol/ERC20Template.json' -import defaultDatatokensEnterpriseAbi from '../../artifacts/templates/ERC20TemplateEnterprise.sol/ERC20TemplateEnterprise.json' +import defaultDatatokensAbi from '../artifacts/templates/ERC20Template.sol/ERC20Template.json' +import defaultDatatokensEnterpriseAbi from '../artifacts/templates/ERC20TemplateEnterprise.sol/ERC20TemplateEnterprise.json' import { LoggerInstance, getFairGasPrice } from '../utils' import { FreOrderParams, FreCreationParams } from '../interfaces' import { Nft } from './NFT' diff --git a/src/tokens/NFT.ts b/src/tokens/NFT.ts index f6a8a5b2..8fc33c27 100644 --- a/src/tokens/NFT.ts +++ b/src/tokens/NFT.ts @@ -1,7 +1,7 @@ import Web3 from 'web3' import { AbiItem } from 'web3-utils' import { TransactionReceipt } from 'web3-eth' -import defaultNftAbi from '../../artifacts/templates/ERC721Template.sol/ERC721Template.json' +import defaultNftAbi from '../artifacts/templates/ERC721Template.sol/ERC721Template.json' import { LoggerInstance, getFairGasPrice, generateDtName } from '../utils' import { Contract } from 'web3-eth-contract' import { MetadataProof } from '../../src/@types' diff --git a/src/utils/ConfigHelper.ts b/src/utils/ConfigHelper.ts index cc5f7aa9..b8e3ddc8 100644 --- a/src/utils/ConfigHelper.ts +++ b/src/utils/ConfigHelper.ts @@ -2,7 +2,7 @@ import Config from '../models/Config' import fs from 'fs' import { homedir } from 'os' // eslint-disable-next-line import/no-named-default -import { default as DefaultContractsAddresses } from '../../artifacts/addresses/address.json' +import { default as DefaultContractsAddresses } from '../artifacts/addresses/address.json' import LoggerInstance from './Logger' const configHelperNetworksBase: Config = { diff --git a/test/integration/PublishFlows.test.ts b/test/integration/PublishFlows.test.ts index ee3fafb9..d81e111c 100644 --- 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/unit/NftFactory.test.ts b/test/unit/NftFactory.test.ts index 05deb413..4f26e0ad 100644 --- 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 index 51fee97b..68ebc852 100644 --- 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 index 0d1869a6..6990091f 100644 --- 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 index 783a24fb..fdb2029e 100644 --- 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 index bf6e0426..8c1ed265 100644 --- 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 index 1c92c234..94587aaf 100644 --- 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 index 20e63613..8ff3e77c 100644 --- 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 index baa8cd14..d58abffb 100644 --- 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' diff --git a/tsconfig.json b/tsconfig.json index ce348970..df014159 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -12,11 +12,10 @@ "experimentalDecorators": true, "preserveConstEnums": true, "outDir": "./dist/node/", - // "rootDir": "./src/", - "rootDirs": ["./src/", "./artifacts/"], + "rootDir": "./src/", "sourceMap": true, "typeRoots": ["node_modules/@types"] }, - "include": ["src/**/*", "artifacts/**/*"], + "include": ["src/**/*"], "exclude": ["node_modules", "**/*.test.ts"] }