From a6504626fd33f1535cffd69735a497d4b16dddcc Mon Sep 17 00:00:00 2001 From: Bogdan Fazakas Date: Thu, 9 Dec 2021 13:55:23 +0200 Subject: [PATCH] use old name for nft files for case sensitivity --- package.json | 4 ++-- src/factories/index.ts | 2 +- src/tokens/index.ts | 2 +- test/unit/NFTFactory.test.ts | 2 +- test/unit/NftFactory.test.ts | 2 +- test/unit/pools/Router.test.ts | 2 +- test/unit/pools/balancer/Pool.test.ts | 2 +- test/unit/pools/fixedRate/FixedRateExchange.test.ts | 2 +- test/unit/pools/ssContracts/SideStaking.test.ts | 2 +- test/unit/tokens/Datatoken.test.ts | 2 +- test/unit/tokens/NFT.test.ts | 2 +- test/unit/tokens/Nft.test.ts | 2 +- tsconfig.json | 3 +-- 13 files changed, 14 insertions(+), 15 deletions(-) diff --git a/package.json b/package.json index c421ade3..50b702c2 100644 --- a/package.json +++ b/package.json @@ -29,8 +29,8 @@ "test:pool": "mocha --config=test/unit/.mocharc.json --node-env=test --exit 'test/unit/pools/balancer/Pool.test.ts'", "test:dispenser": "mocha --config=test/unit/.mocharc.json --node-env=test --exit 'test/unit/pools/dispenser/Dispenser.test.ts'", "test:dt": "mocha --config=test/unit/.mocharc.json --node-env=test --exit 'test/unit/Datatoken.test.ts'", - "test:nftDt": "mocha --config=test/unit/.mocharc.json --node-env=test --exit 'test/unit/Nft.test.ts'", - "test:factory": "mocha --config=test/unit/.mocharc.json --node-env=test --exit 'test/unit/NftFactory.test.ts'", + "test:nftDt": "mocha --config=test/unit/.mocharc.json --node-env=test --exit 'test/unit/NFT.test.ts'", + "test:factory": "mocha --config=test/unit/.mocharc.json --node-env=test --exit 'test/unit/NFTFactory.test.ts'", "test:router": "mocha --config=test/unit/.mocharc.json --node-env=test --exit 'test/unit/pools/Router.test.ts'", "test:unit": "mocha --config=test/unit/.mocharc.json --node-env=test --exit 'test/unit/**/*.test.ts'", "test:unit:cover": "nyc --report-dir coverage/unit npm run test:unit", diff --git a/src/factories/index.ts b/src/factories/index.ts index 0b27cc31..17b42cb9 100644 --- a/src/factories/index.ts +++ b/src/factories/index.ts @@ -1 +1 @@ -export * from './NftFactory' +export * from './NFTFactory' diff --git a/src/tokens/index.ts b/src/tokens/index.ts index d7fcf5ab..5e47c88e 100644 --- a/src/tokens/index.ts +++ b/src/tokens/index.ts @@ -1,2 +1,2 @@ export * from './Datatoken' -export * from './Nft' +export * from './NFT' diff --git a/test/unit/NFTFactory.test.ts b/test/unit/NFTFactory.test.ts index 9d9386c2..c551088e 100644 --- a/test/unit/NFTFactory.test.ts +++ b/test/unit/NFTFactory.test.ts @@ -11,7 +11,7 @@ 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 { NftFactory, NftCreateData, TokenOrder } from '../../src/factories/NftFactory' +import { NftFactory, NftCreateData, TokenOrder } from '../../src/factories/NFTFactory' import { FreCreationParams, Erc20CreateParams, diff --git a/test/unit/NftFactory.test.ts b/test/unit/NftFactory.test.ts index 9d9386c2..c551088e 100644 --- a/test/unit/NftFactory.test.ts +++ b/test/unit/NftFactory.test.ts @@ -11,7 +11,7 @@ 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 { NftFactory, NftCreateData, TokenOrder } from '../../src/factories/NftFactory' +import { NftFactory, NftCreateData, TokenOrder } from '../../src/factories/NFTFactory' import { FreCreationParams, Erc20CreateParams, diff --git a/test/unit/pools/Router.test.ts b/test/unit/pools/Router.test.ts index d7d47dfe..f403e1b7 100644 --- a/test/unit/pools/Router.test.ts +++ b/test/unit/pools/Router.test.ts @@ -11,7 +11,7 @@ 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 { NftFactory, NftCreateData } from '../../../src/factories/NftFactory' +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 5fd87b64..bfe21965 100644 --- a/test/unit/pools/balancer/Pool.test.ts +++ b/test/unit/pools/balancer/Pool.test.ts @@ -13,7 +13,7 @@ import FixedRate from '@oceanprotocol/contracts/artifacts/contracts/pools/fixedR 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 { LoggerInstance } from '../../../../src/utils' -import { NftFactory, NftCreateData } from '../../../../src/factories/NftFactory' +import { NftFactory, NftCreateData } from '../../../../src/factories/NFTFactory' import { Pool } from '../../../../src/pools/balancer/Pool' import { PoolCreationParams, diff --git a/test/unit/pools/fixedRate/FixedRateExchange.test.ts b/test/unit/pools/fixedRate/FixedRateExchange.test.ts index d2954e38..aa0f83a6 100644 --- a/test/unit/pools/fixedRate/FixedRateExchange.test.ts +++ b/test/unit/pools/fixedRate/FixedRateExchange.test.ts @@ -13,7 +13,7 @@ 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 { NftFactory, NftCreateData } from '../../../../src/factories/NftFactory' +import { NftFactory, NftCreateData } from '../../../../src/factories/NFTFactory' import { FixedRateExchange } from '../../../../src/pools/fixedRate/FixedRateExchange' import { FreCreationParams, Erc20CreateParams } from '../../../../src/interfaces' const web3 = new Web3('http://127.0.0.1:8545') diff --git a/test/unit/pools/ssContracts/SideStaking.test.ts b/test/unit/pools/ssContracts/SideStaking.test.ts index c137f80d..0ca606e6 100644 --- a/test/unit/pools/ssContracts/SideStaking.test.ts +++ b/test/unit/pools/ssContracts/SideStaking.test.ts @@ -13,7 +13,7 @@ import FixedRate from '@oceanprotocol/contracts/artifacts/contracts/pools/fixedR 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 { LoggerInstance } from '../../../../src/utils' -import { NftFactory, NftCreateData } from '../../../../src/factories/NftFactory' +import { NftFactory, NftCreateData } from '../../../../src/factories/NFTFactory' import { Pool } from '../../../../src/pools/balancer/Pool' import { SideStaking } from '../../../../src/pools/ssContracts/SideStaking' import { diff --git a/test/unit/tokens/Datatoken.test.ts b/test/unit/tokens/Datatoken.test.ts index 4d425170..70f5069d 100644 --- a/test/unit/tokens/Datatoken.test.ts +++ b/test/unit/tokens/Datatoken.test.ts @@ -12,7 +12,7 @@ import FixedRate from '@oceanprotocol/contracts/artifacts/contracts/pools/fixedR import OPFCollector from '@oceanprotocol/contracts/artifacts/contracts/communityFee/OPFCommunityFeeCollector.sol/OPFCommunityFeeCollector.json' import { TestContractHandler } from '../../TestContractHandler' -import { NftFactory, NftCreateData } from '../../../src/factories/NftFactory' +import { NftFactory, NftCreateData } from '../../../src/factories/NFTFactory' import { Datatoken, Nft, OrderParams, DispenserParams } from '../../../src/tokens' import { AbiItem } from 'web3-utils' import { FreCreationParams, FreOrderParams } from '../../../src/interfaces' diff --git a/test/unit/tokens/NFT.test.ts b/test/unit/tokens/NFT.test.ts index 424ba910..9a74b0c7 100644 --- a/test/unit/tokens/NFT.test.ts +++ b/test/unit/tokens/NFT.test.ts @@ -10,7 +10,7 @@ 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 { NftFactory, NftCreateData } from '../../../src/factories/NftFactory' +import { NftFactory, NftCreateData } from '../../../src/factories/NFTFactory' import { Nft } from '../../../src/tokens/NFT' import { AbiItem } from 'web3-utils' diff --git a/test/unit/tokens/Nft.test.ts b/test/unit/tokens/Nft.test.ts index 424ba910..9a74b0c7 100644 --- a/test/unit/tokens/Nft.test.ts +++ b/test/unit/tokens/Nft.test.ts @@ -10,7 +10,7 @@ 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 { NftFactory, NftCreateData } from '../../../src/factories/NftFactory' +import { NftFactory, NftCreateData } from '../../../src/factories/NFTFactory' import { Nft } from '../../../src/tokens/NFT' import { AbiItem } from 'web3-utils' diff --git a/tsconfig.json b/tsconfig.json index 8f77a1b0..df014159 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -14,8 +14,7 @@ "outDir": "./dist/node/", "rootDir": "./src/", "sourceMap": true, - "typeRoots": ["node_modules/@types"], - "forceConsistentCasingInFileNames": false + "typeRoots": ["node_modules/@types"] }, "include": ["src/**/*"], "exclude": ["node_modules", "**/*.test.ts"]