When ACL in restricted mode, do not temporarly block whitelisted nodes

apps/core/benchmark/benchmarkrunner.py

@@ -66,9 +66,9 @@ def is_success(self, task_thread: TaskThread) -> bool:
         return self.benchmark.verify_result(res["data"])
 
     def computation_success(self, task_thread: TaskThread) -> None:
-        res, _ = task_thread.result
         try:
-            benchmark_value = self.benchmark.normalization_constant / self._get_time_spent()
+            benchmark_value = \
+                self.benchmark.normalization_constant / self._get_time_spent()
             if benchmark_value < 0:
                 raise ZeroDivisionError
         except ZeroDivisionError:

golem/network/hyperdrive/client.py

@@ -5,15 +5,17 @@
 from typing import Any, Callable, Dict, Iterable, List, Optional, Tuple, Union
 
 import collections
-import golem.tools.talkback
-import requests
-from requests import HTTPError
 
-from golem_messages import helpers as msg_helpers
 from twisted.internet.defer import inlineCallbacks
 from twisted.web.client import readBody
 from twisted.web.http_headers import Headers
 
+from golem_messages import helpers as msg_helpers
+import requests
+from requests import HTTPError
+import golem.tools.talkback
+
+
 from golem.core.golem_async import AsyncHTTPRequest
 from golem.resource.client import IClient, ClientOptions
 

golem/task/acl.py

@@ -275,16 +275,16 @@ def is_allowed(self, node_id: str) -> Tuple[bool, Optional[DenyReason]]:
     def disallow(self, node_id: str,
                  timeout_seconds: int = 0,
                  persist: bool = False) -> None:
-        logger.info(
-            'Banned node. node_id=%s, timeout=%ds, persist=%s',
-            common.short_node_id(node_id),
-            timeout_seconds,
-            persist,
-        )
-        self._allow_list = [node for node in self._allow_list if not (
-            node_id == node.node_id)]
 
         if persist:
+            logger.info(
+                'Banned node. node_id=%s, timeout=%ds, persist=%s',
+                common.short_node_id(node_id),
+                timeout_seconds,
+                persist,
+            )
+            self._allow_list = [node for node in self._allow_list if not (
+                node_id == node.node_id)]
             try:
                 existNode = ACLAllowedNodes.get(node_id=node_id)
             except ACLAllowedNodes.DoesNotExist:

tests/golem/task/test_rpc.py

@@ -18,7 +18,6 @@
 from golem import clientconfigdescriptor
 from golem.core import common
 from golem.core import deferred as golem_deferred
-from golem.envs.docker.cpu import DockerCPUEnvironment
 from golem.ethereum import exceptions
 from golem.network.p2p import p2pservice
 from golem.task import rpc