discovered voting power methods were already implemented in voter.ts

ajna-finance · Jul 24, 2023 · 6215f7f · 6215f7f
1 parent 5743bc3
commit 6215f7f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 21 deletions.
diff --git a/src/grant-fund.ts b/src/grant-fund.ts
@@ -31,7 +31,7 @@ import { addressArrayToBytesArray, addressToBytes, bigIntToBytes, bytesToBigInt,
 import { getProposalParamsId, getProposalsInSlate, removeProposalFromList } from './utils/grants/proposal'
 import { getCurrentDistributionId, getCurrentStage, loadOrCreateDistributionPeriod } from './utils/grants/distribution'
 import { getFundingStageVotingPower, getFundingVoteId, getScreeningStageVotingPower, getScreeningVoteId, loadOrCreateDistributionPeriodVote } from './utils/grants/voter'
-import { getVotesFunding, getVotesScreening, loadOrCreateGrantFund } from './utils/grants/fund'
+import { loadOrCreateGrantFund } from './utils/grants/fund'
 import { loadOrCreateAccount } from './utils/account'
 
 export function handleDelegateRewardClaimed(
@@ -266,8 +266,8 @@ export function handleDistributionPeriodStarted(
   const votes = distributionPeriod.votes
   for (var i=0; i<votes.length; ++i) {
     const vote = DistributionPeriodVote.load(votes[i])!
-    vote.screeningStageVotingPower = wadToDecimal(getVotesScreening(event.address, bytesToBigInt(distributionId), Address.fromBytes(vote.voter)))
-    vote.fundingStageVotingPower = wadToDecimal(getVotesFunding(event.address, bytesToBigInt(distributionId), Address.fromBytes(vote.voter)))
+    vote.screeningStageVotingPower = getScreeningStageVotingPower(event.address, bytesToBigInt(distributionId), Address.fromBytes(vote.voter))
+    vote.fundingStageVotingPower = getFundingStageVotingPower(event.address, bytesToBigInt(distributionId), Address.fromBytes(vote.voter))
     vote.save()
   }
 

diff --git a/src/utils/grants/fund.ts b/src/utils/grants/fund.ts
@@ -18,21 +18,3 @@ export function loadOrCreateGrantFund(grantFundAddress: Address): GrantFund {
   }
   return grantFund
 }
-
-export function getVotesScreening(
-  grantFundAddress: Address, 
-  distributionPeriodId: BigInt, 
-  voterId: Address) : BigInt
-{
-  const grantFundContract = GrantFundContract.bind(grantFundAddress)
-  return grantFundContract.getVotesScreening(distributionPeriodId.toU32(), voterId)
-}
-
-export function getVotesFunding(
-  grantFundAddress: Address, 
-  distributionPeriodId: BigInt, 
-  voterId: Address) : BigInt
-{
-  const grantFundContract = GrantFundContract.bind(grantFundAddress)
-  return grantFundContract.getVotesFunding(distributionPeriodId.toU32(), voterId)
-}