lint progress

Author: Ouziel

counterparty-core/counterpartycore/lib/api/queries.py

@@ -2771,12 +2771,12 @@ def get_asset_balances(
 def prepare_where_status(status, arg_type, other_conditions=None):
     where = []
     statuses = status.split(",")
-    for status in statuses:
-        if status == "all":
+    for status_item in statuses:
+        if status_item == "all":
             where = [other_conditions] if other_conditions else []
             break
-        if status in typing.get_args(arg_type):
-            where_status = {"status": status}
+        if status_item in typing.get_args(arg_type):
+            where_status = {"status": status_item}
             if other_conditions:
                 where_status.update(other_conditions)
             where.append(where_status)

counterparty-core/counterpartycore/lib/backend/bitcoind.py

@@ -355,7 +355,6 @@ def satoshis_per_vbyte(
 
 
 def get_btc_supply(normalize=False):
-    f"""returns the total supply of {config.BTC} (based on what Bitcoin Core says the current block height is)"""  # noqa: B021
     block_count = getblockcount()
     blocks_remaining = block_count
     total_supply = 0

counterparty-core/counterpartycore/lib/backend/rsfetcher.py

@@ -176,7 +176,9 @@ def prefetch_blocks(self):
                             time.sleep(0.1)
                 elif not self.stopped_event.is_set():
                     retry += 1
-                    logger.debug(f"Waiting to prefetch block {expected_height}...({retry / 10}s)")
+                    logger.debug(
+                        "Waiting to prefetch block %s...(%.1fs)", expected_height, retry / 10
+                    )
                     # Use Event's wait method instead of time.sleep for better responsiveness
                     self.stopped_event.wait(retry / 10)  # noqa: S311
             except Exception as e:  # pylint: disable=broad-except
@@ -205,7 +207,7 @@ def stop(self):
                 self.fetcher.stop()
                 logger.debug("Fetcher stopped.")
         except Exception as e:  # pylint: disable=broad-except
-            logger.error(f"Error during stop: {e}")
+            logger.error("Error during stop: %s", e)
             if str(e) != "Stopped error":
                 raise e
         finally:
@@ -221,5 +223,5 @@ def restart(self):
 
 
 def stop():
-    if RSFetcher in RSFetcher._instances and RSFetcher._instances[RSFetcher] is not None:
+    if RSFetcher in RSFetcher._instances and RSFetcher._instances[RSFetcher] is not None:  # pylint: disable=protected-access
         RSFetcher().stop()

counterparty-core/counterpartycore/lib/config.py

@@ -1,15 +1,15 @@
 import os
 
-"""Variables prefixed with `DEFAULT` should be able to be overridden by
-configuration file and command‐line arguments."""
+# Variables prefixed with `DEFAULT` should be able to be overridden by
+# configuration file and command‐line arguments.
 
 UNIT = 100000000  # The same across assets.
 
 
 # Semantic Version
 __version__ = "10.10.0"  # for hatch
 VERSION_STRING = __version__
-version = VERSION_STRING.split("-")[0].split(".")
+version = VERSION_STRING.split("-", maxsplit=1)[0].split(".")
 VERSION_MAJOR = int(version[0])
 VERSION_MINOR = int(version[1])
 VERSION_REVISION = int(version[2])

counterparty-core/counterpartycore/lib/messages/bet.py

@@ -128,7 +128,7 @@ def validate(
 
     # For SQLite3
     if (
-        wager_quantity > config.MAX_INT
+        wager_quantity > config.MAX_INT  # pylint: disable=too-many-boolean-expressions
         or counterwager_quantity > config.MAX_INT
         or bet_type > config.MAX_INT
         or deadline > config.MAX_INT

counterparty-core/counterpartycore/lib/messages/burn.py

@@ -54,7 +54,7 @@ def compose(db, source: str, quantity: int, overburn: bool = False, skip_validat
 
     # Check that a maximum of 1 BTC total is burned per address.
     burns = ledger.other.get_burns(db, source)
-    already_burned = sum([burn["burned"] for burn in burns])
+    already_burned = sum(burn["burned"] for burn in burns)
 
     if quantity > (1 * config.UNIT - already_burned) and not overburn:
         raise exceptions.ComposeError(f"1 {config.BTC} may be burned per address")
@@ -87,7 +87,7 @@ def parse(db, tx):
         if status == "valid":
             # Calculate quantity of XCP earned. (Maximum 1 BTC in total, ever.)
             burns = ledger.other.get_burns(db, tx["source"])
-            already_burned = sum([burn["burned"] for burn in burns])
+            already_burned = sum(burn["burned"] for burn in burns)
             one = 1 * config.UNIT
             max_burn = one - already_burned
             if sent > max_burn:

counterparty-core/counterpartycore/lib/messages/dispenser.py

@@ -60,7 +60,6 @@ def validate(
     oracle_address,
 ):
     problems = []
-    order_match = None  # noqa: F841
     asset_id = None
 
     if asset == config.BTC:
@@ -70,14 +69,14 @@ def validate(
     # resolve subassets
     asset = ledger.issuances.resolve_subasset_longname(db, asset)
 
-    if status == STATUS_OPEN or status == STATUS_OPEN_EMPTY_ADDRESS:
+    if status in [STATUS_OPEN, STATUS_OPEN_EMPTY_ADDRESS]:
         if give_quantity <= 0:
             problems.append("give_quantity must be positive")
         if mainchainrate <= 0:
             problems.append("mainchainrate must be positive")
         if escrow_quantity < give_quantity:
             problems.append("escrow_quantity must be greater or equal than give_quantity")
-    elif not (status == STATUS_CLOSED):
+    elif status != STATUS_CLOSED:
         problems.append(f"invalid status {status}")
 
     cursor = db.cursor()
@@ -149,7 +148,7 @@ def validate(
                         open_dispensers[0]["satoshirate"] == mainchainrate
                         and open_dispensers[0]["give_quantity"] == give_quantity
                     ):
-                        if (max_refills > 0) and (refilling_count >= max_refills):
+                        if refilling_count >= max_refills > 0:
                             problems.append("the dispenser reached its maximum refilling")
                     else:
                         if open_dispensers[0]["satoshirate"] != mainchainrate:

counterparty-core/counterpartycore/lib/messages/issuance.py

@@ -315,7 +315,7 @@ def compose(
         asset_id
     )  # This will remove leading zeros in the numeric assets
 
-    (
+    (  # pylint: disable=unbalanced-tuple-unpacking
         call_date,
         call_price,
         problems,
@@ -748,7 +748,7 @@ def parse(db, tx, message, message_type_id):
     reissuance = None
     fee = 0
     if status == "valid":
-        (
+        (  # pylint: disable=unbalanced-tuple-unpacking
             call_date,
             call_price,
             problems,

counterparty-core/counterpartycore/lib/messages/order.py

@@ -203,7 +203,6 @@ def cancel_order_match(db, order_match, status, block_index, tx_index):
 
     if status == "expired":
         # Record order match expiration.
-        cursor = db.cursor()  # noqa: F841
         bindings = {
             "order_match_id": order_match["id"],
             "tx0_address": order_match["tx0_address"],
@@ -545,7 +544,7 @@ def match(db, tx, block_index=None):
         tx0_fee_provided_remaining = tx0["fee_provided_remaining"]
 
         # Make sure that that both orders still have funds remaining (if order involves BTC, and so cannot be ‘filled’).
-        if tx0["give_asset"] == config.BTC or tx0["get_asset"] == config.BTC:  # Gratuitous
+        if config.BTC in [tx0["give_asset"], tx0["get_asset"]]:  # Gratuitous
             if tx0_give_remaining <= 0 or tx1_give_remaining <= 0:
                 logger.trace("Skipping: negative give quantity remaining")
                 continue
@@ -637,17 +636,19 @@ def match(db, tx, block_index=None):
                         )
 
                     logger.trace(
-                        f"Tx0 fee provided remaining: {tx0_fee_provided_remaining / config.UNIT}; required fee: {fee / config.UNIT}"
+                        "Tx0 fee provided remaining: %s; required fee: %s",
+                        tx0_fee_provided_remaining / config.UNIT,
+                        fee / config.UNIT,
                     )
                     if tx0_fee_provided_remaining < fee:
                         logger.trace("Skipping: tx0 fee provided remaining is too low.")
                         continue
-                    else:
-                        tx0_fee_provided_remaining -= fee
-                        if protocol.after_block_or_test_network(
-                            block_index, 287800
-                        ):  # Protocol change.
-                            tx1_fee_required_remaining -= fee
+
+                    tx0_fee_provided_remaining -= fee
+                    if protocol.after_block_or_test_network(
+                        block_index, 287800
+                    ):  # Protocol change.
+                        tx1_fee_required_remaining -= fee
 
                 elif tx1["give_asset"] == config.BTC:
                     if protocol.after_block_or_test_network(
@@ -664,17 +665,21 @@ def match(db, tx, block_index=None):
                         )
 
                     logger.trace(
-                        f"Tx1 fee provided remaining: {tx1_fee_provided_remaining / config.UNIT}; required fee: {fee / config.UNIT}"
+                        "Tx1 fee provided remaining: %(fee_provided)s; required fee: %(required_fee)s",
+                        {
+                            "fee_provided": tx1_fee_provided_remaining / config.UNIT,
+                            "required_fee": fee / config.UNIT,
+                        },
                     )
                     if tx1_fee_provided_remaining < fee:
                         logger.trace("Skipping: tx1 fee provided remaining is too low.")
                         continue
-                    else:
-                        tx1_fee_provided_remaining -= fee
-                        if protocol.after_block_or_test_network(
-                            block_index, 287800
-                        ):  # Protocol change.
-                            tx0_fee_required_remaining -= fee
+
+                    tx1_fee_provided_remaining -= fee
+                    if protocol.after_block_or_test_network(
+                        block_index, 287800
+                    ):  # Protocol change.
+                        tx0_fee_required_remaining -= fee
 
             else:  # Don’t deduct.
                 if tx1["get_asset"] == config.BTC:
@@ -722,7 +727,7 @@ def match(db, tx, block_index=None):
             if tx0_give_remaining <= 0 or (
                 tx0_get_remaining <= 0 and protocol.after_block_or_test_network(block_index, 292000)
             ):  # Protocol change
-                if tx0["give_asset"] != config.BTC and tx0["get_asset"] != config.BTC:
+                if config.BTC not in [tx0["give_asset"], tx0["get_asset"]]:
                     # Fill order, and recredit give_remaining.
                     tx0_status = "filled"
                     ledger.events.credit(
@@ -747,7 +752,7 @@ def match(db, tx, block_index=None):
             if tx1_give_remaining <= 0 or (
                 tx1_get_remaining <= 0 and protocol.after_block_or_test_network(block_index, 292000)
             ):  # Protocol change
-                if tx1["give_asset"] != config.BTC and tx1["get_asset"] != config.BTC:
+                if config.BTC not in [tx1["give_asset"], tx1["get_asset"]]:
                     # Fill order, and recredit give_remaining.
                     tx1_status = "filled"
                     ledger.events.credit(

counterparty-core/counterpartycore/lib/messages/sweep.py

@@ -57,7 +57,7 @@ def validate(db, source, destination, flags, memo, block_index):
 
     if flags > FLAGS_ALL:
         problems.append(f"invalid flags {flags}")
-    elif not (flags & (FLAG_BALANCES | FLAG_OWNERSHIP)):
+    elif not flags & (FLAG_BALANCES | FLAG_OWNERSHIP):
         problems.append("must specify which kind of transfer in flags")
 
     if memo and len(memo) > MAX_MEMO_LENGTH:
@@ -103,7 +103,7 @@ def unpack(message):
         short_address_bytes, flags, memo_bytes = struct.unpack(struct_format, message)
         if len(memo_bytes) == 0:
             memo_bytes = None
-        elif not (flags & FLAG_BINARY_MEMO):
+        elif not flags & FLAG_BINARY_MEMO:
             memo_bytes = memo_bytes.decode("utf-8")
 
         # unpack address

counterparty-core/counterpartycore/lib/messages/versions/send1.py

@@ -128,7 +128,7 @@ def parse(db, tx, message):
         asset_id, quantity = struct.unpack(FORMAT, message)
         asset = ledger.issuances.get_asset_name(db, asset_id)
         status = "valid"
-    except (exceptions.UnpackError, exceptions.AssetNameError, struct.error) as e:  # noqa: F841
+    except (exceptions.UnpackError, exceptions.AssetNameError, struct.error):
         asset, quantity = None, None
         status = "invalid: could not unpack"
 

counterparty-core/counterpartycore/lib/parser/blocks.py

@@ -150,12 +150,12 @@ def parse_tx(db, tx):
                 or len(tx["source"].split("-")) > 1
                 or (tx["destination"] and len(tx["destination"].split("-")) > 1)
             ):
-                return
+                return False
 
             # Burns.
             if tx["destination"] == config.UNSPENDABLE:
                 burn.parse(db, tx)
-                return
+                return supported
 
             # Protocol change.
             rps_enabled = protocol.after_block_or_test_network(tx["block_index"], 308500)