mirror of
https://github.com/oceanprotocol/ocean.js.git
synced 2024-11-26 20:39:05 +01:00
Merge branch 'feature/FixedPriceExchange' of https://github.com/oceanprotocol/ocean-lib-js into feature/FixedPriceExchange
This commit is contained in:
commit
a4e8315734
@ -36,7 +36,7 @@ describe('FixedRateExchange flow', () => {
|
||||
let greatPool
|
||||
const tokenAmount = '1000000000000000000000000000000000'
|
||||
const fixedPriceRate = '0.5'
|
||||
const updatedPriceRate = '0.5'
|
||||
const updatedPriceRate = '2'
|
||||
const swapAmount = '1'
|
||||
const blob = 'http://localhost:8030/api/v1/services/consume'
|
||||
describe('#test', () => {
|
||||
@ -217,139 +217,5 @@ describe('FixedRateExchange flow', () => {
|
||||
const exchangeDetails = await FixedRateClass.getExchange(aliceExchangeId)
|
||||
assert(exchangeDetails.active === true)
|
||||
})
|
||||
|
||||
/*
|
||||
it('Alice creates a new OceanPool pool', async () => {
|
||||
/// new pool with total DT = 45 , dt weight=90% with swap fee 2%
|
||||
alicePoolAddress = await Pool.createDTPool(alice, tokenAddress, 45, 9, '0.02')
|
||||
})
|
||||
it('Get pool information', async () => {
|
||||
const currentTokens = await Pool.getCurrentTokens(alice, alicePoolAddress)
|
||||
assert(currentTokens.length === 2)
|
||||
assert(currentTokens.includes(tokenAddress))
|
||||
assert(currentTokens.includes(oceanTokenAddress))
|
||||
})
|
||||
it('Get pool swap fee', async () => {
|
||||
const currentSwapFee = await Pool.getSwapFee(alice, alicePoolAddress)
|
||||
assert(currentSwapFee === '0.02')
|
||||
})
|
||||
it('Get dtPrice from the pool ', async () => {
|
||||
currentDtPrice = await Pool.getDTPrice(alice, alicePoolAddress)
|
||||
assert(currentDtPrice > 0)
|
||||
})
|
||||
it('Get dtToken pool reserve ', async () => {
|
||||
const currentDtReserve = await Pool.getDTReserve(alice, alicePoolAddress)
|
||||
assert(currentDtReserve > 0)
|
||||
})
|
||||
it('Get Ocean pool reserve ', async () => {
|
||||
const currentOceanReserve = await Pool.getOceanReserve(alice, alicePoolAddress)
|
||||
assert(currentOceanReserve > 0)
|
||||
})
|
||||
it('Get total supply of pool tokens', async () => {
|
||||
const totalSupply = await Pool.totalSupply(alicePoolAddress)
|
||||
assert(totalSupply > 0)
|
||||
})
|
||||
it('Get amount of Ocean needed to buy 1 dtToken', async () => {
|
||||
const requiredOcean = await Pool.getOceanNeeded(alice, alicePoolAddress, '1')
|
||||
assert(requiredOcean > 0)
|
||||
})
|
||||
|
||||
it('Bob should search for pools with this DT', async () => {
|
||||
const pools = await Pool.searchPoolforDT(bob, tokenAddress)
|
||||
assert(pools.length > 0)
|
||||
greatPool = pools[0]
|
||||
})
|
||||
it('Bob should buy a DT ', async () => {
|
||||
const maxPrice = parseFloat(currentDtPrice) * 2
|
||||
await Pool.buyDT(bob, greatPool, '1', '2', String(maxPrice))
|
||||
const bobDtBalance = await datatoken.balance(tokenAddress, bob)
|
||||
const bobOceanBalance = await datatoken.balance(oceanTokenAddress, bob)
|
||||
assert(bobDtBalance > 0)
|
||||
assert(bobOceanBalance > 0)
|
||||
})
|
||||
it('Bob should add DT liquidity to pool ', async () => {
|
||||
const currentDtReserve = await Pool.getDTReserve(bob, greatPool)
|
||||
if (consoleDebug) console.log('currentDtReserve:' + currentDtReserve)
|
||||
const bobDtBalance = await datatoken.balance(tokenAddress, bob)
|
||||
if (consoleDebug) console.log('BOB DT Balance:' + bobDtBalance)
|
||||
await Pool.addDTLiquidity(bob, greatPool, bobDtBalance)
|
||||
|
||||
const newbobDtBalance = await datatoken.balance(tokenAddress, bob)
|
||||
|
||||
const newDtReserve = await Pool.getDTReserve(bob, greatPool)
|
||||
|
||||
const sharesBalance = await Pool.sharesBalance(bob, greatPool)
|
||||
if (consoleDebug) console.log('newDtReserve:' + newDtReserve)
|
||||
if (consoleDebug) console.log('newbobDtBalance:' + newbobDtBalance)
|
||||
if (consoleDebug) console.log('sharesBalance:' + sharesBalance)
|
||||
assert(parseFloat(newbobDtBalance) < parseFloat(bobDtBalance))
|
||||
assert(parseFloat(newDtReserve) > parseFloat(currentDtReserve))
|
||||
assert(parseFloat(sharesBalance) > 0)
|
||||
})
|
||||
|
||||
it('Bob should remove DT liquidity from pool ', async () => {
|
||||
const currentDtReserve = await Pool.getDTReserve(bob, greatPool)
|
||||
if (consoleDebug) console.log('currentDtReserve:' + currentDtReserve)
|
||||
const bobDtBalance = await datatoken.balance(tokenAddress, bob)
|
||||
if (consoleDebug) console.log('bobDtBalance:' + bobDtBalance)
|
||||
const poolShares = await Pool.sharesBalance(bob, greatPool)
|
||||
if (consoleDebug) console.log('poolShares:' + poolShares)
|
||||
await Pool.removeDTLiquidity(bob, greatPool, '0.75', poolShares)
|
||||
|
||||
const newDtReserve = await Pool.getDTReserve(bob, greatPool)
|
||||
if (consoleDebug) console.log('newDtReserve:' + newDtReserve)
|
||||
const newbobDtBalance = await datatoken.balance(tokenAddress, bob)
|
||||
if (consoleDebug) console.log('newbobDtBalance:' + newbobDtBalance)
|
||||
const newpoolShares = await Pool.sharesBalance(bob, greatPool)
|
||||
if (consoleDebug) console.log('newpoolShares:' + newpoolShares)
|
||||
assert(parseFloat(newDtReserve) < parseFloat(currentDtReserve))
|
||||
assert(parseFloat(bobDtBalance) < parseFloat(newbobDtBalance))
|
||||
assert(parseFloat(poolShares) > parseFloat(newpoolShares))
|
||||
})
|
||||
|
||||
it('Bob should add Ocean liquidity to pool ', async () => {
|
||||
const currentDtReserve = await Pool.getOceanReserve(bob, greatPool)
|
||||
const bobDtBalance = await datatoken.balance(oceanTokenAddress, bob)
|
||||
if (consoleDebug) console.log('currentDtReserve:' + currentDtReserve)
|
||||
if (consoleDebug) console.log('bobDtBalance:' + bobDtBalance)
|
||||
|
||||
await Pool.addOceanLiquidity(bob, greatPool, '1')
|
||||
|
||||
const newbobDtBalance = await datatoken.balance(oceanTokenAddress, bob)
|
||||
|
||||
const newDtReserve = await Pool.getOceanReserve(bob, greatPool)
|
||||
|
||||
const sharesBalance = await Pool.sharesBalance(bob, greatPool)
|
||||
if (consoleDebug) console.log('newDtReserve:' + newDtReserve)
|
||||
if (consoleDebug) console.log('newbobDtBalance:' + newbobDtBalance)
|
||||
if (consoleDebug) console.log('sharesBalance:' + sharesBalance)
|
||||
assert(parseFloat(newbobDtBalance) < parseFloat(bobDtBalance))
|
||||
assert(parseFloat(newDtReserve) > parseFloat(currentDtReserve))
|
||||
assert(parseFloat(sharesBalance) > 0)
|
||||
})
|
||||
|
||||
it('Bob should remove Ocean liquidity from pool ', async () => {
|
||||
const currentDtReserve = await Pool.getOceanReserve(bob, greatPool)
|
||||
const bobDtBalance = await datatoken.balance(oceanTokenAddress, bob)
|
||||
|
||||
const poolShares = await Pool.sharesBalance(bob, greatPool)
|
||||
if (consoleDebug) console.log('currentDtReserve:' + currentDtReserve)
|
||||
if (consoleDebug) console.log('bobDtBalance:' + bobDtBalance)
|
||||
if (consoleDebug) console.log('poolShares:' + poolShares)
|
||||
|
||||
await Pool.removeOceanLiquidity(bob, greatPool, '0.75', poolShares)
|
||||
|
||||
const newDtReserve = await Pool.getOceanReserve(bob, greatPool)
|
||||
const newbobDtBalance = await datatoken.balance(oceanTokenAddress, bob)
|
||||
const newpoolShares = await Pool.sharesBalance(bob, greatPool)
|
||||
|
||||
if (consoleDebug) console.log('newDtReserve:' + newDtReserve)
|
||||
if (consoleDebug) console.log('newbobDtBalance:' + newbobDtBalance)
|
||||
if (consoleDebug) console.log('newpoolShares:' + newpoolShares)
|
||||
assert(parseFloat(newDtReserve) < parseFloat(currentDtReserve))
|
||||
assert(parseFloat(bobDtBalance) < parseFloat(newbobDtBalance))
|
||||
assert(parseFloat(poolShares) > parseFloat(newpoolShares))
|
||||
})
|
||||
*/
|
||||
})
|
||||
})
|
||||
|
Loading…
x
Reference in New Issue
Block a user