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 lint

Browse Source
This commit is contained in:
lacoop6tu 2021-11-09 08:28:41 -05:00
parent 475855d899
commit 65ab6c2c23
2 changed files with 80 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/pools/balancer/Pool.ts
View File

@ -759,7 +759,7 @@ export class Pool {
try {
decimals = await tokenContract.methods.decimals().call()
if (decimals == 0){
if (decimals === 0) {
decimals = 18
}
} catch (e) {
@ -779,7 +779,7 @@ export class Pool {
)
try {
decimals = await tokenContract.methods.decimals().call()
if (decimals == 0){
if (decimals === 0) {
decimals = 18
}
} catch (e) {
@ -1522,7 +1522,6 @@ export class Pool {
.call()
amount = await this.unitsToAmount(tokenOut, result)
} catch (e) {
this.logger.error('ERROR: Failed to calcOutGivenIn')
}
@ -1538,12 +1537,9 @@ export class Pool {
let amount = null
try {
const result = await pool.methods
.calcPoolOutSingleIn(
tokenIn,
await this.amountToUnits(tokenIn,tokenAmountIn)
)
.calcPoolOutSingleIn(tokenIn, await this.amountToUnits(tokenIn, tokenAmountIn))
.call()
amount = await this.unitsToAmount(poolAddress,result)
amount = await this.unitsToAmount(poolAddress, result)
} catch (e) {
this.logger.error(`ERROR: Failed to calculate PoolOutGivenSingleIn : ${e.message}`)
}
@ -1552,25 +1548,21 @@ export class Pool {
public async calcSingleInGivenPoolOut(
poolAddress: string,
tokenIn:string,
poolAmountOut: string,
tokenIn: string,
poolAmountOut: string
): Promise<string> {
const pool = new this.web3.eth.Contract(this.poolABI, poolAddress)
let amount = null
const amountFormatted = await this.amountToUnits(poolAddress,poolAmountOut)
const amountFormatted = await this.amountToUnits(poolAddress, poolAmountOut)
try {
const result = await pool.methods
.calcSingleInPoolOut(
tokenIn,
amountFormatted
)
.calcSingleInPoolOut(tokenIn, amountFormatted)
.call()
amount = await this.unitsToAmount(tokenIn,result)
amount = await this.unitsToAmount(tokenIn, result)
} catch (e) {
this.logger.error(`ERROR: Failed to calculate SingleInGivenPoolOut : ${e.message}`)
}
@ -1579,7 +1571,7 @@ export class Pool {
public async calcSingleOutGivenPoolIn(
poolAddress: string,
tokenOut:string,
tokenOut: string,
poolAmountIn: string
): Promise<string> {
const pool = new this.web3.eth.Contract(this.poolABI, poolAddress)
@ -1587,11 +1579,11 @@ export class Pool {
try {
const result = await pool.methods
.calcSingleOutPoolIn(
tokenOut,
await this.amountToUnits(poolAddress,poolAmountIn)
tokenOut,
await this.amountToUnits(poolAddress, poolAmountIn)
)
.call()
amount = await this.unitsToAmount(tokenOut,result)
amount = await this.unitsToAmount(tokenOut, result)
} catch (e) {
this.logger.error(`ERROR: Failed to calculate SingleOutGivenPoolIn : ${e.message}`)
}
@ -1599,21 +1591,18 @@ export class Pool {
}
public async calcPoolInGivenSingleOut(
poolAddress:string,
tokenOut:string,
tokenAmountOut: string
poolAddress: string,
tokenOut: string,
tokenAmountOut: string
): Promise<string> {
const pool = new this.web3.eth.Contract(this.poolABI, poolAddress)
let amount = null
try {
const result = await pool.methods
.calcPoolInSingleOut(
tokenOut,
await this.amountToUnits(tokenOut,tokenAmountOut)
)
.calcPoolInSingleOut(tokenOut, await this.amountToUnits(tokenOut, tokenAmountOut))
.call()
amount = await this.unitsToAmount(poolAddress,result)
amount = await this.unitsToAmount(poolAddress, result)
} catch (e) {
this.logger.error(`ERROR: Failed to calculate PoolInGivenSingleOut : ${e.message}`)
}

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

@ -641,39 +641,70 @@ describe('Pool unit test', () => {
// since rate is 1 and the pool is just created
// amount of pool out received for same amount of different token In is equal
const tokenInAmount = '10' // 10 USDC or 10 DTs
expect(await pool.calcPoolOutGivenSingleIn(poolAddress, erc20Token, tokenInAmount)).to.equal(
await pool.calcPoolOutGivenSingleIn(poolAddress, contracts.usdcAddress, tokenInAmount)
expect(
await pool.calcPoolOutGivenSingleIn(poolAddress, erc20Token, tokenInAmount)
).to.equal(
await pool.calcPoolOutGivenSingleIn(
poolAddress,
contracts.usdcAddress,
tokenInAmount
)
)
//console.log(await pool.calcPoolOutGivenSingleIn(poolAddress, erc20Token, tokenInAmount))
// console.log(await pool.calcPoolOutGivenSingleIn(poolAddress, erc20Token, tokenInAmount))
})
it('#calcSingleInGivenPoolOut - should get the amount of token IN for exact pool token OUT', async () => {
// since rate is 1 and the pool is just created
// amount of different token In for getting same pool amount out is equal
const poolAmountOut = '1'
expect(parseInt(await pool.calcSingleInGivenPoolOut(poolAddress, erc20Token, poolAmountOut))).to.be.closeTo(
parseInt(await pool.calcSingleInGivenPoolOut(poolAddress, contracts.usdcAddress, poolAmountOut)),1e9
expect(
parseInt(
await pool.calcSingleInGivenPoolOut(poolAddress, erc20Token, poolAmountOut)
)
).to.be.closeTo(
parseInt(
await pool.calcSingleInGivenPoolOut(
poolAddress,
contracts.usdcAddress,
poolAmountOut
)
),
1e9
)
})
it('#calcSingleOutGivenPoolIn - should get the amount of token OUT for exact pool token IN', async () => {
// since rate is 1 and the pool is just created
//amount amount of different token Out for rediming the same pool In is equal
// amount amount of different token Out for rediming the same pool In is equal
const poolAmountIn = '10'
expect(await pool.calcSingleOutGivenPoolIn(poolAddress, erc20Token, poolAmountIn)).to.equal(
await pool.calcSingleOutGivenPoolIn(poolAddress, contracts.usdcAddress, poolAmountIn)
expect(
await pool.calcSingleOutGivenPoolIn(poolAddress, erc20Token, poolAmountIn)
).to.equal(
await pool.calcSingleOutGivenPoolIn(
poolAddress,
contracts.usdcAddress,
poolAmountIn
)
)
})
it('#calcPoolInGivenSingleOut - should get the amount of pool IN for exact token OUT', async () => {
// since rate is 1 and the pool is just created
//amount of pool In for getting the same amount of different token Out is equal
// amount of pool In for getting the same amount of different token Out is equal
const tokenAmountOut = '10'
expect(parseInt(await pool.calcPoolInGivenSingleOut(poolAddress, erc20Token,tokenAmountOut))).to.be.closeTo(
parseInt(await pool.calcPoolInGivenSingleOut(poolAddress, contracts.usdcAddress, tokenAmountOut)),1e9
expect(
parseInt(
await pool.calcPoolInGivenSingleOut(poolAddress, erc20Token, tokenAmountOut)
)
).to.be.closeTo(
parseInt(
await pool.calcPoolInGivenSingleOut(
poolAddress,
contracts.usdcAddress,
tokenAmountOut
)
),
1e11
)
})