Multiple updates (#26)

* advance round before adding measurement * allow any unevaluated round to be evaluated * always call reward after setScores * clean up
Meridian-IE · Sep 16, 2023 · cd61ec2 · cd61ec2
1 parent 2ead7c6
commit cd61ec2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 20 deletions.
diff --git a/src/ImpactEvaluator.sol b/src/ImpactEvaluator.sol
@@ -61,10 +61,10 @@ contract ImpactEvaluator is AccessControl {
     }
 
     function addMeasurements(string memory cid) public returns (uint) {
+        maybeAdvanceRound();
         uint roundIndex = currentRoundIndex();
         rounds[roundIndex].measurementsCids.push(cid);
         emit MeasurementsAdded(cid, roundIndex);
-        maybeAdvanceRound();
         return roundIndex;
     }
 
@@ -75,7 +75,6 @@ contract ImpactEvaluator is AccessControl {
         string memory summaryText
     ) public {
         require(hasRole(EVALUATE_ROLE, msg.sender), "Not an evaluator");
-        require(roundIndex <= rounds.length - 2, "Wrong round");
         require(
             addresses.length == scores.length,
             "Addresses and scores length mismatch"
@@ -87,9 +86,7 @@ contract ImpactEvaluator is AccessControl {
         }
         round.summaryText = summaryText;
         round.scoresSubmitted = true;
-        if (scores.length > 0) {
-            reward(addresses, scores);
-        }
+        reward(addresses, scores);
     }
 
     function reward(

diff --git a/test/ImpactEvaluator.t.sol b/test/ImpactEvaluator.t.sol
@@ -66,21 +66,10 @@ contract ImpactEvaluatorTest is Test {
     function test_SetScores() public {
         ImpactEvaluator impactEvaluator = new ImpactEvaluator(address(this));
         impactEvaluator.adminAdvanceRound();
-        impactEvaluator.grantRole(
-            impactEvaluator.EVALUATE_ROLE(),
-            address(this)
-        );
         impactEvaluator.revokeRole(
             impactEvaluator.DEFAULT_ADMIN_ROLE(),
             address(this)
         );
-        vm.expectRevert("Wrong round");
-        impactEvaluator.setScores(
-            1,
-            new address payable[](0),
-            new uint64[](0),
-            "no measurements"
-        );
         vm.expectRevert("Addresses and scores length mismatch");
         impactEvaluator.setScores(
             0,
@@ -110,17 +99,14 @@ contract ImpactEvaluatorTest is Test {
     function test_SetScoresEmptyRound() public {
         ImpactEvaluator impactEvaluator = new ImpactEvaluator(address(this));
         impactEvaluator.adminAdvanceRound();
-        impactEvaluator.grantRole(
-            impactEvaluator.EVALUATE_ROLE(),
-            address(this)
-        );
         impactEvaluator.revokeRole(
             impactEvaluator.DEFAULT_ADMIN_ROLE(),
             address(this)
         );
 
         address payable[] memory addresses = new address payable[](0);
         uint64[] memory scores = new uint64[](0);
+        vm.deal(payable(address(impactEvaluator)), 100);
         impactEvaluator.setScores(0, addresses, scores, "0 tasks performed");
     }