updates

komrade/backend/__init__.py

@@ -1,13 +1,14 @@
-from .operators import *
-from .callers import *
 from .crypt import *
 from .ether import *
-from .keymaker import *
 from .mazes import *
 
-from .switchboard import *
+from .keymaker import *
+
+from .operators import *
 from .the_operator import *
-from .the_telephone import *
 
 
+from .switchboard import *
+from .the_telephone import *
 
+from .callers import *

komrade/backend/callers.py

@@ -1,6 +1,10 @@
 import os,sys; sys.path.append(os.path.abspath(os.path.join(os.path.abspath(os.path.join(os.path.dirname(__file__),'..')),'..')))
 from komrade import *
 from komrade.backend import *
+# from komrade.backend.the_telephone import *
+
+# from komrade.backend.the_telephone import *
+
 
 class Caller(Operator):
     """

komrade/backend/the_telephone.py

@@ -63,7 +63,7 @@ class TheTelephone(Operator):
         req_data_encr_b64_str_esc = req_data_encr_b64_str.replace('/','_')
 
         try:
-            res = await self.dial_operator(req_data_encr_b64_str_esc)
+            res = await self.dial_operator(req_data_encr_b64_str)
         except TypeError:
             res = None
         self.log('result from operator?',res)
@@ -75,15 +75,15 @@ class TheTelephone(Operator):
 
     
 def test_call():
-    caller = Operator('marx3') #Caller('marx')
+    caller = Caller('marx33') #Caller('marx')
     # caller.boot(create=True)
     # print(caller.keychain())
-    phone = TheTelephone()
+    # phone = TheTelephone()
     # req_json = {'_route':'forge_new_keys','name':name, 'pubkey_is_public':pubkey_is_public}}
     # req_json_s = jsonify(req_json)
     # res = phone.req({'forge_new_keys':{'name':'marx', 'pubkey_is_public':True}})
     # print(res)
-    asyncio.run(phone.forge_new_keys('marx4'))
+    asyncio.run(caller.forge_new_keys())
 
     print('YEAH COOL')