updates

komrade/backend/callers.py

@@ -32,7 +32,7 @@ class Caller(Operator):
         phone_res = self.phone.ring_ring(json_phone2phone=req_json)
         
         # URI id
-        uri_id = phone_get.get('uri_id')
+        uri_id = phone_res.get('uri_id')
         returned_keys = phone_res.get('_keychain')
         self.log('got URI from Op:',uri_id)
         self.log('got returnd keys from Op:',returned_keys)

komrade/backend/keymaker.py

@@ -74,8 +74,17 @@ class KomradeAsymmetricPrivateKey(KomradeAsymmetricKey):
 
 
 class Keymaker(Logger):
-    def __init__(self,name=None,passphrase=None,keychain={}, path_crypt_keys=None, path_crypt_data=None):
+    def __init__(self,
+                name=None,
+                passphrase=None,
+                uri_id=None,
+                keychain={},
+                path_crypt_keys=None,
+                path_crypt_data=None):
+        
+        # set defaults
         self.name=name
+        self.uri_id=uri_id
         self._keychain=keychain
         self.passphrase=passphrase
         self.path_crypt_keys=path_crypt_keys

komrade/backend/operators.py

@@ -23,10 +23,7 @@ class Operator(Keymaker):
         # If not, forge them -- only once!
         if not have_keys and create:
             self.get_new_keys()
-
-        # load keychain into memory
-        self._keychain = self.keychain(force = True)
-
+        
     
     @property
     def phone(self):