mirror of
https://github.com/oceanprotocol/ocean.js.git
synced 2024-11-26 20:39:05 +01:00
use imports from TestContractHandler instead of parameters
This commit is contained in:
Miquel A. Cabot
parent
f0bc8289c1
commit
f0a008ce89
@ -1,10 +1,17 @@
|
||||
import Web3 from 'web3'
|
||||
import { Contract } from 'web3-eth-contract'
|
||||
import { AbiItem } from 'web3-utils/types'
|
||||
import ERC721Template from '@oceanprotocol/contracts/artifacts/contracts/templates/ERC721Template.sol/ERC721Template.json'
|
||||
import ERC20Template from '@oceanprotocol/contracts/artifacts/contracts/templates/ERC20Template.sol/ERC20Template.json'
|
||||
import PoolTemplate from '@oceanprotocol/contracts/artifacts/contracts/pools/balancer/BPool.sol/BPool.json'
|
||||
import ERC721Factory from '@oceanprotocol/contracts/artifacts/contracts/ERC721Factory.sol/ERC721Factory.json'
|
||||
import Router from '@oceanprotocol/contracts/artifacts/contracts/pools/FactoryRouter.sol/FactoryRouter.json'
|
||||
import SideStaking from '@oceanprotocol/contracts/artifacts/contracts/pools/ssContracts/SideStaking.sol/SideStaking.json'
|
||||
import FixedRate from '@oceanprotocol/contracts/artifacts/contracts/pools/fixedRate/FixedRateExchange.sol/FixedRateExchange.json'
|
||||
import Dispenser from '@oceanprotocol/contracts/artifacts/contracts/pools/dispenser/Dispenser.sol/Dispenser.json'
|
||||
import MockERC20 from '@oceanprotocol/contracts/artifacts/contracts/utils/mock/MockERC20Decimals.sol/MockERC20Decimals.json'
|
||||
import { getAddresses } from './config'
|
||||
|
||||
const GAS_PRICE = '3000000000'
|
||||
import OPFCommunityFeeCollector from '@oceanprotocol/contracts/artifacts/contracts/communityFee/OPFCommunityFeeCollector.sol/OPFCommunityFeeCollector.json'
|
||||
import { getAddresses, GAS_PRICE } from './config'
|
||||
|
||||
const deployContract = async (
|
||||
contract: Contract,
|
||||
@ -40,6 +47,7 @@ const deployContract = async (
|
||||
|
||||
export class TestContractHandler {
|
||||
public accounts: string[]
|
||||
|
||||
public ERC721Factory: Contract
|
||||
public ERC20Template: Contract
|
||||
public ERC721Template: Contract
|
||||
@ -52,18 +60,6 @@ export class TestContractHandler {
|
||||
public MockERC20: Contract
|
||||
public MockOcean: Contract
|
||||
|
||||
public ERC721FactoryBytecode: string
|
||||
public ERC20TemplateBytecode: string
|
||||
public ERC721TemplateBytecode: string
|
||||
public RouterBytecode: string
|
||||
public SideStakingBytecode: string
|
||||
public FixedRateBytecode: string
|
||||
public DispenserBytecode: string
|
||||
public PoolTemplateBytecode: string
|
||||
public OPFCollectorBytecode: string
|
||||
public MockERC20Bytecode: string
|
||||
public OPFBytecode: string
|
||||
|
||||
public factory721Address: string
|
||||
public template721Address: string
|
||||
public template20Address: string
|
||||
@ -78,50 +74,21 @@ export class TestContractHandler {
|
||||
public usdcAddress: string
|
||||
public web3: Web3
|
||||
|
||||
constructor(
|
||||
web3: Web3,
|
||||
ERC721TemplateABI: AbiItem | AbiItem[],
|
||||
ERC20TemplateABI: AbiItem | AbiItem[],
|
||||
PoolTemplateABI?: AbiItem | AbiItem[],
|
||||
ERC721FactoryABI?: AbiItem | AbiItem[],
|
||||
RouterABI?: AbiItem | AbiItem[],
|
||||
SideStakingABI?: AbiItem | AbiItem[],
|
||||
FixedRateABI?: AbiItem | AbiItem[],
|
||||
DispenserABI?: AbiItem | AbiItem[],
|
||||
OPFABI?: AbiItem | AbiItem[],
|
||||
|
||||
template721Bytecode?: string,
|
||||
template20Bytecode?: string,
|
||||
poolTemplateBytecode?: string,
|
||||
factory721Bytecode?: string,
|
||||
routerBytecode?: string,
|
||||
sideStakingBytecode?: string,
|
||||
fixedRateBytecode?: string,
|
||||
dispenserBytecode?: string,
|
||||
opfBytecode?: string
|
||||
) {
|
||||
constructor(web3: Web3) {
|
||||
this.web3 = web3
|
||||
this.ERC721Template = new this.web3.eth.Contract(ERC721TemplateABI)
|
||||
this.ERC20Template = new this.web3.eth.Contract(ERC20TemplateABI)
|
||||
this.PoolTemplate = new this.web3.eth.Contract(PoolTemplateABI)
|
||||
this.ERC721Factory = new this.web3.eth.Contract(ERC721FactoryABI)
|
||||
this.Router = new this.web3.eth.Contract(RouterABI)
|
||||
this.SideStaking = new this.web3.eth.Contract(SideStakingABI)
|
||||
this.FixedRate = new this.web3.eth.Contract(FixedRateABI)
|
||||
this.Dispenser = new this.web3.eth.Contract(DispenserABI)
|
||||
this.MockERC20 = new this.web3.eth.Contract(MockERC20.abi as AbiItem[])
|
||||
this.OPFCollector = new this.web3.eth.Contract(OPFABI)
|
||||
|
||||
this.ERC721FactoryBytecode = factory721Bytecode
|
||||
this.ERC20TemplateBytecode = template20Bytecode
|
||||
this.PoolTemplateBytecode = poolTemplateBytecode
|
||||
this.ERC721TemplateBytecode = template721Bytecode
|
||||
this.RouterBytecode = routerBytecode
|
||||
this.SideStakingBytecode = sideStakingBytecode
|
||||
this.FixedRateBytecode = fixedRateBytecode
|
||||
this.DispenserBytecode = dispenserBytecode
|
||||
this.MockERC20Bytecode = MockERC20.bytecode
|
||||
this.OPFBytecode = opfBytecode
|
||||
this.ERC721Template = new this.web3.eth.Contract(ERC721Template.abi as AbiItem[])
|
||||
this.ERC20Template = new this.web3.eth.Contract(ERC20Template.abi as AbiItem[])
|
||||
this.PoolTemplate = new this.web3.eth.Contract(PoolTemplate.abi as AbiItem[])
|
||||
this.ERC721Factory = new this.web3.eth.Contract(ERC721Factory.abi as AbiItem[])
|
||||
this.Router = new this.web3.eth.Contract(Router.abi as AbiItem[])
|
||||
this.SideStaking = new this.web3.eth.Contract(SideStaking.abi as AbiItem[])
|
||||
this.FixedRate = new this.web3.eth.Contract(FixedRate.abi as AbiItem[])
|
||||
this.Dispenser = new this.web3.eth.Contract(Dispenser.abi as AbiItem[])
|
||||
this.MockERC20 = new this.web3.eth.Contract(MockERC20.abi as AbiItem[])
|
||||
this.OPFCollector = new this.web3.eth.Contract(
|
||||
OPFCommunityFeeCollector.abi as AbiItem[]
|
||||
)
|
||||
}
|
||||
|
||||
public async getAccounts(): Promise<string[]> {
|
||||
@ -129,35 +96,40 @@ export class TestContractHandler {
|
||||
return this.accounts
|
||||
}
|
||||
|
||||
public async deployContracts(owner: string, routerABI?: AbiItem | AbiItem[]) {
|
||||
public async deployContracts(owner: string) {
|
||||
const addresses = getAddresses()
|
||||
|
||||
// DEPLOY OPF Fee Collector
|
||||
this.opfCollectorAddress =
|
||||
addresses.OPFCommunityFeeCollector ||
|
||||
(await deployContract(this.OPFCollector, this.OPFBytecode, [owner, owner], owner))
|
||||
(await deployContract(
|
||||
this.OPFCollector,
|
||||
OPFCommunityFeeCollector.bytecode,
|
||||
[owner, owner],
|
||||
owner
|
||||
))
|
||||
|
||||
// DEPLOY POOL TEMPLATE
|
||||
this.poolTemplateAddress =
|
||||
addresses.poolTemplate ||
|
||||
(await deployContract(this.PoolTemplate, this.PoolTemplateBytecode, [], owner))
|
||||
(await deployContract(this.PoolTemplate, PoolTemplate.bytecode, [], owner))
|
||||
|
||||
// DEPLOY ERC20 TEMPLATE
|
||||
this.template20Address =
|
||||
addresses.ERC20Template['1'] ||
|
||||
(await deployContract(this.ERC20Template, this.ERC20TemplateBytecode, [], owner))
|
||||
(await deployContract(this.ERC20Template, ERC20Template.bytecode, [], owner))
|
||||
|
||||
// DEPLOY ERC721 TEMPLATE
|
||||
this.template721Address =
|
||||
addresses.ERC721Template['1'] ||
|
||||
(await deployContract(this.ERC721Template, this.ERC721TemplateBytecode, [], owner))
|
||||
(await deployContract(this.ERC721Template, ERC721Template.bytecode, [], owner))
|
||||
|
||||
// DEPLOY OCEAN MOCK
|
||||
this.oceanAddress =
|
||||
addresses.Ocean ||
|
||||
(await deployContract(
|
||||
this.MockERC20,
|
||||
this.MockERC20Bytecode,
|
||||
MockERC20.bytecode,
|
||||
['OCEAN', 'OCEAN', 18],
|
||||
owner
|
||||
))
|
||||
@ -167,7 +139,7 @@ export class TestContractHandler {
|
||||
addresses.Router ||
|
||||
(await deployContract(
|
||||
this.Router,
|
||||
this.RouterBytecode,
|
||||
Router.bytecode,
|
||||
[
|
||||
owner,
|
||||
this.oceanAddress,
|
||||
@ -183,7 +155,7 @@ export class TestContractHandler {
|
||||
addresses.Staking ||
|
||||
(await deployContract(
|
||||
this.SideStaking,
|
||||
this.SideStakingBytecode,
|
||||
SideStaking.bytecode,
|
||||
[this.routerAddress],
|
||||
owner
|
||||
))
|
||||
@ -193,7 +165,7 @@ export class TestContractHandler {
|
||||
addresses.FixedPrice ||
|
||||
(await deployContract(
|
||||
this.FixedRate,
|
||||
this.FixedRateBytecode,
|
||||
FixedRate.bytecode,
|
||||
[this.routerAddress, this.opfCollectorAddress],
|
||||
owner
|
||||
))
|
||||
@ -203,7 +175,7 @@ export class TestContractHandler {
|
||||
addresses.Dispenser ||
|
||||
(await deployContract(
|
||||
this.Dispenser,
|
||||
this.DispenserBytecode,
|
||||
Dispenser.bytecode,
|
||||
[this.routerAddress],
|
||||
owner
|
||||
))
|
||||
@ -213,7 +185,7 @@ export class TestContractHandler {
|
||||
addresses.ERC721Factory ||
|
||||
(await deployContract(
|
||||
this.ERC721Factory,
|
||||
this.ERC721FactoryBytecode,
|
||||
ERC721Factory.bytecode,
|
||||
[
|
||||
this.template721Address,
|
||||
this.template20Address,
|
||||
@ -228,7 +200,7 @@ export class TestContractHandler {
|
||||
addresses.MockUSDC ||
|
||||
(await deployContract(
|
||||
this.MockERC20,
|
||||
this.MockERC20Bytecode,
|
||||
MockERC20.bytecode,
|
||||
['USDC', 'USDC', 6],
|
||||
owner
|
||||
))
|
||||
@ -238,13 +210,16 @@ export class TestContractHandler {
|
||||
addresses.MockDAI ||
|
||||
(await deployContract(
|
||||
this.MockERC20,
|
||||
this.MockERC20Bytecode,
|
||||
MockERC20.bytecode,
|
||||
['DAI', 'DAI', 18],
|
||||
owner
|
||||
))
|
||||
|
||||
if (!addresses.Router) {
|
||||
const RouterContract = new this.web3.eth.Contract(routerABI, this.routerAddress)
|
||||
const RouterContract = new this.web3.eth.Contract(
|
||||
Router.abi as AbiItem[],
|
||||
this.routerAddress
|
||||
)
|
||||
|
||||
await RouterContract.methods
|
||||
.addFactory(this.factory721Address)
|
||||
|
||||
@ -10,6 +10,8 @@ import {
|
||||
|
||||
LoggerInstance.setLevel(LogLevel.Error)
|
||||
|
||||
export const GAS_PRICE = '3000000000'
|
||||
|
||||
// by default, we connect with development network
|
||||
export const web3 = new Web3(process.env.NODE_URI || configHelperNetworks[1].nodeUri)
|
||||
|
||||
|
||||
@ -1,15 +1,7 @@
|
||||
import { assert, expect } from 'chai'
|
||||
import { AbiItem } from 'web3-utils/types'
|
||||
import { TestContractHandler } from '../TestContractHandler'
|
||||
import ERC721Factory from '@oceanprotocol/contracts/artifacts/contracts/ERC721Factory.sol/ERC721Factory.json'
|
||||
import ERC721Template from '@oceanprotocol/contracts/artifacts/contracts/templates/ERC721Template.sol/ERC721Template.json'
|
||||
import SideStaking from '@oceanprotocol/contracts/artifacts/contracts/pools/ssContracts/SideStaking.sol/SideStaking.json'
|
||||
import Router from '@oceanprotocol/contracts/artifacts/contracts/pools/FactoryRouter.sol/FactoryRouter.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 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 { web3 } from '../config'
|
||||
import { NftFactory, NftCreateData, TokenOrder, ZERO_ADDRESS, signHash } from '../../src'
|
||||
import {
|
||||
@ -32,28 +24,7 @@ describe('Nft Factory test', () => {
|
||||
let nftAddress: string
|
||||
|
||||
it('should deploy contracts', async () => {
|
||||
contracts = new TestContractHandler(
|
||||
web3,
|
||||
ERC721Template.abi as AbiItem[],
|
||||
ERC20Template.abi as AbiItem[],
|
||||
PoolTemplate.abi as AbiItem[],
|
||||
ERC721Factory.abi as AbiItem[],
|
||||
Router.abi as AbiItem[],
|
||||
SideStaking.abi as AbiItem[],
|
||||
FixedRate.abi as AbiItem[],
|
||||
Dispenser.abi as AbiItem[],
|
||||
OPFCommunityFeeCollector.abi as AbiItem[],
|
||||
|
||||
ERC721Template.bytecode,
|
||||
ERC20Template.bytecode,
|
||||
PoolTemplate.bytecode,
|
||||
ERC721Factory.bytecode,
|
||||
Router.bytecode,
|
||||
SideStaking.bytecode,
|
||||
FixedRate.bytecode,
|
||||
Dispenser.bytecode,
|
||||
OPFCommunityFeeCollector.bytecode
|
||||
)
|
||||
contracts = new TestContractHandler(web3)
|
||||
await contracts.getAccounts()
|
||||
factoryOwner = contracts.accounts[0]
|
||||
nftOwner = contracts.accounts[1]
|
||||
@ -61,7 +32,7 @@ describe('Nft Factory test', () => {
|
||||
user2 = contracts.accounts[3]
|
||||
user3 = contracts.accounts[4]
|
||||
|
||||
await contracts.deployContracts(factoryOwner, Router.abi as AbiItem[])
|
||||
await contracts.deployContracts(factoryOwner)
|
||||
|
||||
const daiContract = new web3.eth.Contract(
|
||||
contracts.MockERC20.options.jsonInterface,
|
||||
|
||||
@ -2,14 +2,7 @@ import { assert, expect } from 'chai'
|
||||
import { AbiItem } from 'web3-utils/types'
|
||||
import { TestContractHandler } from '../../TestContractHandler'
|
||||
import ERC721Factory from '@oceanprotocol/contracts/artifacts/contracts/ERC721Factory.sol/ERC721Factory.json'
|
||||
import ERC721Template from '@oceanprotocol/contracts/artifacts/contracts/templates/ERC721Template.sol/ERC721Template.json'
|
||||
import SideStaking from '@oceanprotocol/contracts/artifacts/contracts/pools/ssContracts/SideStaking.sol/SideStaking.json'
|
||||
import FactoryRouter from '@oceanprotocol/contracts/artifacts/contracts/pools/FactoryRouter.sol/FactoryRouter.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 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 { web3 } from '../../config'
|
||||
import { NftFactory, NftCreateData } from '../../../src'
|
||||
import { Router } from '../../../src/pools/Router'
|
||||
@ -30,28 +23,7 @@ describe('Router unit test', () => {
|
||||
let nftAddress: string
|
||||
|
||||
it('should deploy contracts', async () => {
|
||||
contracts = new TestContractHandler(
|
||||
web3,
|
||||
ERC721Template.abi as AbiItem[],
|
||||
ERC20Template.abi as AbiItem[],
|
||||
PoolTemplate.abi as AbiItem[],
|
||||
ERC721Factory.abi as AbiItem[],
|
||||
FactoryRouter.abi as AbiItem[],
|
||||
SideStaking.abi as AbiItem[],
|
||||
FixedRate.abi as AbiItem[],
|
||||
Dispenser.abi as AbiItem[],
|
||||
OPFCommunityFeeCollector.abi as AbiItem[],
|
||||
|
||||
ERC721Template.bytecode,
|
||||
ERC20Template.bytecode,
|
||||
PoolTemplate.bytecode,
|
||||
ERC721Factory.bytecode,
|
||||
FactoryRouter.bytecode,
|
||||
SideStaking.bytecode,
|
||||
FixedRate.bytecode,
|
||||
Dispenser.bytecode,
|
||||
OPFCommunityFeeCollector.bytecode
|
||||
)
|
||||
contracts = new TestContractHandler(web3)
|
||||
await contracts.getAccounts()
|
||||
factoryOwner = contracts.accounts[0]
|
||||
nftOwner = contracts.accounts[1]
|
||||
@ -59,7 +31,7 @@ describe('Router unit test', () => {
|
||||
user2 = contracts.accounts[3]
|
||||
user3 = contracts.accounts[4]
|
||||
|
||||
await contracts.deployContracts(factoryOwner, FactoryRouter.abi as AbiItem[])
|
||||
await contracts.deployContracts(factoryOwner)
|
||||
|
||||
const daiContract = new web3.eth.Contract(
|
||||
contracts.MockERC20.options.jsonInterface,
|
||||
|
||||
@ -2,14 +2,8 @@ import { assert, expect } from 'chai'
|
||||
import { AbiItem } from 'web3-utils/types'
|
||||
import { Contract } from 'web3-eth-contract'
|
||||
import ERC721Factory from '@oceanprotocol/contracts/artifacts/contracts/ERC721Factory.sol/ERC721Factory.json'
|
||||
import ERC721Template from '@oceanprotocol/contracts/artifacts/contracts/templates/ERC721Template.sol/ERC721Template.json'
|
||||
import SideStaking from '@oceanprotocol/contracts/artifacts/contracts/pools/ssContracts/SideStaking.sol/SideStaking.json'
|
||||
import FactoryRouter from '@oceanprotocol/contracts/artifacts/contracts/pools/FactoryRouter.sol/FactoryRouter.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 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 { TestContractHandler } from '../../../TestContractHandler'
|
||||
import { web3 } from '../../../config'
|
||||
import {
|
||||
@ -47,28 +41,7 @@ describe('Pool unit test', () => {
|
||||
let usdcContract: Contract
|
||||
|
||||
it('should deploy contracts', async () => {
|
||||
contracts = new TestContractHandler(
|
||||
web3,
|
||||
ERC721Template.abi as AbiItem[],
|
||||
ERC20Template.abi as AbiItem[],
|
||||
PoolTemplate.abi as AbiItem[],
|
||||
ERC721Factory.abi as AbiItem[],
|
||||
FactoryRouter.abi as AbiItem[],
|
||||
SideStaking.abi as AbiItem[],
|
||||
FixedRate.abi as AbiItem[],
|
||||
Dispenser.abi as AbiItem[],
|
||||
OPFCollector.abi as AbiItem[],
|
||||
|
||||
ERC721Template.bytecode,
|
||||
ERC20Template.bytecode,
|
||||
PoolTemplate.bytecode,
|
||||
ERC721Factory.bytecode,
|
||||
FactoryRouter.bytecode,
|
||||
SideStaking.bytecode,
|
||||
FixedRate.bytecode,
|
||||
Dispenser.bytecode,
|
||||
OPFCollector.bytecode
|
||||
)
|
||||
contracts = new TestContractHandler(web3)
|
||||
await contracts.getAccounts()
|
||||
factoryOwner = contracts.accounts[0]
|
||||
nftOwner = contracts.accounts[1]
|
||||
@ -76,7 +49,7 @@ describe('Pool unit test', () => {
|
||||
user2 = contracts.accounts[3]
|
||||
user3 = contracts.accounts[4]
|
||||
|
||||
await contracts.deployContracts(factoryOwner, FactoryRouter.abi as AbiItem[])
|
||||
await contracts.deployContracts(factoryOwner)
|
||||
|
||||
// initialize Pool instance
|
||||
pool = new Pool(web3, PoolTemplate.abi as AbiItem[])
|
||||
|
||||
@ -1,14 +1,7 @@
|
||||
import { AbiItem } from 'web3-utils'
|
||||
import { assert, expect } from 'chai'
|
||||
import ERC721Factory from '@oceanprotocol/contracts/artifacts/contracts/ERC721Factory.sol/ERC721Factory.json'
|
||||
import ERC721Template from '@oceanprotocol/contracts/artifacts/contracts/templates/ERC721Template.sol/ERC721Template.json'
|
||||
import SideStaking from '@oceanprotocol/contracts/artifacts/contracts/pools/ssContracts/SideStaking.sol/SideStaking.json'
|
||||
import FactoryRouter from '@oceanprotocol/contracts/artifacts/contracts/pools/FactoryRouter.sol/FactoryRouter.json'
|
||||
import ERC20Template from '@oceanprotocol/contracts/artifacts/contracts/templates/ERC20Template.sol/ERC20Template.json'
|
||||
import DispenserTemplate 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 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 { TestContractHandler } from '../../../TestContractHandler'
|
||||
import { web3 } from '../../../config'
|
||||
import {
|
||||
@ -35,28 +28,7 @@ describe('Dispenser flow', () => {
|
||||
let dtAddress: string
|
||||
|
||||
it('should deploy contracts', async () => {
|
||||
contracts = new TestContractHandler(
|
||||
web3,
|
||||
ERC721Template.abi as AbiItem[],
|
||||
ERC20Template.abi as AbiItem[],
|
||||
PoolTemplate.abi as AbiItem[],
|
||||
ERC721Factory.abi as AbiItem[],
|
||||
FactoryRouter.abi as AbiItem[],
|
||||
SideStaking.abi as AbiItem[],
|
||||
FixedRate.abi as AbiItem[],
|
||||
DispenserTemplate.abi as AbiItem[],
|
||||
OPFCollector.abi as AbiItem[],
|
||||
|
||||
ERC721Template.bytecode,
|
||||
ERC20Template.bytecode,
|
||||
PoolTemplate.bytecode,
|
||||
ERC721Factory.bytecode,
|
||||
FactoryRouter.bytecode,
|
||||
SideStaking.bytecode,
|
||||
FixedRate.bytecode,
|
||||
DispenserTemplate.bytecode,
|
||||
OPFCollector.bytecode
|
||||
)
|
||||
contracts = new TestContractHandler(web3)
|
||||
await contracts.getAccounts()
|
||||
factoryOwner = contracts.accounts[0]
|
||||
nftOwner = contracts.accounts[1]
|
||||
@ -64,7 +36,7 @@ describe('Dispenser flow', () => {
|
||||
user2 = contracts.accounts[3]
|
||||
user3 = contracts.accounts[4]
|
||||
|
||||
await contracts.deployContracts(factoryOwner, FactoryRouter.abi as AbiItem[])
|
||||
await contracts.deployContracts(factoryOwner)
|
||||
})
|
||||
|
||||
it('should initialize Dispenser class', async () => {
|
||||
|
||||
@ -2,15 +2,8 @@ import { assert, expect } from 'chai'
|
||||
import { AbiItem } from 'web3-utils/types'
|
||||
import { Contract } from 'web3-eth-contract'
|
||||
import BN from 'bn.js'
|
||||
import ERC721Factory from '@oceanprotocol/contracts/artifacts/contracts/ERC721Factory.sol/ERC721Factory.json'
|
||||
import ERC721Template from '@oceanprotocol/contracts/artifacts/contracts/templates/ERC721Template.sol/ERC721Template.json'
|
||||
import SSContract from '@oceanprotocol/contracts/artifacts/contracts/pools/ssContracts/SideStaking.sol/SideStaking.json'
|
||||
import FactoryRouter from '@oceanprotocol/contracts/artifacts/contracts/pools/FactoryRouter.sol/FactoryRouter.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 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 { TestContractHandler } from '../../../TestContractHandler'
|
||||
import { web3 } from '../../../config'
|
||||
import { NftFactory, NftCreateData, FixedRateExchange } from '../../../../src'
|
||||
@ -39,28 +32,7 @@ describe('Fixed Rate unit test', () => {
|
||||
const vestedBlocks = 2500000
|
||||
const ADDRESS_ZERO = '0x0000000000000000000000000000000000000000'
|
||||
it('should deploy contracts', async () => {
|
||||
contracts = new TestContractHandler(
|
||||
web3,
|
||||
ERC721Template.abi as AbiItem[],
|
||||
ERC20Template.abi as AbiItem[],
|
||||
PoolTemplate.abi as AbiItem[],
|
||||
ERC721Factory.abi as AbiItem[],
|
||||
FactoryRouter.abi as AbiItem[],
|
||||
SSContract.abi as AbiItem[],
|
||||
FixedRate.abi as AbiItem[],
|
||||
Dispenser.abi as AbiItem[],
|
||||
OPFCollector.abi as AbiItem[],
|
||||
|
||||
ERC721Template.bytecode,
|
||||
ERC20Template.bytecode,
|
||||
PoolTemplate.bytecode,
|
||||
ERC721Factory.bytecode,
|
||||
FactoryRouter.bytecode,
|
||||
SSContract.bytecode,
|
||||
FixedRate.bytecode,
|
||||
Dispenser.bytecode,
|
||||
OPFCollector.bytecode
|
||||
)
|
||||
contracts = new TestContractHandler(web3)
|
||||
await contracts.getAccounts()
|
||||
factoryOwner = contracts.accounts[0]
|
||||
nftOwner = contracts.accounts[1]
|
||||
@ -70,7 +42,7 @@ describe('Fixed Rate unit test', () => {
|
||||
user4 = contracts.accounts[5]
|
||||
exchangeOwner = contracts.accounts[0]
|
||||
|
||||
await contracts.deployContracts(factoryOwner, FactoryRouter.abi as AbiItem[])
|
||||
await contracts.deployContracts(factoryOwner)
|
||||
|
||||
// initialize fixed rate
|
||||
//
|
||||
|
||||
@ -1,15 +1,9 @@
|
||||
import { assert, expect } from 'chai'
|
||||
import { AbiItem } from 'web3-utils/types'
|
||||
import { Contract } from 'web3-eth-contract'
|
||||
import ERC721Factory from '@oceanprotocol/contracts/artifacts/contracts/ERC721Factory.sol/ERC721Factory.json'
|
||||
import ERC721Template from '@oceanprotocol/contracts/artifacts/contracts/templates/ERC721Template.sol/ERC721Template.json'
|
||||
import SSContract from '@oceanprotocol/contracts/artifacts/contracts/pools/ssContracts/SideStaking.sol/SideStaking.json'
|
||||
import FactoryRouter from '@oceanprotocol/contracts/artifacts/contracts/pools/FactoryRouter.sol/FactoryRouter.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 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 { TestContractHandler } from '../../../TestContractHandler'
|
||||
import { web3 } from '../../../config'
|
||||
import {
|
||||
@ -51,28 +45,7 @@ describe('SideStaking unit test', () => {
|
||||
const vestedBlocks = 2500000
|
||||
|
||||
it('should deploy contracts', async () => {
|
||||
contracts = new TestContractHandler(
|
||||
web3,
|
||||
ERC721Template.abi as AbiItem[],
|
||||
ERC20Template.abi as AbiItem[],
|
||||
PoolTemplate.abi as AbiItem[],
|
||||
ERC721Factory.abi as AbiItem[],
|
||||
FactoryRouter.abi as AbiItem[],
|
||||
SSContract.abi as AbiItem[],
|
||||
FixedRate.abi as AbiItem[],
|
||||
Dispenser.abi as AbiItem[],
|
||||
OPFCollector.abi as AbiItem[],
|
||||
|
||||
ERC721Template.bytecode,
|
||||
ERC20Template.bytecode,
|
||||
PoolTemplate.bytecode,
|
||||
ERC721Factory.bytecode,
|
||||
FactoryRouter.bytecode,
|
||||
SSContract.bytecode,
|
||||
FixedRate.bytecode,
|
||||
Dispenser.bytecode,
|
||||
OPFCollector.bytecode
|
||||
)
|
||||
contracts = new TestContractHandler(web3)
|
||||
await contracts.getAccounts()
|
||||
factoryOwner = contracts.accounts[0]
|
||||
nftOwner = contracts.accounts[1]
|
||||
@ -80,7 +53,7 @@ describe('SideStaking unit test', () => {
|
||||
user2 = contracts.accounts[3]
|
||||
user3 = contracts.accounts[4]
|
||||
sideStakingAddress = contracts.sideStakingAddress
|
||||
await contracts.deployContracts(factoryOwner, FactoryRouter.abi as AbiItem[])
|
||||
await contracts.deployContracts(factoryOwner)
|
||||
|
||||
// initialize Pool instance
|
||||
pool = new Pool(web3, PoolTemplate.abi as AbiItem[])
|
||||
|
||||
@ -1,14 +1,8 @@
|
||||
import { assert } from 'chai'
|
||||
import ERC20TemplateEnterprise from '@oceanprotocol/contracts/artifacts/contracts/templates/ERC20TemplateEnterprise.sol/ERC20TemplateEnterprise.json'
|
||||
import PoolTemplate from '@oceanprotocol/contracts/artifacts/contracts/pools/balancer/BPool.sol/BPool.json'
|
||||
import ERC721Factory from '@oceanprotocol/contracts/artifacts/contracts/ERC721Factory.sol/ERC721Factory.json'
|
||||
import ERC721Template from '@oceanprotocol/contracts/artifacts/contracts/templates/ERC721Template.sol/ERC721Template.json'
|
||||
import SideStaking from '@oceanprotocol/contracts/artifacts/contracts/pools/ssContracts/SideStaking.sol/SideStaking.json'
|
||||
import Router from '@oceanprotocol/contracts/artifacts/contracts/pools/FactoryRouter.sol/FactoryRouter.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 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 { AbiItem } from 'web3-utils'
|
||||
import { web3 } from '../../config'
|
||||
@ -42,34 +36,13 @@ describe('Datatoken', () => {
|
||||
const nftSymbol = 'NFTSymbol'
|
||||
|
||||
it('should deploy contracts', async () => {
|
||||
contractHandler = new TestContractHandler(
|
||||
web3,
|
||||
ERC721Template.abi as AbiItem[],
|
||||
ERC20Template.abi as AbiItem[],
|
||||
PoolTemplate.abi as AbiItem[],
|
||||
ERC721Factory.abi as AbiItem[],
|
||||
Router.abi as AbiItem[],
|
||||
SideStaking.abi as AbiItem[],
|
||||
FixedRate.abi as AbiItem[],
|
||||
Dispenser.abi as AbiItem[],
|
||||
OPFCollector.abi as AbiItem[],
|
||||
|
||||
ERC721Template.bytecode,
|
||||
ERC20Template.bytecode,
|
||||
PoolTemplate.bytecode,
|
||||
ERC721Factory.bytecode,
|
||||
Router.bytecode,
|
||||
SideStaking.bytecode,
|
||||
FixedRate.bytecode,
|
||||
Dispenser.bytecode,
|
||||
OPFCollector.bytecode
|
||||
)
|
||||
contractHandler = new TestContractHandler(web3)
|
||||
await contractHandler.getAccounts()
|
||||
nftOwner = contractHandler.accounts[0]
|
||||
user1 = contractHandler.accounts[1]
|
||||
user2 = contractHandler.accounts[2]
|
||||
user3 = contractHandler.accounts[3]
|
||||
await contractHandler.deployContracts(nftOwner, Router.abi as AbiItem[])
|
||||
await contractHandler.deployContracts(nftOwner)
|
||||
|
||||
const daiContract = new web3.eth.Contract(
|
||||
contractHandler.MockERC20.options.jsonInterface,
|
||||
|
||||
@ -1,13 +1,6 @@
|
||||
import { assert } from 'chai'
|
||||
import PoolTemplate from '@oceanprotocol/contracts/artifacts/contracts/pools/balancer/BPool.sol/BPool.json'
|
||||
import ERC721Factory from '@oceanprotocol/contracts/artifacts/contracts/ERC721Factory.sol/ERC721Factory.json'
|
||||
import ERC721Template from '@oceanprotocol/contracts/artifacts/contracts/templates/ERC721Template.sol/ERC721Template.json'
|
||||
import SideStaking from '@oceanprotocol/contracts/artifacts/contracts/pools/ssContracts/SideStaking.sol/SideStaking.json'
|
||||
import Router from '@oceanprotocol/contracts/artifacts/contracts/pools/FactoryRouter.sol/FactoryRouter.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 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 { AbiItem } from 'web3-utils'
|
||||
import sha256 from 'crypto-js/sha256'
|
||||
@ -31,34 +24,13 @@ describe('NFT', () => {
|
||||
const oceanAddress = '0x967da4048cd07ab37855c090aaf366e4ce1b9f48'
|
||||
|
||||
it('should deploy contracts', async () => {
|
||||
contractHandler = new TestContractHandler(
|
||||
web3,
|
||||
ERC721Template.abi as AbiItem[],
|
||||
ERC20Template.abi as AbiItem[],
|
||||
PoolTemplate.abi as AbiItem[],
|
||||
ERC721Factory.abi as AbiItem[],
|
||||
Router.abi as AbiItem[],
|
||||
SideStaking.abi as AbiItem[],
|
||||
FixedRate.abi as AbiItem[],
|
||||
Dispenser.abi as AbiItem[],
|
||||
OPFCollector.abi as AbiItem[],
|
||||
|
||||
ERC721Template.bytecode,
|
||||
ERC20Template.bytecode,
|
||||
PoolTemplate.bytecode,
|
||||
ERC721Factory.bytecode,
|
||||
Router.bytecode,
|
||||
SideStaking.bytecode,
|
||||
FixedRate.bytecode,
|
||||
Dispenser.bytecode,
|
||||
OPFCollector.bytecode
|
||||
)
|
||||
contractHandler = new TestContractHandler(web3)
|
||||
await contractHandler.getAccounts()
|
||||
nftOwner = contractHandler.accounts[0]
|
||||
user1 = contractHandler.accounts[1]
|
||||
user2 = contractHandler.accounts[2]
|
||||
user3 = contractHandler.accounts[3]
|
||||
await contractHandler.deployContracts(nftOwner, Router.abi as AbiItem[])
|
||||
await contractHandler.deployContracts(nftOwner)
|
||||
})
|
||||
|
||||
it('should initialize NFTFactory instance and create a new NFT', async () => {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user