From 9bd14d161a7bb8cb1e8a22329a1fb729598d2b06 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sun, 18 Feb 2024 12:11:15 +0100 Subject: [PATCH] [pre-commit.ci] pre-commit autoupdate (#240) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [pre-commit.ci] pre-commit autoupdate updates: - [github.com/psf/black: 23.12.1 → 24.2.0](https://github.com/psf/black/compare/23.12.1...24.2.0) - [github.com/astral-sh/ruff-pre-commit: v0.1.14 → v0.2.1](https://github.com/astral-sh/ruff-pre-commit/compare/v0.1.14...v0.2.1) * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 4 +-- app/bitcoind/models.py | 24 ++++++------- app/external/fastapi_versioning/versioning.py | 3 +- .../impl/protos/lnd/lightning_pb2.py | 36 +++++++++---------- app/lightning/impl/protos/lnd/router_pb2.py | 6 ++-- app/lightning/models.py | 30 +++++++++------- app/system/impl/raspiblitz.py | 6 ++-- 7 files changed, 57 insertions(+), 52 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index d0816b3..56a9616 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -14,7 +14,7 @@ repos: - id: debug-statements - id: mixed-line-ending - repo: https://github.com/psf/black - rev: 23.12.1 + rev: 24.2.0 hooks: - id: black - repo: https://github.com/pycqa/isort @@ -23,6 +23,6 @@ repos: - id: isort args: ["--profile", "black", "--filter-files"] - repo: https://github.com/astral-sh/ruff-pre-commit - rev: 'v0.1.14' + rev: 'v0.2.1' hooks: - id: ruff diff --git a/app/bitcoind/models.py b/app/bitcoind/models.py index 0b000cc..8d8f96d 100644 --- a/app/bitcoind/models.py +++ b/app/bitcoind/models.py @@ -102,9 +102,9 @@ class RawTransaction(BaseModel): @classmethod def from_rpc(cls, tx): return cls( - in_active_chain=tx["in_active_chain"] - if "in_active_chain" in tx.keys() - else None, + in_active_chain=( + tx["in_active_chain"] if "in_active_chain" in tx.keys() else None + ), txid=tx["txid"] if "txid" in tx.keys() else "", hash=tx["hash"] if "hash" in tx.keys() else "", size=tx["size"] if "size" in tx.keys() else 0, @@ -283,9 +283,9 @@ class Bip9Data(BaseModel): timeout=r["timeout"], since=r["since"], min_activation_height=r["min_activation_height"], - statistics=Bip9Statistics.from_rpc(r["statistics"]) - if "statistics" in r - else None, + statistics=( + Bip9Statistics.from_rpc(r["statistics"]) if "statistics" in r else None + ), height=r["height"] if "height" in r else None, active=r["active"] if "active" in r else None, ) @@ -396,12 +396,12 @@ class BlockchainInfo(BaseModel): size_on_disk=r["size_on_disk"], pruned=r["pruned"], pruned_height=None if "pruneheight" not in r else r["pruneheight"], - automatic_pruning=None - if "automatic_pruning" not in r - else r["automatic_pruning"], - prune_target_size=None - if "prune_target_size" not in r - else r["prune_target_size"], + automatic_pruning=( + None if "automatic_pruning" not in r else r["automatic_pruning"] + ), + prune_target_size=( + None if "prune_target_size" not in r else r["prune_target_size"] + ), warnings=r["warnings"], softforks=softforks, ) diff --git a/app/external/fastapi_versioning/versioning.py b/app/external/fastapi_versioning/versioning.py index f933d1b..5c72c74 100644 --- a/app/external/fastapi_versioning/versioning.py +++ b/app/external/fastapi_versioning/versioning.py @@ -63,8 +63,7 @@ def VersionedFastAPI( @parent_app.get(f"{prefix}/openapi.json", name=semver, tags=["Versions"]) @parent_app.get(f"{prefix}/docs", name=semver, tags=["Documentations"]) - def noop() -> None: - ... + def noop() -> None: ... if enable_latest: prefix = "/latest" diff --git a/app/lightning/impl/protos/lnd/lightning_pb2.py b/app/lightning/impl/protos/lnd/lightning_pb2.py index 57c1a5b..0d8e239 100644 --- a/app/lightning/impl/protos/lnd/lightning_pb2.py +++ b/app/lightning/impl/protos/lnd/lightning_pb2.py @@ -32,15 +32,15 @@ if _descriptor._USE_C_DESCRIPTORS == False: _SENDREQUEST.fields_by_name["outgoing_chan_id"]._options = None _SENDREQUEST.fields_by_name["outgoing_chan_id"]._serialized_options = b"0\001" _SENDTOROUTEREQUEST.fields_by_name["payment_hash_string"]._options = None - _SENDTOROUTEREQUEST.fields_by_name[ - "payment_hash_string" - ]._serialized_options = b"\030\001" + _SENDTOROUTEREQUEST.fields_by_name["payment_hash_string"]._serialized_options = ( + b"\030\001" + ) _ESTIMATEFEEREQUEST_ADDRTOAMOUNTENTRY._options = None _ESTIMATEFEEREQUEST_ADDRTOAMOUNTENTRY._serialized_options = b"8\001" _ESTIMATEFEERESPONSE.fields_by_name["feerate_sat_per_byte"]._options = None - _ESTIMATEFEERESPONSE.fields_by_name[ - "feerate_sat_per_byte" - ]._serialized_options = b"\030\001" + _ESTIMATEFEERESPONSE.fields_by_name["feerate_sat_per_byte"]._serialized_options = ( + b"\030\001" + ) _SENDMANYREQUEST_ADDRTOAMOUNTENTRY._options = None _SENDMANYREQUEST_ADDRTOAMOUNTENTRY._serialized_options = b"8\001" _SENDMANYREQUEST.fields_by_name["sat_per_byte"]._options = None @@ -70,13 +70,13 @@ if _descriptor._USE_C_DESCRIPTORS == False: _GETINFORESPONSE.fields_by_name["testnet"]._options = None _GETINFORESPONSE.fields_by_name["testnet"]._serialized_options = b"\030\001" _CLOSECHANNELREQUEST.fields_by_name["sat_per_byte"]._options = None - _CLOSECHANNELREQUEST.fields_by_name[ - "sat_per_byte" - ]._serialized_options = b"\030\001" + _CLOSECHANNELREQUEST.fields_by_name["sat_per_byte"]._serialized_options = ( + b"\030\001" + ) _OPENCHANNELREQUEST.fields_by_name["node_pubkey_string"]._options = None - _OPENCHANNELREQUEST.fields_by_name[ - "node_pubkey_string" - ]._serialized_options = b"\030\001" + _OPENCHANNELREQUEST.fields_by_name["node_pubkey_string"]._serialized_options = ( + b"\030\001" + ) _OPENCHANNELREQUEST.fields_by_name["sat_per_byte"]._options = None _OPENCHANNELREQUEST.fields_by_name["sat_per_byte"]._serialized_options = b"\030\001" _PENDINGCHANNELSRESPONSE.fields_by_name["pending_closing_channels"]._options = None @@ -94,13 +94,13 @@ if _descriptor._USE_C_DESCRIPTORS == False: _QUERYROUTESREQUEST_DESTCUSTOMRECORDSENTRY._options = None _QUERYROUTESREQUEST_DESTCUSTOMRECORDSENTRY._serialized_options = b"8\001" _QUERYROUTESREQUEST.fields_by_name["ignored_edges"]._options = None - _QUERYROUTESREQUEST.fields_by_name[ - "ignored_edges" - ]._serialized_options = b"\030\001" + _QUERYROUTESREQUEST.fields_by_name["ignored_edges"]._serialized_options = ( + b"\030\001" + ) _QUERYROUTESREQUEST.fields_by_name["outgoing_chan_id"]._options = None - _QUERYROUTESREQUEST.fields_by_name[ - "outgoing_chan_id" - ]._serialized_options = b"0\001" + _QUERYROUTESREQUEST.fields_by_name["outgoing_chan_id"]._serialized_options = ( + b"0\001" + ) _EDGELOCATOR.fields_by_name["channel_id"]._options = None _EDGELOCATOR.fields_by_name["channel_id"]._serialized_options = b"0\001" _HOP_CUSTOMRECORDSENTRY._options = None diff --git a/app/lightning/impl/protos/lnd/router_pb2.py b/app/lightning/impl/protos/lnd/router_pb2.py index dd6f754..67e6f5b 100644 --- a/app/lightning/impl/protos/lnd/router_pb2.py +++ b/app/lightning/impl/protos/lnd/router_pb2.py @@ -28,9 +28,9 @@ if _descriptor._USE_C_DESCRIPTORS == False: _SENDPAYMENTREQUEST_DESTCUSTOMRECORDSENTRY._options = None _SENDPAYMENTREQUEST_DESTCUSTOMRECORDSENTRY._serialized_options = b"8\001" _SENDPAYMENTREQUEST.fields_by_name["outgoing_chan_id"]._options = None - _SENDPAYMENTREQUEST.fields_by_name[ - "outgoing_chan_id" - ]._serialized_options = b"\030\0010\001" + _SENDPAYMENTREQUEST.fields_by_name["outgoing_chan_id"]._serialized_options = ( + b"\030\0010\001" + ) _BUILDROUTEREQUEST.fields_by_name["outgoing_chan_id"]._options = None _BUILDROUTEREQUEST.fields_by_name["outgoing_chan_id"]._serialized_options = b"0\001" _FORWARDHTLCINTERCEPTREQUEST_CUSTOMRECORDSENTRY._options = None diff --git a/app/lightning/models.py b/app/lightning/models.py index d4730fb..951511d 100644 --- a/app/lightning/models.py +++ b/app/lightning/models.py @@ -716,12 +716,16 @@ class Invoice(BaseModel): settle_date=i["paid_at"] if "paid_at" in i else None, payment_request=i["bolt11"], settle_index=i["pay_index"] if "pay_index" in i else None, - amt_paid_sat=parse_cln_msat(i["amount_received_msat"]) / 1000 - if "amount_received_msat" in i - else None, - amt_paid_msat=parse_cln_msat(i["amount_received_msat"]) - if "amount_received_msat" in i - else None, + amt_paid_sat=( + parse_cln_msat(i["amount_received_msat"]) / 1000 + if "amount_received_msat" in i + else None + ), + amt_paid_msat=( + parse_cln_msat(i["amount_received_msat"]) + if "amount_received_msat" in i + else None + ), state=InvoiceState.from_cln_json(i["status"]), ) @@ -1756,9 +1760,9 @@ class PaymentRequest(BaseModel): timestamp=r["created_at"], expiry=0 if "expiry" not in r else r["expiry"], description="" if "description" not in r else r["description"], - description_hash="" - if "description_hash" not in r - else r["description_hash"], + description_hash=( + "" if "description_hash" not in r else r["description_hash"] + ), fallback_addr="" if "fallbacks" not in r else r["fallbacks"][0], cltv_expiry=r["min_final_cltv_expiry"], route_hints=routes, @@ -2099,8 +2103,10 @@ class GenericTx(BaseModel): time_stamp=payment.created_at, amount=-payment.amount_msat.msat if amount is None else -amount, status=status, - total_fees=payment.amount_sent_msat.msat - payment.amount_msat.msat - if fees is None - else fees, + total_fees=( + payment.amount_sent_msat.msat - payment.amount_msat.msat + if fees is None + else fees + ), comment=comment, ) diff --git a/app/system/impl/raspiblitz.py b/app/system/impl/raspiblitz.py index 8c9aa95..67667af 100644 --- a/app/system/impl/raspiblitz.py +++ b/app/system/impl/raspiblitz.py @@ -350,9 +350,9 @@ class RaspiBlitzSystem(SystemBase): "partition_total_bytes": total, "partition_used_bytes": total - free, "partition_free_bytes": free, - "partition_percent": 0 - if total == 0 - else round((100 / total) * free, 2), + "partition_percent": ( + 0 if total == 0 else round((100 / total) * free, 2) + ), } ]