Linting and ruffing

nucypher · Jan 18, 2024 · 075309e · 075309e
1 parent bad2538
commit 075309e
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 25 deletions.
diff --git a/porter/interfaces.py b/porter/interfaces.py
@@ -96,18 +96,18 @@ def decrypt(
 
     @attach_schema(schema.BucketSampling)
     def bucket_sampling(
-            self,
-            quantity: int,
-            random_seed: Optional[int] = None,
-            exclude_ursulas: Optional[List[ChecksumAddress]] = None,
-            timeout: Optional[int] = None,
+        self,
+        quantity: int,
+        random_seed: Optional[int] = None,
+        exclude_ursulas: Optional[List[ChecksumAddress]] = None,
+        timeout: Optional[int] = None,
     ) -> Dict:
-        ursulas_info, block_number = self.implementer.bucket_sampling(
+        ursulas, block_number = self.implementer.bucket_sampling(
             quantity=quantity,
             random_seed=random_seed,
             exclude_ursulas=exclude_ursulas,
             timeout=timeout,
         )
 
-        response_data = {"ursulas": ursulas_info, "block_number": block_number}
+        response_data = {"ursulas": ursulas, "block_number": block_number}
         return response_data
diff --git a/porter/main.py b/porter/main.py
@@ -1,7 +1,7 @@
 import os
 import time
 from collections import defaultdict
-from json import loads, JSONDecodeError
+from json import JSONDecodeError
 from pathlib import Path
 from random import Random
 from typing import Dict, List, NamedTuple, Optional, Sequence, Tuple, Union
@@ -301,7 +301,7 @@ class RandomizedStakingProvidersReservoir:
             def __init__(
                 self,
                 staking_providers: Sequence[ChecksumAddress],
-                seed: Optional[int] = None
+                seed: Optional[int] = None,
             ):
                 self._providers = list(staking_providers)
                 rng = Random(seed)
@@ -484,25 +484,25 @@ def make_web_controller(self,
         #
         # Porter Control HTTP Endpoints
         #
-        @porter_flask_control.route('/get_ursulas', methods=['GET'])
+        @porter_flask_control.route("/get_ursulas", methods=["GET"])
         @by_path_counter
         def get_ursulas() -> Response:
             """Porter control endpoint for sampling Ursulas on behalf of Alice."""
-            response = controller(method_name='get_ursulas', control_request=request)
+            response = controller(method_name="get_ursulas", control_request=request)
             return response
 
-        @porter_flask_control.route("/revoke", methods=['POST'])
+        @porter_flask_control.route("/revoke", methods=["POST"])
         @by_path_counter
         def revoke():
             """Porter control endpoint for off-chain revocation of a policy on behalf of Alice."""
-            response = controller(method_name='revoke', control_request=request)
+            response = controller(method_name="revoke", control_request=request)
             return response
 
-        @porter_flask_control.route("/retrieve_cfrags", methods=['POST'])
+        @porter_flask_control.route("/retrieve_cfrags", methods=["POST"])
         @by_path_counter
         def retrieve_cfrags() -> Response:
             """Porter control endpoint for executing a PRE work order on behalf of Bob."""
-            response = controller(method_name='retrieve_cfrags', control_request=request)
+            response = controller(method_name="retrieve_cfrags", control_request=request)
             return response
 
         @porter_flask_control.route("/decrypt", methods=["POST"])
@@ -512,11 +512,13 @@ def decrypt() -> Response:
             response = controller(method_name="decrypt", control_request=request)
             return response
 
-        @porter_flask_control.route('/bucket_sampling', methods=['GET'])
+        @porter_flask_control.route("/bucket_sampling", methods=["GET"])
         @by_path_counter
         def bucket_sampling() -> Response:
             """Porter control endpoint for sampling Ursulas with provider caps (a.k.a. bucket sampling)"""
-            response = controller(method_name='bucket_sampling', control_request=request)
+            response = controller(
+                method_name="bucket_sampling", control_request=request
+            )
             return response
 
         return controller
diff --git a/porter/schema.py b/porter/schema.py
@@ -3,7 +3,7 @@
 from marshmallow import fields as marshmallow_fields
 
 from porter.cli.types import EIP55_CHECKSUM_ADDRESS
-from porter.fields.base import Integer, JSON, PositiveInteger, StringList
+from porter.fields.base import JSON, Integer, PositiveInteger, StringList
 from porter.fields.exceptions import InvalidArgumentCombo, InvalidInputData
 from porter.fields.retrieve import CapsuleFrag, RetrievalKit
 from porter.fields.taco import (
@@ -292,10 +292,13 @@ class BucketSampling(BaseSchema):
         required=True,
         load_only=True,
         click=click.option(
-            '--quantity',
-            '-n',
+            "--quantity",
+            "-n",
             help="Total number of Ursulas needed",
-            type=click.INT, required=True))
+            type=click.INT,
+            required=True
+        )
+    )
 
     # optional
     random_seed = Integer(
@@ -312,15 +315,17 @@ class BucketSampling(BaseSchema):
     exclude_ursulas = StringList(
         UrsulaChecksumAddress(),
         click=click.option(
-            '--exclude-ursula',
-            '-e',
+            "--exclude-ursula",
+            "-e",
             help="Ursula checksum address to exclude from sample",
             multiple=True,
             type=EIP55_CHECKSUM_ADDRESS,
             required=False,
-            default=[]),
+            default=[]
+        ),
         required=False,
-        load_only=True)
+        load_only=True,
+    )
 
     timeout = PositiveInteger(
         required=False,