From 2184933c971511a90ea35372790759f5a8810ac3 Mon Sep 17 00:00:00 2001
From: jMyles <justin@justinholmes.com>
Date: Mon, 12 Feb 2018 13:08:58 -0800
Subject: [PATCH] Commenting out encrypting keys from the Keystore for the
 moment.

---
 nkms/keystore/db/models.py | 12 ++++++------
 nkms/keystore/keystore.py  | 26 +++++++++++++++-----------
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/nkms/keystore/db/models.py b/nkms/keystore/db/models.py
index 66806cd82..c7113ec47 100644
--- a/nkms/keystore/db/models.py
+++ b/nkms/keystore/db/models.py
@@ -33,22 +33,22 @@ class PolicyContract(Base):
     hrac = Column(LargeBinary, unique=True)
     key_frag = Column(LargeBinary, unique=True)
     alice_pubkey_sig_id = Column(Integer, ForeignKey('keys.id'))
-    alice_pubkey_enc_id = Column(Integer, ForeignKey('keys.id'))
-    bob_pubkey_sig_id = Column(Integer, ForeignKey('keys.id'))
+    # alice_pubkey_enc_id = Column(Integer, ForeignKey('keys.id'))
+    # bob_pubkey_sig_id = Column(Integer, ForeignKey('keys.id'))
     alice_signature = Column(LargeBinary, unique=True)
     created_at = Column(DateTime, default=datetime.utcnow)
 
     def __init__(self, expiration, deposit, hrac,
                  key_frag, alice_pubkey_sig_id,
-                 alice_pubkey_enc_id, bob_pubkey_sig_id,
-                 alice_signature, policy):
+                 # alice_pubkey_enc_id, bob_pubkey_sig_id,
+                 alice_signature):
         self.expiration = expiration
         self.deposit = deposit
         self.hrac = hrac
         self.key_frag = key_frag
         self.alice_pubkey_sig_id = alice_pubkey_sig_id
-        self.alice_pubkey_enc_id = alice_pubkey_enc_id
-        self.bob_pubkey_sig_id = bob_pubkey_sig_id
+        # self.alice_pubkey_enc_id = alice_pubkey_enc_id
+        # self.bob_pubkey_sig_id = bob_pubkey_sig_id
         self.alice_signature = alice_signature
 
 
diff --git a/nkms/keystore/keystore.py b/nkms/keystore/keystore.py
index 7d46ee288..41c54f676 100644
--- a/nkms/keystore/keystore.py
+++ b/nkms/keystore/keystore.py
@@ -79,19 +79,23 @@ def del_key(self, fingerprint: bytes):
     self.session.query(Key).filter_by(fingerprint=fingerprint).delete()
     self.session.commit()
 
+    def add_policy_contract(self, expiration, deposit, hrac, kfrag,
+                            alice_pubkey_sig, # alice_pubkey_enc,
+                            alice_signature) -> PolicyContract:
+        """
+        Creates a PolicyContract to the Keystore.
 
-def add_policy_contract(self, expiration, deposit, hrac,
-                        alice_pubkey_sig, alice_pubkey_enc,
-                        bob_pubkey_sig, alice_signature) -> PolicyContract:
-    """
-    Creates a PolicyContract to the Keystore.
+        :return: The newly added PolicyContract object
+        """
+        # TODO: This can be optimized to one commit/write.
+        alice_pubkey_sig = self.add_key(alice_pubkey_sig, is_signing=True)
+        # alice_pubkey_enc = self.add_key(alice_pubkey_enc)
+        # bob_pubkey_sig = self.add_key(bob_pubkey_sig)
 
-    :return: The newly added PolicyContract object
-    """
-    # TODO: This can be optimized to one commit/write.
-    alice_pubkey_sig = self.add_key(alice_pubkey_sig)
-    alice_pubkey_enc = self.add_key(alice_pubkey_enc)
-    bob_pubkey_sig = self.add_key(bob_pubkey_sig)
+        new_policy_contract = PolicyContract(
+            expiration, deposit, hrac, alice_pubkey_sig.id, kfrag,
+            alice_signature, # bob_pubkey_sig.id
+        )
 
     new_policy_contract = PolicyContract(
         expiration, deposit, hrac, alice_pubkey_sig.id,