b0.22 - task-api - Take peers from resources_options['options'] (#4937)

* Fix remote peers in new resource manager * try to use the child options object * review comment, safe dict access
golemfactory · Nov 26, 2019 · 8f0ffdd · 8f0ffdd
1 parent 27b96c6
commit 8f0ffdd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/golem/resource/resourcemanager.py b/golem/resource/resourcemanager.py
@@ -24,13 +24,11 @@ def __init__(
 
     def build_client_options(
             self,
-            peers: Optional[Peers] = None,
             **kwargs,
     ) -> ClientOptions:
         """ Return client-specific request options """
 
-        return self._client.build_options(
-            peers=peers, **kwargs)
+        return self._client.build_options(**kwargs)
 
     @inlineCallbacks
     def share(

diff --git a/golem/task/taskserver.py b/golem/task/taskserver.py
@@ -505,9 +505,9 @@ def task_given(
 
         if task_header.environment_prerequisites:
             subtask_inputs_dir = self.task_computer.get_subtask_inputs_dir()
-            resources_options = msg.resources_options or dict()
+            resources_options = msg.resources_options or dict(options={})
             client_options = self.resource_manager.build_client_options(
-                **resources_options)
+                **resources_options.get('options', {}))
 
             deferred_list = [
                 self.new_resource_manager.download(