From 4bf9b27f57deeaa430c96984514515ba2448b7b0 Mon Sep 17 00:00:00 2001
From: Tyler Goodlet <jgbt@protonmail.com>
Date: Tue, 22 Dec 2020 19:30:51 -0500
Subject: [PATCH] Drop all .statespace refs; it was a silly idea

---
 tests/test_pubsub.py | 20 +++++++++++++-------
 tractor/_actor.py    |  2 --
 tractor/_spawn.py    |  1 -
 tractor/_trionics.py |  4 ----
 tractor/msg.py       | 11 ++++++++---
 5 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/tests/test_pubsub.py b/tests/test_pubsub.py
index e55b1d5..365dbb9 100644
--- a/tests/test_pubsub.py
+++ b/tests/test_pubsub.py
@@ -28,15 +28,19 @@ def is_even(i):
     return i % 2 == 0
 
 
+# placeholder for topics getter
+_get_topics = None
+
+
 @tractor.msg.pub
 async def pubber(get_topics, seed=10):
-    ss = tractor.current_actor().statespace
+
+    # ensure topic subscriptions are as expected
+    global _get_topics
+    _get_topics = get_topics
 
     for i in cycle(range(seed)):
 
-        # ensure topic subscriptions are as expected
-        ss['get_topics'] = get_topics
-
         yield {'even' if is_even(i) else 'odd': i}
         await trio.sleep(0.1)
 
@@ -151,8 +155,9 @@ def test_multi_actor_subs_arbiter_pub(
 ):
     """Try out the neato @pub decorator system.
     """
+    global _get_topics
+
     async def main():
-        ss = tractor.current_actor().statespace
 
         async with tractor.open_nursery() as n:
 
@@ -183,11 +188,12 @@ def test_multi_actor_subs_arbiter_pub(
                 pass
 
             if pub_actor == 'arbiter':
+
                 # wait for publisher task to be spawned in a local RPC task
-                while not ss.get('get_topics'):
+                while _get_topics is None:
                     await trio.sleep(0.1)
 
-                get_topics = ss.get('get_topics')
+                get_topics = _get_topics
 
                 assert 'even' in get_topics()
 
diff --git a/tractor/_actor.py b/tractor/_actor.py
index 3dbdc5e..87e6139 100644
--- a/tractor/_actor.py
+++ b/tractor/_actor.py
@@ -194,7 +194,6 @@ class Actor:
         name: str,
         *,
         rpc_module_paths: List[str] = [],
-        statespace: Optional[Dict[str, Any]] = None,
         uid: str = None,
         loglevel: str = None,
         arbiter_addr: Optional[Tuple[str, int]] = None,
@@ -226,7 +225,6 @@ class Actor:
 
         # TODO: consider making this a dynamically defined
         # @dataclass once we get py3.7
-        self.statespace = statespace or {}
         self.loglevel = loglevel
         self._arb_addr = arbiter_addr
 
diff --git a/tractor/_spawn.py b/tractor/_spawn.py
index 2065967..78158bb 100644
--- a/tractor/_spawn.py
+++ b/tractor/_spawn.py
@@ -248,7 +248,6 @@ async def new_proc(
                 await chan.send({
                     "_parent_main_data": subactor._parent_main_data,
                     "rpc_module_paths": subactor.rpc_module_paths,
-                    "statespace": subactor.statespace,
                     "_arb_addr": subactor._arb_addr,
                     "bind_host": bind_addr[0],
                     "bind_port": bind_addr[1],
diff --git a/tractor/_trionics.py b/tractor/_trionics.py
index 3ee9526..4d9e15f 100644
--- a/tractor/_trionics.py
+++ b/tractor/_trionics.py
@@ -52,7 +52,6 @@ class ActorNursery:
         name: str,
         *,
         bind_addr: Tuple[str, int] = _default_bind_addr,
-        # statespace: Optional[Dict[str, Any]] = None,
         rpc_module_paths: List[str] = None,
         loglevel: str = None,  # set log level per subactor
         nursery: trio.Nursery = None,
@@ -67,7 +66,6 @@ class ActorNursery:
             name,
             # modules allowed to invoked funcs from
             rpc_module_paths=rpc_module_paths or [],
-            # statespace=statespace,  # global proc state vars
             loglevel=loglevel,
             arbiter_addr=current_actor()._arb_addr,
         )
@@ -99,7 +97,6 @@ class ActorNursery:
         name: Optional[str] = None,
         bind_addr: Tuple[str, int] = _default_bind_addr,
         rpc_module_paths: Optional[List[str]] = None,
-        # statespace: Dict[str, Any] = None,
         loglevel: str = None,  # set log level per subactor
         **kwargs,  # explicit args to ``fn``
     ) -> Portal:
@@ -120,7 +117,6 @@ class ActorNursery:
             name,
             rpc_module_paths=[mod_path] + (rpc_module_paths or []),
             bind_addr=bind_addr,
-            # statespace=statespace,
             loglevel=loglevel,
             # use the run_in_actor nursery
             nursery=self._ria_nursery,
diff --git a/tractor/msg.py b/tractor/msg.py
index 0462fd0..f778ac7 100644
--- a/tractor/msg.py
+++ b/tractor/msg.py
@@ -90,6 +90,9 @@ def modify_subs(topics2ctxs, topics, ctx):
             topics2ctxs.pop(topic)
 
 
+_pub_state: Dict[str, dict] = {}
+
+
 def pub(
     wrapped: typing.Callable = None,
     *,
@@ -175,12 +178,15 @@ def pub(
     subscribers. If you are ok to have a new task running for every call
     to ``pub_service()`` then probably don't need this.
     """
+    global _pub_state
+
     # handle the decorator not called with () case
     if wrapped is None:
         return partial(pub, tasks=tasks)
 
     task2lock: Dict[Union[str, None], trio.StrictFIFOLock] = {
         None: trio.StrictFIFOLock()}
+
     for name in tasks:
         task2lock[name] = trio.StrictFIFOLock()
 
@@ -203,11 +209,10 @@ def pub(
                     f"argument with a falue from {tasks}")
 
             topics = set(topics)
-            ss = current_actor().statespace
-            lockmap = ss.setdefault('_pubtask2lock', task2lock)
+            lockmap = _pub_state.setdefault('_pubtask2lock', task2lock)
             lock = lockmap[task_name]
 
-            all_subs = ss.setdefault('_subs', {})
+            all_subs = _pub_state.setdefault('_subs', {})
             topics2ctxs = all_subs.setdefault(task_name, {})
 
             try: