From fbcb95be9e295d720100a1eef1d3961877019ddf Mon Sep 17 00:00:00 2001 From: Kevin Froman Date: Thu, 15 Oct 2020 02:46:20 +0000 Subject: [PATCH] fix mixmate indent --- src/communicatorutils/uploadblocks/mixmate/__init__.py | 2 +- src/onionrblocks/onionrblockapi.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/communicatorutils/uploadblocks/mixmate/__init__.py b/src/communicatorutils/uploadblocks/mixmate/__init__.py index a3ddcfda..3e63ea99 100644 --- a/src/communicatorutils/uploadblocks/mixmate/__init__.py +++ b/src/communicatorutils/uploadblocks/mixmate/__init__.py @@ -41,7 +41,7 @@ def block_mixer(upload_list: List[onionrtypes.BlockHash], try: if time.time() - bl.claimedTime > onionrvalues.BLOCK_POOL_MAX_AGE: - raise ValueError + raise ValueError except TypeError: pass if block_to_mix: diff --git a/src/onionrblocks/onionrblockapi.py b/src/onionrblocks/onionrblockapi.py index 753c08c6..f7797a7c 100755 --- a/src/onionrblocks/onionrblockapi.py +++ b/src/onionrblocks/onionrblockapi.py @@ -83,7 +83,9 @@ class Block: self.bcontent = encryption.pub_key_decrypt(self.bcontent, encodedData=encodedData) except (binascii.Error, ValueError) as e: self.bcontent = encryption.pub_key_decrypt(self.bcontent, encodedData=False) + bmeta = encryption.pub_key_decrypt(self.bmetadata, encodedData=encodedData) + try: bmeta = bmeta.decode() except AttributeError: