From 50194c9737f4959f825b1354a8de13e5e6e411e1 Mon Sep 17 00:00:00 2001
From: bumi <hello@michaelbumann.com>
Date: Wed, 4 Apr 2018 20:43:58 +0200
Subject: [PATCH] Separate voting and executing of proposals

voting for a proposal now does not automatically execute a proposal.
This makes it cheaper to vote (but I right now have no measurement for
gas yet) but requires a second call.
---
 contracts/Operator.sol | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/contracts/Operator.sol b/contracts/Operator.sol
index 174a062..0100ac1 100644
--- a/contracts/Operator.sol
+++ b/contracts/Operator.sol
@@ -95,18 +95,12 @@ contract Operator is Upgradeable {
     ProposalCreated(proposalId, msg.sender, p.recipientId, p.amount);
   }
 
-  function vote(uint256 _proposalId) public coreOnly returns (uint _pId, bool _executed) {
+  function vote(uint256 _proposalId) public coreOnly returns (uint _pId) {
     var p = proposals[_proposalId];
-    if (p.executed) { throw; }
-    if (p.votes[msg.sender] == true) { throw; }
+    require(!p.executed);
+    require(!p.votes[msg.sender]);
     p.votes[msg.sender] = true;
     p.votesCount++;
-    _executed = false;
-    _pId = _proposalId;
-    if (p.votesCount >= p.votesNeeded) {
-      executeProposal(_proposalId);
-      _executed = true;
-    }
     ProposalVoted(_pId, msg.sender, p.votesCount);
   }
 
@@ -117,11 +111,11 @@ contract Operator is Upgradeable {
 
   function executeProposal(uint proposalId) private returns (bool) {
     var p = proposals[proposalId];
-    if (p.executed) { throw; }
-    if (p.votesCount < p.votesNeeded) { throw; }
+    require(!p.executed);
+    require(p.votesCount >= p.votesNeeded);
+    p.executed = true;
     address recipientAddress = contributorsContract().getContributorAddressById(p.recipientId);
     tokenContract().mintFor(recipientAddress, p.amount, proposalId);
-    p.executed = true;
     ProposalExecuted(proposalId, p.recipientId, p.amount);
     return true;
   }