Merge 60d35f3 into 395b325

aragon · Jul 12, 2018 · b1071e7 · b1071e7
2 parents 395b325 + 60d35f3
commit b1071e7
Showing 1 changed file with 2 additions and 10 deletions.
diff --git a/contracts/evmscript/EVMScriptRunner.sol b/contracts/evmscript/EVMScriptRunner.sol
@@ -14,7 +14,7 @@ import "../apps/AppStorage.sol";
 contract EVMScriptRunner is AppStorage, EVMScriptRegistryConstants {
     using ScriptHelpers for bytes;
 
-    function runScript(bytes _script, bytes _input, address[] _blacklist) protectState internal returns (bytes output) {
+    function runScript(bytes _script, bytes _input, address[] _blacklist) internal returns (bytes output) {
         // TODO: Too much data flying around, maybe extracting spec id here is cheaper
         address executorAddr = getExecutor(_script);
         require(executorAddr != address(0));
@@ -53,12 +53,4 @@ contract EVMScriptRunner is AppStorage, EVMScriptRegistryConstants {
         }
         return ret;
     }
-
-    modifier protectState {
-        address preKernel = kernel;
-        bytes32 preAppId = appId;
-        _; // exec
-        require(kernel == preKernel);
-        require(appId == preAppId);
-    }
-}
+}