From d83c38ea480fe9159ce56bd96826e7aeafa88bd7 Mon Sep 17 00:00:00 2001 From: Mawoka Date: Fri, 24 Jun 2022 19:09:46 +0200 Subject: [PATCH] :rotating_light: Fixed linter errors --- classquiz/helpers/__init__.py | 10 ++-------- classquiz/helpers/hashcash.py | 16 ++++++++++++---- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/classquiz/helpers/__init__.py b/classquiz/helpers/__init__.py index 3de4d69..22be197 100644 --- a/classquiz/helpers/__init__.py +++ b/classquiz/helpers/__init__.py @@ -125,11 +125,5 @@ def check_hashcash(data: str, input_data: str, claim_in: Optional[str] = "19") - version, claim, _date, res, ext, _rand, _counter = data.split(":") except ValueError: return False - try: - assert version == "1" - assert claim == claim_in - assert res == input_data - assert ext == "" - return True - except AssertionError: - return False + some_error = [version == "1", claim == claim_in, res == input_data, ext == ""] + return all(el is True for el in some_error) diff --git a/classquiz/helpers/hashcash.py b/classquiz/helpers/hashcash.py index bf4e9bb..59ffc19 100644 --- a/classquiz/helpers/hashcash.py +++ b/classquiz/helpers/hashcash.py @@ -96,7 +96,9 @@ def _mint(challenge, bits): hex_digits = int(ceil(bits / 4.0)) zeros = "0" * hex_digits while 1: - digest = hashlib.sha1((challenge + hex(counter)[2:]).encode(), usedforsecurity=False).hexdigest() + digest = hashlib.sha1( + (challenge + hex(counter)[2:]).encode(), usedforsecurity=False + ).hexdigest() # skipcq: PYL-E1123, PTC-W1003 if digest[:hex_digits] == zeros: tries[0] = counter return hex(counter)[2:] @@ -137,7 +139,9 @@ def check(stamp, resource=None, bits=None, check_expiration=None, ds_callback=No return True else: hex_digits = int(floor(bits / 4)) - return hashlib.sha1((stamp).encode(), usedforsecurity=False).hexdigest().startswith("0" * hex_digits) + return ( + hashlib.sha1((stamp).encode(), usedforsecurity=False).hexdigest().startswith("0" * hex_digits) + ) # skipcq: PYL-E1123, PTC-W1003 elif stamp.startswith("1:"): # Version 1 try: claim, date, res, _ext, _rand, _counter = stamp[2:].split(":") @@ -155,7 +159,9 @@ def check(stamp, resource=None, bits=None, check_expiration=None, ds_callback=No return False else: hex_digits = int(floor(int(claim) / 4)) - return hashlib.sha1((stamp).encode(), usedforsecurity=False).hexdigest().startswith("0" * hex_digits) + return ( + hashlib.sha1((stamp).encode(), usedforsecurity=False).hexdigest().startswith("0" * hex_digits) + ) # skipcq: PYL-E1123, PTC-W1003 else: # Unknown ver or generalized hashcash if type(bits) is not int: return True @@ -163,4 +169,6 @@ def check(stamp, resource=None, bits=None, check_expiration=None, ds_callback=No return False else: hex_digits = int(floor(bits / 4)) - return hashlib.sha1((stamp).encode(), usedforsecurity=False).hexdigest().startswith("0" * hex_digits) + return ( + hashlib.sha1((stamp).encode(), usedforsecurity=False).hexdigest().startswith("0" * hex_digits) + ) # skipcq: PYL-E1123, PTC-W1003