refactor: optimize poll and tally contracts variables

privacy-scaling-explorations · Jul 2, 2024 · f3b6035 · f3b6035
1 parent 89fef5a
commit f3b6035
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/contracts/contracts/Poll.sol b/contracts/contracts/Poll.sol
@@ -203,11 +203,12 @@ contract Poll is Params, Utilities, SnarkCommon, EmptyBallotRoots, IPoll {
     // set merged to true so it cannot be called again
     stateMerged = true;
 
-    mergedStateRoot = extContracts.maci.getStateTreeRoot();
+    uint256 _mergedStateRoot = extContracts.maci.getStateTreeRoot();
+    mergedStateRoot = _mergedStateRoot;
 
     // Set currentSbCommitment
     uint256[3] memory sb;
-    sb[0] = mergedStateRoot;
+    sb[0] = _mergedStateRoot;
     sb[1] = emptyBallotRoots[treeDepths.voteOptionTreeDepth - 1];
     sb[2] = uint256(0);
 
@@ -225,7 +226,7 @@ contract Poll is Params, Utilities, SnarkCommon, EmptyBallotRoots, IPoll {
 
     actualStateTreeDepth = depth;
 
-    emit MergeMaciState(mergedStateRoot, numSignups);
+    emit MergeMaciState(_mergedStateRoot, _numSignups);
   }
 
   /// @inheritdoc IPoll

diff --git a/contracts/contracts/Tally.sol b/contracts/contracts/Tally.sol
@@ -260,11 +260,6 @@ contract Tally is Ownable, SnarkCommon, CommonUtilities, Hasher, DomainObjs {
     uint256 _resultCommitment,
     uint256 _perVOSpentVoiceCreditsHash
   ) public view returns (bool isValid) {
-    uint256[3] memory tally;
-    tally[0] = _resultCommitment;
-    tally[1] = hashLeftRight(_totalSpent, _totalSpentSalt);
-    tally[2] = _perVOSpentVoiceCreditsHash;
-
     if (mode == Mode.QV) {
       isValid = verifyQvSpentVoiceCredits(_totalSpent, _totalSpentSalt, _resultCommitment, _perVOSpentVoiceCreditsHash);
     } else if (mode == Mode.NON_QV) {