Harden challengeCanBeResolved

AdChain · Oct 3, 2017 · 1807496 · 1807496
1 parent 1d960fb
commit 1807496
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/contracts/Parameterizer.sol b/contracts/Parameterizer.sol
@@ -250,8 +250,10 @@ contract Parameterizer {
   */
   function challengeCanBeResolved(bytes32 _propID) constant public returns (bool) {
     ParamProposal memory prop = proposalMap[_propID];
+    Challenge memory challenge = challengeMap[prop.challengeID];
 
-    return (prop.challengeID > 0);
+    return (prop.challengeID > 0 && challenge.resolved == false &&
+            voting.pollEnded(prop.challengeID));
   }
 
   /**