From 1f73c04739f37bbdf64ae99a1542f864d35520ac Mon Sep 17 00:00:00 2001
From: jMyles <justin@justinholmes.com>
Date: Fri, 15 Feb 2019 07:41:48 -0700
Subject: [PATCH] A bunch of small fixes for things we noticed launching the
 testnet.  Also, Alice now takes label in the URL.

---
 nucypher/characters/lawful.py  | 23 +++++++++++------------
 nucypher/cli/moe.py            |  3 ---
 nucypher/network/middleware.py |  3 +++
 nucypher/utilities/logging.py  |  2 +-
 4 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/nucypher/characters/lawful.py b/nucypher/characters/lawful.py
index 428171591..cfca5b19d 100644
--- a/nucypher/characters/lawful.py
+++ b/nucypher/characters/lawful.py
@@ -14,6 +14,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with nucypher.  If not, see <https://www.gnu.org/licenses/>.
 """
+import datetime
 import json
 import random
 from base64 import b64encode, b64decode
@@ -241,20 +242,14 @@ class Alice(Character, PolicyAuthor):
             # TODO: Serialize the policy
             return Response('Policy created!', status=200)
 
-        @alice_control.route('/derive_policy_pubkey', methods=['POST'])
-        def derive_policy_pubkey():
+        @alice_control.route('/derive_policy_pubkey/<label>', methods=['POST'])
+        def derive_policy_pubkey(label):
             """
             Character control endpoint for deriving a policy pubkey given
             a label.
             """
-            try:
-                request_data = json.loads(request.data)
-
-                label = b64decode(request_data['label'])
-            except (KeyError, JSONDecodeError) as e:
-                return Response(str(e), status=400)
-
-            policy_pubkey = drone_alice.get_policy_pubkey_from_label(label)
+            label_bytes = label.encode()
+            policy_pubkey = drone_alice.get_policy_pubkey_from_label(label_bytes)
 
             response_data = {
                 'result': {
@@ -279,8 +274,12 @@ class Alice(Character, PolicyAuthor):
                 label = b64decode(request_data['label'])
                 # TODO: Do we change this to something like "threshold"
                 m, n = request_data['m'], request_data['n']
-                expiration_time = maya.MayaDT.from_iso8601(
-                    request_data['expiration_time'])
+                expiration = request_data.get("expiration_time")
+                if expiration:
+                    expiration_time = maya.MayaDT.from_iso8601(
+                        request_data['expiration_time'])
+                else:
+                    expiration_time = (maya.now() + datetime.timedelta(days=3))
                 federated_only = True  # const for now
 
                 bob = Bob.from_public_keys({DecryptingPower: bob_pubkey_enc,
diff --git a/nucypher/cli/moe.py b/nucypher/cli/moe.py
index 4c7b7727f..76e60a764 100644
--- a/nucypher/cli/moe.py
+++ b/nucypher/cli/moe.py
@@ -15,9 +15,6 @@ from nucypher.network.middleware import RestMiddleware
 from nucypher.network.nodes import FleetStateTracker
 from nucypher.utilities.logging import SimpleObserver
 
-
-globalLogPublisher.addObserver(SimpleObserver())
-
 MOE_BANNER = r"""
  _______               
 |   |   |.-----..-----.
diff --git a/nucypher/network/middleware.py b/nucypher/network/middleware.py
index 8b5219bfc..86320345e 100644
--- a/nucypher/network/middleware.py
+++ b/nucypher/network/middleware.py
@@ -39,6 +39,7 @@ class NotFound(UnexpectedResponse):
 
 class NucypherMiddlewareClient:
     library = requests
+    timeout = 1.2
 
     @staticmethod
     def response_cleaner(response):
@@ -60,6 +61,8 @@ class NucypherMiddlewareClient:
 
     def invoke_method(self, method, url, *args, **kwargs):
         self.clean_params(kwargs)
+        if not kwargs.get("timeout"):
+            kwargs["timeout"] = self.timeout
         response = method(url, *args, **kwargs)
         return response
 
diff --git a/nucypher/utilities/logging.py b/nucypher/utilities/logging.py
index 975836cb2..3a1314d84 100644
--- a/nucypher/utilities/logging.py
+++ b/nucypher/utilities/logging.py
@@ -99,7 +99,7 @@ class GlobalConsoleLogger:
             cls.start()
 
 
-def logToSentry(cls,  event):
+def logToSentry(event):
 
     # Handle Logs...
     if not event.get('isError') or 'failure' not in event: