Revert "Much better handling of the default caller."

Too slow. This reverts commit 75f4e89.
palkeo · Jul 13, 2019 · 065e474 · 065e474
1 parent 579de85
commit 065e474
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/pakala/analyzer.py b/pakala/analyzer.py
@@ -132,6 +132,12 @@ def check_state(self, state, path=None):
 
         for s in path:
             solver.add(list(s.env.extra_constraints()))
+            solver.add(
+                [
+                    s.env.caller == utils.DEFAULT_CALLER,
+                    s.env.origin == utils.DEFAULT_CALLER,
+                ]
+            )
 
         # Calls
         total_sent = sum(s.env.value for s in path)

diff --git a/pakala/recursive_analyzer.py b/pakala/recursive_analyzer.py
@@ -77,7 +77,7 @@ def address(self):
 
     @property
     def caller(self):
-        return utils.DEFAULT_CALLER
+        return self.reference_states[0][0].env.caller
 
     def _search_path(self, composite_state, path):
         logger.debug("Search path: %s", path)