refactor: black

2026-05-29 23:31:40 +02:00 · 2026-05-28 01:55:36 +02:00
parent 24c8e8b2dd
commit e8ebfd34d0
28 changed files with 4 additions and 34 deletions
@@ -166,7 +166,6 @@ import basicswap.network.network as bsn
 import basicswap.protocols.atomic_swap_1 as atomic_swap_1
 import basicswap.protocols.xmr_swap_1 as xmr_swap_1

-
 PROTOCOL_VERSION_SECRET_HASH = 5
 MINPROTO_VERSION_SECRET_HASH = 4

@@ -13811,8 +13810,7 @@ class BasicSwap(BaseApp, BSXNetwork, UIApp):
            num_watched_outputs += len(v["watched_outputs"])

        now: int = self.getTime()
-        q_bids_str: str = (
-            """SELECT
+        q_bids_str: str = """SELECT
               COUNT(CASE WHEN b.was_sent THEN 1 ELSE NULL END) AS count_sent,
               COUNT(CASE WHEN b.was_sent AND (s.in_progress OR (s.swap_ended = 0 AND b.expire_at > :now AND o.expire_at > :now)) THEN 1 ELSE NULL END) AS count_sent_active,
               COUNT(CASE WHEN b.was_received THEN 1 ELSE NULL END) AS count_received,
@@ -13822,15 +13820,12 @@ class BasicSwap(BaseApp, BSXNetwork, UIApp):
               JOIN offers o ON b.offer_id = o.offer_id
               JOIN bidstates s ON b.state = s.state_id
               WHERE b.active_ind = 1"""
-        )

-        q_offers_str: str = (
-            """SELECT
+        q_offers_str: str = """SELECT
               COUNT(CASE WHEN expire_at > :now THEN 1 ELSE NULL END) AS count_active,
               COUNT(CASE WHEN was_sent THEN 1 ELSE NULL END) AS count_sent,
               COUNT(CASE WHEN was_sent AND expire_at > :now THEN 1 ELSE NULL END) AS count_sent_active
               FROM offers WHERE active_ind = 1"""
-        )

        try:
            cursor = self.openDB()
@@ -12,7 +12,6 @@ import time
 from enum import IntEnum, auto
 from typing import Optional

-
 CURRENT_DB_VERSION = 34
 CURRENT_DB_DATA_VERSION = 8

@@ -7,7 +7,6 @@

 import json

-
 default_coingecko_api_key = "CG-8hm3r9iLfpEXv4ied8oLbeUj"


@@ -99,7 +99,6 @@ from basicswap.basicswap_util import TxLockTypes
 from basicswap.chainparams import Coins
 from basicswap.rpc import make_rpc_func, openrpc

-
 SEQUENCE_LOCKTIME_GRANULARITY = 9  # 512 seconds
 SEQUENCE_LOCKTIME_TYPE_FLAG = 1 << 22
 SEQUENCE_LOCKTIME_MASK = 0x0000FFFF
@@ -82,7 +82,6 @@ from coincurve.ecdsaotves import (
    ecdsaotves_rec_enc_key,
 )

-
 SEQUENCE_LOCKTIME_GRANULARITY = 9  # 512 seconds
 SEQUENCE_LOCKTIME_TYPE_FLAG = 1 << 22
 SEQUENCE_LOCKTIME_MASK = 0x0000F
@@ -13,7 +13,7 @@ import subprocess
 def createDCRWallet(args, hex_seed, logging, delay_event):
    logging.info("Creating DCR wallet")

-    (pipe_r, pipe_w) = os.pipe()  # subprocess.PIPE is buffered, blocks when read
+    pipe_r, pipe_w = os.pipe()  # subprocess.PIPE is buffered, blocks when read

    if os.name == "nt":
        str_args = " ".join(args)
@@ -34,7 +34,6 @@ from basicswap.rpc_xmr import make_xmr_rpc_func, make_xmr_rpc2_func
 from basicswap.chainparams import XMR_COIN, Coins
 from basicswap.interface.base import CoinInterface

-
 ed25519_l = 2**252 + 27742317777372353535851937790883648493


@@ -23,7 +23,6 @@ protobuf ParseFromString would reset the whole object, from_bytes won't.

 from basicswap.util.integer import encode_varint, decode_varint

-
 NPBW_INT = 0
 NPBW_BYTES = 2

@@ -39,7 +39,6 @@ from basicswap.contrib.rfc6979 import (
    rfc6979_hmac_sha256_generate,
 )

-
 START_TOKEN = 0xABCD
 MSG_START_TOKEN = START_TOKEN.to_bytes(2, "big")

