oceanprotocol/ocean.js
1
0
Fork 0
mirror of https://github.com/oceanprotocol/ocean.js.git synced 2024-11-26 20:39:05 +01:00
Code Releases Activity

fix TestContractHandler params

Browse Source
This commit is contained in:
mihaisc 2021-11-04 11:28:45 +02:00
parent f44fb40593
commit ed128c7633
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
test/unit/NFTFactory.test.ts
View File

@ -9,6 +9,7 @@ import Router from '@oceanprotocol/contracts/artifacts/contracts/pools/FactoryRo
import ERC20Template from '@oceanprotocol/contracts/artifacts/contracts/templates/ERC20Template.sol/ERC20Template.json' import ERC20Template from '@oceanprotocol/contracts/artifacts/contracts/templates/ERC20Template.sol/ERC20Template.json'
import Dispenser from '@oceanprotocol/contracts/artifacts/contracts/pools/dispenser/Dispenser.sol/Dispenser.json' import Dispenser from '@oceanprotocol/contracts/artifacts/contracts/pools/dispenser/Dispenser.sol/Dispenser.json'
import FixedRate from '@oceanprotocol/contracts/artifacts/contracts/pools/fixedRate/FixedRateExchange.sol/FixedRateExchange.json' 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 MockERC20 from '@oceanprotocol/contracts/artifacts/contracts/utils/mock/MockERC20Decimals.sol/MockERC20Decimals.json' import MockERC20 from '@oceanprotocol/contracts/artifacts/contracts/utils/mock/MockERC20Decimals.sol/MockERC20Decimals.json'
import PoolTemplate from '@oceanprotocol/contracts/artifacts/contracts/pools/balancer/BPool.sol/BPool.json' import PoolTemplate from '@oceanprotocol/contracts/artifacts/contracts/pools/balancer/BPool.sol/BPool.json'
import { LoggerInstance } from '../../src/utils' import { LoggerInstance } from '../../src/utils'
@ -40,6 +41,7 @@ describe('NFT Factory test', () => {
SideStaking.abi as AbiItem[], SideStaking.abi as AbiItem[],
FixedRate.abi as AbiItem[], FixedRate.abi as AbiItem[],
Dispenser.abi as AbiItem[], Dispenser.abi as AbiItem[],
OPFCommunityFeeCollector.abi as AbiItem[],
ERC721Template.bytecode, ERC721Template.bytecode,
ERC20Template.bytecode, ERC20Template.bytecode,
@ -48,7 +50,8 @@ describe('NFT Factory test', () => {
Router.bytecode, Router.bytecode,
SideStaking.bytecode, SideStaking.bytecode,
FixedRate.bytecode, FixedRate.bytecode,
Dispenser.bytecode Dispenser.bytecode,
OPFCommunityFeeCollector.bytecode
) )
await contracts.getAccounts() await contracts.getAccounts()
factoryOwner = contracts.accounts[0] factoryOwner = contracts.accounts[0]
@ -59,6 +62,17 @@ describe('NFT Factory test', () => {
await contracts.deployContracts(factoryOwner, Router.abi as AbiItem[]) await contracts.deployContracts(factoryOwner, Router.abi as AbiItem[])
console.log(
'address',
contracts.factory721Address,
contracts.poolTemplateAddress,
contracts.routerAddress,
contracts.fixedRateAddress,
contracts.dispenserAddress,
contracts.sideStakingAddress,
contracts.template721Address,
contracts.template20Address
)
const daiContract = new web3.eth.Contract( const daiContract = new web3.eth.Contract(
contracts.MockERC20.options.jsonInterface, contracts.MockERC20.options.jsonInterface,
contracts.daiAddress contracts.daiAddress

5
test/unit/pools/Router.test.ts
View File

@ -10,6 +10,7 @@ import ERC20Template from '@oceanprotocol/contracts/artifacts/contracts/template
import Dispenser from '@oceanprotocol/contracts/artifacts/contracts/pools/dispenser/Dispenser.sol/Dispenser.json' import Dispenser from '@oceanprotocol/contracts/artifacts/contracts/pools/dispenser/Dispenser.sol/Dispenser.json'
import FixedRate from '@oceanprotocol/contracts/artifacts/contracts/pools/fixedRate/FixedRateExchange.sol/FixedRateExchange.json' import FixedRate from '@oceanprotocol/contracts/artifacts/contracts/pools/fixedRate/FixedRateExchange.sol/FixedRateExchange.json'
import MockERC20 from '@oceanprotocol/contracts/artifacts/contracts/utils/mock/MockERC20Decimals.sol/MockERC20Decimals.json' import MockERC20 from '@oceanprotocol/contracts/artifacts/contracts/utils/mock/MockERC20Decimals.sol/MockERC20Decimals.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 PoolTemplate from '@oceanprotocol/contracts/artifacts/contracts/pools/balancer/BPool.sol/BPool.json'
import { LoggerInstance } from '../../../src/utils' import { LoggerInstance } from '../../../src/utils'
import { NFTFactory } from '../../../src/factories/NFTFactory' import { NFTFactory } from '../../../src/factories/NFTFactory'
@ -41,6 +42,7 @@ describe('Router unit test', () => {
SideStaking.abi as AbiItem[], SideStaking.abi as AbiItem[],
FixedRate.abi as AbiItem[], FixedRate.abi as AbiItem[],
Dispenser.abi as AbiItem[], Dispenser.abi as AbiItem[],
OPFCommunityFeeCollector.abi as AbiItem[],
ERC721Template.bytecode, ERC721Template.bytecode,
ERC20Template.bytecode, ERC20Template.bytecode,
@ -49,7 +51,8 @@ describe('Router unit test', () => {
FactoryRouter.bytecode, FactoryRouter.bytecode,
SideStaking.bytecode, SideStaking.bytecode,
FixedRate.bytecode, FixedRate.bytecode,
Dispenser.bytecode Dispenser.bytecode,
OPFCommunityFeeCollector.bytecode
) )
await contracts.getAccounts() await contracts.getAccounts()
factoryOwner = contracts.accounts[0] factoryOwner = contracts.accounts[0]