From 063d01bbe7cf6111a2066deb5d569edb83d45d50 Mon Sep 17 00:00:00 2001 From: callebtc <93376500+callebtc@users.noreply.github.com> Date: Wed, 5 Oct 2022 20:08:45 +0200 Subject: [PATCH] black and isort --- .github/workflows/formatting.yml | 2 +- cashu/core/helpers.py | 3 +-- cashu/core/script.py | 11 +++++++---- cashu/lightning/lnbits.py | 9 +++++++-- cashu/mint/ledger.py | 11 ++++++++--- cashu/mint/router.py | 13 ++++++++++--- cashu/wallet/cli.py | 3 +-- cashu/wallet/wallet.py | 33 +++++++++++++++++++++++--------- 8 files changed, 59 insertions(+), 26 deletions(-) diff --git a/.github/workflows/formatting.yml b/.github/workflows/formatting.yml index 9cccd39..b913e54 100644 --- a/.github/workflows/formatting.yml +++ b/.github/workflows/formatting.yml @@ -28,4 +28,4 @@ jobs: - name: Check black run: poetry run black --check . - name: Check isort - run: poetry run isort --check-only . + run: poetry run isort --profile black --check-only . diff --git a/cashu/core/helpers.py b/cashu/core/helpers.py index 680e773..0f8c885 100644 --- a/cashu/core/helpers.py +++ b/cashu/core/helpers.py @@ -1,8 +1,7 @@ import asyncio from functools import partial, wraps -from cashu.core.settings import (LIGHTNING_FEE_PERCENT, - LIGHTNING_RESERVE_FEE_MIN) +from cashu.core.settings import LIGHTNING_FEE_PERCENT, LIGHTNING_RESERVE_FEE_MIN def async_wrap(func): diff --git a/cashu/core/script.py b/cashu/core/script.py index ea2012d..6961cef 100644 --- a/cashu/core/script.py +++ b/cashu/core/script.py @@ -6,12 +6,15 @@ COIN = 100_000_000 TXID = "bff785da9f8169f49be92fa95e31f0890c385bfb1bd24d6b94d7900057c617ae" SEED = b"__not__used" -from bitcoin.core import (CMutableTxIn, CMutableTxOut, COutPoint, CTransaction, - lx) +from bitcoin.core import CMutableTxIn, CMutableTxOut, COutPoint, CTransaction, lx from bitcoin.core.script import * from bitcoin.core.script import CScript -from bitcoin.core.scripteval import (SCRIPT_VERIFY_P2SH, EvalScriptError, - VerifyScript, VerifyScriptError) +from bitcoin.core.scripteval import ( + SCRIPT_VERIFY_P2SH, + EvalScriptError, + VerifyScript, + VerifyScriptError, +) from bitcoin.wallet import CBitcoinSecret, P2SHBitcoinAddress diff --git a/cashu/lightning/lnbits.py b/cashu/lightning/lnbits.py index 5a5a6de..f174f2d 100644 --- a/cashu/lightning/lnbits.py +++ b/cashu/lightning/lnbits.py @@ -8,8 +8,13 @@ import requests from cashu.core.settings import LNBITS_ENDPOINT, LNBITS_KEY -from .base import (InvoiceResponse, PaymentResponse, PaymentStatus, - StatusResponse, Wallet) +from .base import ( + InvoiceResponse, + PaymentResponse, + PaymentStatus, + StatusResponse, + Wallet, +) class LNbitsWallet(Wallet): diff --git a/cashu/mint/ledger.py b/cashu/mint/ledger.py index 5813fd0..12c610d 100644 --- a/cashu/mint/ledger.py +++ b/cashu/mint/ledger.py @@ -16,9 +16,14 @@ from cashu.core.secp import PrivateKey, PublicKey from cashu.core.settings import LIGHTNING, MAX_ORDER from cashu.core.split import amount_split from cashu.lightning import WALLET -from cashu.mint.crud import (get_lightning_invoice, get_proofs_used, - invalidate_proof, store_lightning_invoice, - store_promise, update_lightning_invoice) +from cashu.mint.crud import ( + get_lightning_invoice, + get_proofs_used, + invalidate_proof, + store_lightning_invoice, + store_promise, + update_lightning_invoice, +) class Ledger: diff --git a/cashu/mint/router.py b/cashu/mint/router.py index cd2310b..ad70992 100644 --- a/cashu/mint/router.py +++ b/cashu/mint/router.py @@ -3,9 +3,16 @@ from typing import Union from fastapi import APIRouter from secp256k1 import PublicKey -from cashu.core.base import (CashuError, CheckRequest, GetMeltResponse, - GetMintResponse, MeltRequest, MintRequest, - PostSplitResponse, SplitRequest) +from cashu.core.base import ( + CashuError, + CheckRequest, + GetMeltResponse, + GetMintResponse, + MeltRequest, + MintRequest, + PostSplitResponse, + SplitRequest, +) from cashu.mint import ledger router: APIRouter = APIRouter() diff --git a/cashu/wallet/cli.py b/cashu/wallet/cli.py index 40ffb47..84a9a92 100755 --- a/cashu/wallet/cli.py +++ b/cashu/wallet/cli.py @@ -20,8 +20,7 @@ from cashu.core.base import Proof from cashu.core.bolt11 import Invoice from cashu.core.helpers import fee_reserve from cashu.core.migrations import migrate_databases -from cashu.core.settings import (CASHU_DIR, DEBUG, ENV_FILE, LIGHTNING, - MINT_URL, VERSION) +from cashu.core.settings import CASHU_DIR, DEBUG, ENV_FILE, LIGHTNING, MINT_URL, VERSION from cashu.wallet import migrations from cashu.wallet.crud import get_reserved_proofs, get_unused_locks from cashu.wallet.wallet import Wallet as Wallet diff --git a/cashu/wallet/wallet.py b/cashu/wallet/wallet.py index 1c41869..e7f97bb 100644 --- a/cashu/wallet/wallet.py +++ b/cashu/wallet/wallet.py @@ -8,19 +8,34 @@ import requests from loguru import logger import cashu.core.b_dhke as b_dhke -from cashu.core.base import (BlindedMessage, BlindedSignature, CheckRequest, - MeltRequest, MintRequest, P2SHScript, Proof, - SplitRequest) +from cashu.core.base import ( + BlindedMessage, + BlindedSignature, + CheckRequest, + MeltRequest, + MintRequest, + P2SHScript, + Proof, + SplitRequest, +) from cashu.core.db import Database -from cashu.core.script import (step0_carol_checksig_redeemscrip, - step0_carol_privkey, - step1_carol_create_p2sh_address, - step2_carol_sign_tx) +from cashu.core.script import ( + step0_carol_checksig_redeemscrip, + step0_carol_privkey, + step1_carol_create_p2sh_address, + step2_carol_sign_tx, +) from cashu.core.secp import PublicKey from cashu.core.settings import DEBUG from cashu.core.split import amount_split -from cashu.wallet.crud import (get_proofs, invalidate_proof, secret_used, - store_p2sh, store_proof, update_proof_reserved) +from cashu.wallet.crud import ( + get_proofs, + invalidate_proof, + secret_used, + store_p2sh, + store_proof, + update_proof_reserved, +) class LedgerAPI: