From bdfa60a91b7c304ee775c5c88cc5e22b569acc74 Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Tue, 11 Jan 2022 16:32:37 +0000 Subject: [PATCH] move artifacts folder under /src --- .../ERC721Factory.sol/ERC721Factory.json | 0 .../artifacts}/addresses/address.json | 0 .../OPFCommunityFeeCollector.json | 0 .../FactoryRouter.sol/FactoryRouter.json | 0 .../pools/balancer/BPool.sol/BPool.json | 0 .../dispenser/Dispenser.sol/Dispenser.json | 0 .../FixedRateExchange.json | 0 .../SideStaking.sol/SideStaking.json | 0 .../ERC20Template.sol/ERC20Template.json | 0 .../ERC20TemplateEnterprise.json | 0 .../ERC721Template.sol/ERC721Template.json | 0 .../utils/mock/MockERC20.sol/MockERC20.json | 0 .../MockERC20Decimals.json | 0 src/factories/NFTFactory.ts | 2 +- src/pools/Router.ts | 2 +- src/pools/balancer/Pool.ts | 4 ++-- src/pools/dispenser/Dispenser.ts | 2 +- src/pools/fixedRate/FixedRateExchange.ts | 4 ++-- src/pools/ssContracts/SideStaking.ts | 4 ++-- src/tokens/Datatoken.ts | 4 ++-- src/tokens/NFT.ts | 2 +- test/integration/PublishFlows.test.ts | 2 +- test/unit/NftFactory.test.ts | 18 ++++++++--------- test/unit/pools/Router.test.ts | 18 ++++++++--------- test/unit/pools/balancer/Pool.test.ts | 18 ++++++++--------- test/unit/pools/dispenser/Dispenser.test.ts | 18 ++++++++--------- .../pools/fixedRate/FixedRateExchange.test.ts | 18 ++++++++--------- .../pools/ssContracts/SideStaking.test.ts | 18 ++++++++--------- test/unit/tokens/Datatoken.test.ts | 20 +++++++++---------- test/unit/tokens/Nft.test.ts | 18 ++++++++--------- 30 files changed, 86 insertions(+), 86 deletions(-) rename {artifacts => src/artifacts}/ERC721Factory.sol/ERC721Factory.json (100%) rename {artifacts => src/artifacts}/addresses/address.json (100%) rename {artifacts => src/artifacts}/communityFee/OPFCommunityFeeCollector.sol/OPFCommunityFeeCollector.json (100%) rename {artifacts => src/artifacts}/pools/FactoryRouter.sol/FactoryRouter.json (100%) rename {artifacts => src/artifacts}/pools/balancer/BPool.sol/BPool.json (100%) rename {artifacts => src/artifacts}/pools/dispenser/Dispenser.sol/Dispenser.json (100%) rename {artifacts => src/artifacts}/pools/fixedRate/FixedRateExchange.sol/FixedRateExchange.json (100%) rename {artifacts => src/artifacts}/pools/ssContracts/SideStaking.sol/SideStaking.json (100%) rename {artifacts => src/artifacts}/templates/ERC20Template.sol/ERC20Template.json (100%) rename {artifacts => src/artifacts}/templates/ERC20TemplateEnterprise.sol/ERC20TemplateEnterprise.json (100%) rename {artifacts => src/artifacts}/templates/ERC721Template.sol/ERC721Template.json (100%) rename {artifacts => src/artifacts}/utils/mock/MockERC20.sol/MockERC20.json (100%) rename {artifacts => src/artifacts}/utils/mock/MockERC20Decimals.sol/MockERC20Decimals.json (100%) 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.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.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.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.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.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.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.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.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.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.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.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/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 4d4af209..9b1d71c3 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/test/integration/PublishFlows.test.ts b/test/integration/PublishFlows.test.ts index ee3fafb9..c4ed1bbe 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 '../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..41a80e3b 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 '../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 { 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..7f69d499 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 '../../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 { 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..575a1242 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 '../../../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 { 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..16582398 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 '../../../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 { 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..0faca952 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 '../../../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 { 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..78081841 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 '../../../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 { 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..7fe10fef 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 '../../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 { 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..6a648c96 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 '../../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 { TestContractHandler } from '../../TestContractHandler' import { NftFactory, NftCreateData } from '../../../src/factories/NFTFactory' import { Nft } from '../../../src/tokens/NFT'