From 2aa99a029731c22909d5b396a4300c2bb3c9d3e1 Mon Sep 17 00:00:00 2001 From: "Miquel A. Cabot" Date: Mon, 13 Jun 2022 00:43:36 +0200 Subject: [PATCH] set visibility to functions --- src/contracts/SmartContract.ts | 12 ++++++++---- src/contracts/factories/NFTFactory.ts | 10 +++++----- src/contracts/pools/FixedRateExchange.ts | 2 +- src/contracts/pools/SideStaking.ts | 4 ++-- src/contracts/tokens/Datatoken.ts | 2 +- 5 files changed, 17 insertions(+), 13 deletions(-) diff --git a/src/contracts/SmartContract.ts b/src/contracts/SmartContract.ts index 68f5d0e6..d7430ac3 100644 --- a/src/contracts/SmartContract.ts +++ b/src/contracts/SmartContract.ts @@ -34,7 +34,7 @@ export abstract class SmartContract { this.abi = abi || (this.getDefaultAbi() as AbiItem[]) } - async amountToUnits( + protected async amountToUnits( token: string, amount: string, tokenDecimals?: number @@ -42,7 +42,7 @@ export abstract class SmartContract { return amountToUnits(this.web3, token, amount, tokenDecimals) } - async unitsToAmount( + protected async unitsToAmount( token: string, amount: string, tokenDecimals?: number @@ -50,11 +50,15 @@ export abstract class SmartContract { return unitsToAmount(this.web3, token, amount, tokenDecimals) } - async getFairGasPrice(): Promise { + protected async getFairGasPrice(): Promise { return getFairGasPrice(this.web3, this.config) } - getContract(address: string, account?: string, abi?: AbiItem | AbiItem[]): Contract { + protected getContract( + address: string, + account?: string, + abi?: AbiItem | AbiItem[] + ): Contract { const contract = new this.web3.eth.Contract(abi || this.abi, address, { from: account }) diff --git a/src/contracts/factories/NFTFactory.ts b/src/contracts/factories/NFTFactory.ts index 7f3eb449..e2beb9a1 100644 --- a/src/contracts/factories/NFTFactory.ts +++ b/src/contracts/factories/NFTFactory.ts @@ -634,7 +634,7 @@ export class NftFactory extends SmartContractWithAddress { poolParams: PoolCreationParams ): Promise { const ercCreateData = this.getErcCreationParams(ercParams) - const poolData = await this.getPoolCreationParams(this.web3, poolParams) + const poolData = await this.getPoolCreationParams(poolParams) return estimateGas( address, this.contract.methods.createNftWithErc20WithPool, @@ -661,7 +661,7 @@ export class NftFactory extends SmartContractWithAddress { poolParams: PoolCreationParams ): Promise { const ercCreateData = this.getErcCreationParams(ercParams) - const poolData = await this.getPoolCreationParams(this.web3, poolParams) + const poolData = await this.getPoolCreationParams(poolParams) const estGas = await estimateGas( address, @@ -810,7 +810,7 @@ export class NftFactory extends SmartContractWithAddress { return trxReceipt } - getErcCreationParams(ercParams: Erc20CreateParams): any { + private getErcCreationParams(ercParams: Erc20CreateParams): any { let name: string, symbol: string // Generate name & symbol if not present if (!ercParams.name || !ercParams.symbol) { @@ -830,7 +830,7 @@ export class NftFactory extends SmartContractWithAddress { } } - getFreCreationParams(freParams: FreCreationParams): any { + private getFreCreationParams(freParams: FreCreationParams): any { if (!freParams.allowedConsumer) freParams.allowedConsumer = ZERO_ADDRESS const withMint = freParams.withMint ? 1 : 0 @@ -852,7 +852,7 @@ export class NftFactory extends SmartContractWithAddress { } } - async getPoolCreationParams(web3: Web3, poolParams: PoolCreationParams): Promise { + private async getPoolCreationParams(poolParams: PoolCreationParams): Promise { return { addresses: [ poolParams.ssContract, diff --git a/src/contracts/pools/FixedRateExchange.ts b/src/contracts/pools/FixedRateExchange.ts index f390cc3d..581f6d7f 100644 --- a/src/contracts/pools/FixedRateExchange.ts +++ b/src/contracts/pools/FixedRateExchange.ts @@ -950,7 +950,7 @@ export class FixedRateExchange extends SmartContractWithAddress { * Get Router address set in fixed rate contract * @return {String} */ - async getRouter(): Promise { + public async getRouter(): Promise { let result = null try { result = await this.contract.methods.router().call() diff --git a/src/contracts/pools/SideStaking.ts b/src/contracts/pools/SideStaking.ts index 006661da..93e87fd0 100644 --- a/src/contracts/pools/SideStaking.ts +++ b/src/contracts/pools/SideStaking.ts @@ -321,7 +321,7 @@ export class SideStaking extends SmartContract { * @param {String} datatokenAddress datatokenAddress * @return {TransactionReceipt} */ - async setPoolSwapFee( + private async setPoolSwapFee( account: string, ssAddress: string, datatokenAddress: string, @@ -358,7 +358,7 @@ export class SideStaking extends SmartContract { * @param {String} ssAddress side staking contract address * @return {String} */ - async getRouter(ssAddress: string): Promise { + public async getRouter(ssAddress: string): Promise { const sideStaking = this.getContract(ssAddress) let result = null try { diff --git a/src/contracts/tokens/Datatoken.ts b/src/contracts/tokens/Datatoken.ts index 7c4d092b..3563ab1c 100644 --- a/src/contracts/tokens/Datatoken.ts +++ b/src/contracts/tokens/Datatoken.ts @@ -1244,7 +1244,7 @@ export class Datatoken extends SmartContract { return returnValues } - getFreOrderParams(freParams: FreOrderParams): any { + private getFreOrderParams(freParams: FreOrderParams): any { return { exchangeContract: freParams.exchangeContract, exchangeId: freParams.exchangeId,