@@ -53,7 +53,7 @@ def initSimplexClient(args, logger, delay_event):
    # TODO: Must be a better way?
    logger.info("Initialising Simplex client")

-    (pipe_r, pipe_w) = os.pipe()  # subprocess.PIPE is buffered, blocks when read
+    pipe_r, pipe_w = os.pipe()  # subprocess.PIPE is buffered, blocks when read

    if os.name == "nt":
        str_args = " ".join(args)
@@ -10,7 +10,6 @@ import json
 import time
 import decimal

-
 COIN = 100000000


@@ -25,7 +25,6 @@ from basicswap.contrib.test_framework.messages import (
    uint256_from_str,
 )

-
 AES_BLOCK_SIZE = 16


@@ -21,7 +21,6 @@ from basicswap.util import toBool
 from basicswap.contrib.rpcauth import generate_salt, password_to_hmac
 from basicswap.bin.prepare import downloadPIVXParams

-
 TEST_HTTP_HOST = os.getenv(
    "TEST_HTTP_HOST", "127.0.0.1"
 )  # Set to 0.0.0.0 when used in docker
@@ -56,7 +56,6 @@ from tests.basicswap.extended.test_doge import (
 import basicswap.config as cfg
 import basicswap.bin.run as runSystem

-
 TEST_PATH = os.path.expanduser(os.getenv("TEST_PATH", "~/test_basicswap1"))

 PARTICL_PORT_BASE = int(os.getenv("PARTICL_PORT_BASE", BASE_PORT))
@@ -65,7 +65,6 @@ from tests.basicswap.common import (
 )
 from basicswap.bin.run import startDaemon

-
 logger = logging.getLogger()
 logger.level = logging.DEBUG
 if not len(logger.handlers):
@@ -34,7 +34,6 @@ from tests.basicswap.util import (
    read_json_api,
 )

-
 logger = logging.getLogger()
 logger.level = logging.DEBUG
 if not len(logger.handlers):
@@ -31,7 +31,6 @@ from tests.basicswap.util import (
    waitForServer,
 )

-
 logger = logging.getLogger()
 logger.level = logging.DEBUG
 if not len(logger.handlers):
@@ -58,7 +58,6 @@ from tests.basicswap.common import (

 from basicswap.bin.run import startDaemon

-
 logger = logging.getLogger()

 NUM_NODES = 3
@@ -40,7 +40,6 @@ from tests.basicswap.extended.test_dcr import (
    run_test_itx_refund,
 )

-
 logger = logging.getLogger("BSX Tests")

 if not len(logger.handlers):
@@ -66,7 +66,6 @@ from tests.basicswap.common import (
 from basicswap.bin.run import startDaemon
 from basicswap.bin.prepare import downloadPIVXParams

-
 logger = logging.getLogger()
 logger.level = logging.DEBUG
 if not len(logger.handlers):
@@ -38,7 +38,6 @@ from tests.basicswap.util import (
    waitForServer,
 )

-
 logger = logging.getLogger()
 logger.level = logging.DEBUG
 if not len(logger.handlers):
@@ -20,7 +20,6 @@ from util import (
 )
 from tests.basicswap.util import read_json_api

-
 base_url = "http://localhost"


@@ -16,7 +16,6 @@ from tests.basicswap.util import (
 from util import get_driver
 from selenium.webdriver.common.by import By

-
 logger = logging.getLogger()
 logger.level = logging.INFO
 if not len(logger.handlers):
@@ -9,7 +9,6 @@
 import os
 from selenium.webdriver.common.by import By

-
 BSX_0_PORT = int(os.getenv("BSX_0_PORT", 12701))
 BSX_1_PORT = int(os.getenv("BSX_1_PORT", BSX_0_PORT + 1))
 BSX_2_PORT = int(os.getenv("BSX_1_PORT", BSX_0_PORT + 2))
@@ -61,7 +61,6 @@ from basicswap.contrib.test_framework.messages import (
    uint256_from_str,
 )

-
 logger = logging.getLogger()


@@ -63,7 +63,6 @@ from basicswap.contrib.test_framework.script import (
 )
 from tests.basicswap.test_xmr import BaseTest, test_delay_event, callnoderpc

-
 logger = logging.getLogger()


@@ -91,7 +91,6 @@ from basicswap.db_util import (
 )
 from basicswap.bin.run import startDaemon, startXmrDaemon, startXmrWalletDaemon

-
 logger = logging.getLogger()

 NUM_NODES = 3
@@ -10,7 +10,6 @@ import json
 import urllib
 from urllib.request import urlopen

-
 REQUIRED_SETTINGS = {
    "blocks_confirmed": 1,
    "conf_target": 1,