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 redundancy (#1278)

Browse Source 
* fix redundancy

* convert to wei fixed price

* fix test
This commit is contained in:
mihaisc 2022-02-11 14:45:15 +02:00 committed by GitHub
parent 88c0b3046d
commit 6f12e28ada
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/pools/fixedRate/FixedRateExchange.ts
View File

@ -9,7 +9,9 @@ import {
LoggerInstance,
getFairGasPrice,
configHelperNetworks,
setContractDefaults
setContractDefaults,
amountToUnits,
unitsToAmount
} from '../../utils'
import { Config } from '../../models/index.js'
import { PriceAndFees } from '../..'
@ -89,38 +91,11 @@ export class FixedRateExchange {
}
async amountToUnits(token: string, amount: string): Promise<string> {
let decimals = 18
const tokenContract = setContractDefaults(
new this.web3.eth.Contract(defaultErc20Abi.abi as AbiItem[], token),
this.config
)
try {
decimals = await tokenContract.methods.decimals().call()
} catch (e) {
LoggerInstance.error('ERROR: FAILED TO CALL DECIMALS(), USING 18')
}
const amountFormatted = new BigNumber(parseInt(amount) * 10 ** decimals)
return amountFormatted.toString()
return amountToUnits(this.web3, token, amount)
}
async unitsToAmount(token: string, amount: string): Promise<string> {
let decimals = 18
const tokenContract = setContractDefaults(
new this.web3.eth.Contract(defaultErc20Abi.abi as AbiItem[], token),
this.config
)
try {
decimals = await tokenContract.methods.decimals().call()
} catch (e) {
LoggerInstance.error('ERROR: FAILED TO CALL DECIMALS(), USING 18')
}
const amountFormatted = new BigNumber(parseInt(amount) / 10 ** decimals)
return amountFormatted.toString()
return unitsToAmount(this.web3, token, amount)
}
/**

2
src/utils/ContractUtils.ts
View File

@ -80,7 +80,7 @@ export function getFreCreationParams(freParams: FreCreationParams): any {
uints: [
freParams.baseTokenDecimals,
freParams.datatokenDecimals,
freParams.fixedRate,
Web3.utils.toWei(freParams.fixedRate),
Web3.utils.toWei(freParams.marketFee),
withMint
]

4
test/unit/pools/fixedRate/FixedRateExchange.test.ts
View File

@ -121,7 +121,7 @@ describe('Fixed Rate unit test', () => {
marketFeeCollector: user3,
baseTokenDecimals: 18,
datatokenDecimals: 18,
fixedRate: web3.utils.toWei('1'),
fixedRate: '1',
marketFee: '0.001',
allowedConsumer: ADDRESS_ZERO,
withMint: false
@ -453,7 +453,7 @@ describe('Fixed Rate unit test', () => {
marketFeeCollector: user3,
baseTokenDecimals: 6,
datatokenDecimals: 18,
fixedRate: web3.utils.toWei('1'),
fixedRate: '1',
marketFee: '0.001',
allowedConsumer: ADDRESS_ZERO,
withMint: false