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

Merge branch 'v4main' into feature/integrate-erc721-erc20-template-contracts and fix merge conflicts

Browse Source
This commit is contained in:
Bogdan Fazakas 2021-11-04 16:34:31 +02:00
commit 16985d5a3a
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,8 +9,8 @@ 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 OPFCollector 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 { NFTDataToken } from '../../../src/datatokens/NFTDatatoken' // import { NFTDataToken } from '../../../src/datatokens/NFTDatatoken'
@ -41,7 +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[],
OPFCollector.abi as AbiItem[], OPFCommunityFeeCollector.abi as AbiItem[],
ERC721Template.bytecode, ERC721Template.bytecode,
ERC20Template.bytecode, ERC20Template.bytecode,
@ -51,7 +51,7 @@ describe('NFT Factory test', () => {
SideStaking.bytecode, SideStaking.bytecode,
FixedRate.bytecode, FixedRate.bytecode,
Dispenser.bytecode, Dispenser.bytecode,
OPFCollector.bytecode OPFCommunityFeeCollector.bytecode
) )
await contracts.getAccounts() await contracts.getAccounts()
factoryOwner = contracts.accounts[0] factoryOwner = contracts.accounts[0]
@ -62,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
@ -266,8 +277,13 @@ describe('NFT Factory test', () => {
const fixedData = { const fixedData = {
fixedPriceAddress: contracts.fixedRateAddress, fixedPriceAddress: contracts.fixedRateAddress,
addresses: [contracts.daiAddress, contracts.accounts[0], contracts.accounts[0]], addresses: [
uints: [18, 18, web3.utils.toWei('1'), 1e15] contracts.daiAddress,
contracts.accounts[0],
contracts.accounts[0],
contracts.accounts[0]
],
uints: [18, 18, web3.utils.toWei('1'), 1e15, 0]
} }
const txReceipt = await nftFactory.createNftErcWithFixedRate( const txReceipt = await nftFactory.createNftErcWithFixedRate(

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

@ -9,8 +9,8 @@ import FactoryRouter from '@oceanprotocol/contracts/artifacts/contracts/pools/Fa
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 OPFCollector 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 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'
@ -42,7 +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[],
OPFCollector.abi as AbiItem[], OPFCommunityFeeCollector.abi as AbiItem[],
ERC721Template.bytecode, ERC721Template.bytecode,
ERC20Template.bytecode, ERC20Template.bytecode,
@ -52,7 +52,7 @@ describe('Router unit test', () => {
SideStaking.bytecode, SideStaking.bytecode,
FixedRate.bytecode, FixedRate.bytecode,
Dispenser.bytecode, Dispenser.bytecode,
OPFCollector.bytecode OPFCommunityFeeCollector.bytecode
) )
await contracts.getAccounts() await contracts.getAccounts()
factoryOwner = contracts.accounts[0] factoryOwner = contracts.accounts[0]