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

fixed pool unit tests after refactor

Browse Source
This commit is contained in:
Bogdan Fazakas 2021-11-08 21:52:51 +02:00
parent 7e766a585f
commit 6606c6d7d7
3 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -24,7 +24,7 @@
"release": "release-it --non-interactive", "release": "release-it --non-interactive",
"changelog": "auto-changelog -p", "changelog": "auto-changelog -p",
"prepublishOnly": "npm run build", "prepublishOnly": "npm run build",
"test:pool": "mocha --config=test/unit/.mocharc.json --node-env=test --exit 'test/unit/pools/Pool.test.ts'", "test:pool": "mocha --config=test/unit/.mocharc.json --node-env=test --exit 'test/unit/pools/balancer/Pool.test.ts'",
"test:dt": "mocha --config=test/unit/.mocharc.json --node-env=test --exit 'test/unit/Datatoken.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/NFTDatatoken.test.ts'", "test:nftDt": "mocha --config=test/unit/.mocharc.json --node-env=test --exit 'test/unit/NFTDatatoken.test.ts'",
"test:router": "mocha --config=test/unit/.mocharc.json --node-env=test --exit 'test/unit/pools/Router.test.ts'", "test:router": "mocha --config=test/unit/.mocharc.json --node-env=test --exit 'test/unit/pools/Router.test.ts'",

12
src/factories/NFTFactory.ts
View File

@ -701,18 +701,14 @@ export class NFTFactory {
ercParams: ErcCreateParams, ercParams: ErcCreateParams,
poolParams: PoolParams poolParams: PoolParams
): Promise<TransactionReceipt> { ): Promise<TransactionReceipt> {
const ercCreateData = this.getErcCreationParams(ercParams)
const poolData = this.getPoolCreationParams(poolParams)
const estGas = await this.estGasCreateNftErcWithPool( const estGas = await this.estGasCreateNftErcWithPool(
address, address,
nftCreateData, nftCreateData,
ercCreateData, ercParams,
poolData poolParams
) )
const ercCreateData = this.getErcCreationParams(ercParams)
console.log('estGas', estGas) const poolData = this.getPoolCreationParams(poolParams)
console.log('ercCreateData', ercCreateData)
console.log('poolData', poolData)
// Invoke createToken function of the contract // Invoke createToken function of the contract
const trxReceipt = await this.factory721.methods const trxReceipt = await this.factory721.methods

9
test/unit/pools/balancer/Pool.test.ts
View File

@ -597,11 +597,6 @@ describe('Pool unit test', () => {
symbol: 'ERC20DT1Symbol' symbol: 'ERC20DT1Symbol'
} }
const basetokenInitialLiq = Number(
await pool.amountToUnits(contracts.usdcAddress, '2000')
)
console.log(basetokenInitialLiq.toString())
const poolParams: PoolParams = { const poolParams: PoolParams = {
ssContract: contracts.sideStakingAddress, ssContract: contracts.sideStakingAddress,
basetokenAddress: contracts.usdcAddress, basetokenAddress: contracts.usdcAddress,
@ -613,7 +608,9 @@ describe('Pool unit test', () => {
basetokenDecimals: await usdcContract.methods.decimals().call(), basetokenDecimals: await usdcContract.methods.decimals().call(),
vestingAmount: '10000', vestingAmount: '10000',
vestedBlocks: 2500000, vestedBlocks: 2500000,
initialBasetokenLiquidity: basetokenInitialLiq.toString(), initialBasetokenLiquidity: web3.utils.fromWei(
await pool.amountToUnits(contracts.usdcAddress, '2000')
),
swapFeeLiquidityProvider: 1e15, swapFeeLiquidityProvider: 1e15,
swapFeeMarketPlaceRunner: 1e15 swapFeeMarketPlaceRunner: 1e15
} }