From 4d6c4f64f1001e44e57d59b59aa6a108f2bdf2d9 Mon Sep 17 00:00:00 2001 From: Joao Pedro da Silva Date: Fri, 22 Jul 2022 22:39:35 +0100 Subject: [PATCH] remove duplicated lines --- .../src/services/ubi/community/contract.ts | 69 +++++++++---------- .../src/services/ubi/communityContract.ts | 69 +++++++++---------- 2 files changed, 66 insertions(+), 72 deletions(-) diff --git a/packages/core/src/services/ubi/community/contract.ts b/packages/core/src/services/ubi/community/contract.ts index 9aa4c55bf..7a07332a9 100644 --- a/packages/core/src/services/ubi/community/contract.ts +++ b/packages/core/src/services/ubi/community/contract.ts @@ -12,7 +12,7 @@ export default class CommunityContractService { contractParams: ICommunityContractParams, t: Transaction | undefined = undefined ): Promise { - let { + const { claimAmount, maxClaim, baseInterval, @@ -20,23 +20,7 @@ export default class CommunityContractService { decreaseStep, minTranche, maxTranche, - } = contractParams; - - if (typeof claimAmount === 'string' && claimAmount.length > 10) { - claimAmount = new BigNumber(claimAmount) - .dividedBy(10 ** config.cUSDDecimal) - .toNumber(); - } - if (typeof maxClaim === 'string' && maxClaim.length > 10) { - maxClaim = new BigNumber(maxClaim) - .dividedBy(10 ** config.cUSDDecimal) - .toNumber(); - } - if (typeof decreaseStep === 'string' && decreaseStep.length > 10) { - decreaseStep = new BigNumber(decreaseStep) - .dividedBy(10 ** config.cUSDDecimal) - .toNumber(); - } + } = this.formatContractParams(contractParams); return models.ubiCommunityContract.create( { @@ -57,7 +41,7 @@ export default class CommunityContractService { communityId: number, contractParams: ICommunityContractParams ): Promise { - let { + const { claimAmount, maxClaim, baseInterval, @@ -65,23 +49,7 @@ export default class CommunityContractService { decreaseStep, minTranche, maxTranche, - } = contractParams; - - if (typeof claimAmount === 'string' && claimAmount.length > 10) { - claimAmount = new BigNumber(claimAmount) - .dividedBy(10 ** config.cUSDDecimal) - .toNumber(); - } - if (typeof maxClaim === 'string' && maxClaim.length > 10) { - maxClaim = new BigNumber(maxClaim) - .dividedBy(10 ** config.cUSDDecimal) - .toNumber(); - } - if (typeof decreaseStep === 'string' && decreaseStep.length > 10) { - decreaseStep = new BigNumber(decreaseStep) - .dividedBy(10 ** config.cUSDDecimal) - .toNumber(); - } + } = this.formatContractParams(contractParams); const community = (await models.community.findOne({ attributes: ['publicId'], @@ -118,4 +86,33 @@ export default class CommunityContractService { return false; } } + + private formatContractParams( + contractParams: ICommunityContractParams + ): ICommunityContractParams { + let { claimAmount, maxClaim, decreaseStep } = contractParams; + + if (typeof claimAmount === 'string' && claimAmount.length > 10) { + claimAmount = new BigNumber(claimAmount) + .dividedBy(10 ** config.cUSDDecimal) + .toNumber(); + } + if (typeof maxClaim === 'string' && maxClaim.length > 10) { + maxClaim = new BigNumber(maxClaim) + .dividedBy(10 ** config.cUSDDecimal) + .toNumber(); + } + if (typeof decreaseStep === 'string' && decreaseStep.length > 10) { + decreaseStep = new BigNumber(decreaseStep) + .dividedBy(10 ** config.cUSDDecimal) + .toNumber(); + } + + return { + ...contractParams, + claimAmount, + maxClaim, + decreaseStep, + }; + } } diff --git a/packages/core/src/services/ubi/communityContract.ts b/packages/core/src/services/ubi/communityContract.ts index 6ba0ccbbc..4ec09b297 100644 --- a/packages/core/src/services/ubi/communityContract.ts +++ b/packages/core/src/services/ubi/communityContract.ts @@ -17,7 +17,7 @@ export default class CommunityContractService { contractParams: ICommunityContractParams, t: Transaction | undefined = undefined ): Promise { - let { + const { claimAmount, maxClaim, baseInterval, @@ -25,23 +25,7 @@ export default class CommunityContractService { decreaseStep, minTranche, maxTranche, - } = contractParams; - - if (typeof claimAmount === 'string' && claimAmount.length > 10) { - claimAmount = new BigNumber(claimAmount) - .dividedBy(10 ** config.cUSDDecimal) - .toNumber(); - } - if (typeof maxClaim === 'string' && maxClaim.length > 10) { - maxClaim = new BigNumber(maxClaim) - .dividedBy(10 ** config.cUSDDecimal) - .toNumber(); - } - if (typeof decreaseStep === 'string' && decreaseStep.length > 10) { - decreaseStep = new BigNumber(decreaseStep) - .dividedBy(10 ** config.cUSDDecimal) - .toNumber(); - } + } = this.formatContractParams(contractParams); return await this.ubiCommunityContract.create( { @@ -62,7 +46,7 @@ export default class CommunityContractService { communityId: number, contractParams: ICommunityContractParams ): Promise { - let { + const { claimAmount, maxClaim, baseInterval, @@ -70,23 +54,7 @@ export default class CommunityContractService { decreaseStep, minTranche, maxTranche, - } = contractParams; - - if (typeof claimAmount === 'string' && claimAmount.length > 10) { - claimAmount = new BigNumber(claimAmount) - .dividedBy(10 ** config.cUSDDecimal) - .toNumber(); - } - if (typeof maxClaim === 'string' && maxClaim.length > 10) { - maxClaim = new BigNumber(maxClaim) - .dividedBy(10 ** config.cUSDDecimal) - .toNumber(); - } - if (typeof decreaseStep === 'string' && decreaseStep.length > 10) { - decreaseStep = new BigNumber(decreaseStep) - .dividedBy(10 ** config.cUSDDecimal) - .toNumber(); - } + } = this.formatContractParams(contractParams); const community = (await this.community.findOne({ attributes: ['publicId'], @@ -146,4 +114,33 @@ export default class CommunityContractService { ) ); } + + private static formatContractParams( + contractParams: ICommunityContractParams + ): ICommunityContractParams { + let { claimAmount, maxClaim, decreaseStep } = contractParams; + + if (typeof claimAmount === 'string' && claimAmount.length > 10) { + claimAmount = new BigNumber(claimAmount) + .dividedBy(10 ** config.cUSDDecimal) + .toNumber(); + } + if (typeof maxClaim === 'string' && maxClaim.length > 10) { + maxClaim = new BigNumber(maxClaim) + .dividedBy(10 ** config.cUSDDecimal) + .toNumber(); + } + if (typeof decreaseStep === 'string' && decreaseStep.length > 10) { + decreaseStep = new BigNumber(decreaseStep) + .dividedBy(10 ** config.cUSDDecimal) + .toNumber(); + } + + return { + ...contractParams, + claimAmount, + maxClaim, + decreaseStep, + }; + } }