Post-rebase fixes

Signed-off-by: Yves Bastide <yves@botify.com>

Author: ybastide

simpleflow/history.py

@@ -129,6 +129,7 @@ def lambda_functions(self):
         """
         return self._lambda_functions
 
+    @property
     def signaled_workflows(self):
         """
         :return: signaled workflows

simpleflow/swf/executor.py

@@ -382,7 +382,7 @@ def _get_future_from_lambda_function_event(self, event):
         elif state == 'started':
             future.set_running()
         elif state == 'completed':
-            future.set_finished(json_loads_or_raw(event['result']))
+            future.set_finished(format.decode(event['result']))
         elif state == 'failed':
             future.set_exception(exceptions.TaskFailed(
                 name=event['id'],
@@ -721,30 +721,12 @@ def resume_lambda_function(self, a_task, event):
 
         return future
 
-    def resume_lambda_function(self, a_task, event):
-        """
-        Resume a child workflow.
-
-        :param a_task:
-        :type a_task: LambdaTask
-        :param event:
-        :type event: dict
-        :return:
-        :rtype: simpleflow.futures.Future
-        """
-        future = self._get_future_from_lambda_function_event(event)
-
-        if future.finished and future.exception:
-            raise future.exception
-
-        return future
-
     def schedule_task(self, a_task, task_list=None):
         """
         Let a task schedule itself.
         If too many decisions are in flight, add a timer decision and raise ExecutionBlocked.
         :param a_task:
-        :type a_task: SwfTask
+        :type a_task: ActivityTask | WorkflowTask | SignalTask [ MarkerTask [ TimerTask | CancelTimerTask | LambdaFunctionTask  # noqa
         :param task_list:
         :type task_list: Optional[str]
         :raise: exceptions.ExecutionBlocked if too many decisions waiting
@@ -1301,17 +1283,19 @@ def get_event_details(self, event_type, event_name):
 
     def handle_cancel_requested(self):
         decision = swf.models.decision.WorkflowExecutionDecision()
-        is_current_decision = self._history.completed_decision_id < self._history.cancel_requested_id
-        should_cancel = self._workflow.should_cancel(self._history)
+        history = self._history
+        is_current_decision = history.completed_decision_id < history.cancel_requested_id
+        should_cancel = self._workflow.should_cancel(history)
         if not should_cancel:
             return None  # ignore cancel
         if is_current_decision:
             self.on_canceled()
             decision.cancel()
             return [decision]
-        if self._history.cancel_failed:
-            logger.warning('failed: %s', self._history.cancel_failed)
-        if self._history.cancel_failed and self._history.cancel_failed_decision_task_completed_event_id == self._history.completed_decision_id:
+        if history.cancel_failed:
+            logger.warning('failed: %s', history.cancel_failed)
+        if (history.cancel_failed
+                and history.cancel_failed_decision_task_completed_event_id == history.completed_decision_id):
             # Per http://docs.aws.amazon.com/amazonswf/latest/apireference/API_Decision.html,
             # we should call RespondDecisionTaskCompleted without any decisions; however this hangs the workflow...