From 149d69f99dfdf547d286e11de2dbd1f277f410dc Mon Sep 17 00:00:00 2001 From: callebtc <93376500+callebtc@users.noreply.github.com> Date: Wed, 5 Oct 2022 20:03:04 +0200 Subject: [PATCH] isort --- cashu/core/script.py | 11 ++++------- cashu/core/settings.py | 1 + cashu/mint/ledger.py | 11 +++-------- cashu/mint/router.py | 13 +++---------- cashu/wallet/cli.py | 5 +++-- cashu/wallet/crud.py | 4 ++-- cashu/wallet/wallet.py | 33 +++++++++------------------------ tests/test_wallet.py | 1 + 8 files changed, 26 insertions(+), 53 deletions(-) diff --git a/cashu/core/script.py b/cashu/core/script.py index 6961cef..ea2012d 100644 --- a/cashu/core/script.py +++ b/cashu/core/script.py @@ -6,15 +6,12 @@ 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/core/settings.py b/cashu/core/settings.py index a0a4638..16d83b0 100644 --- a/cashu/core/settings.py +++ b/cashu/core/settings.py @@ -1,6 +1,7 @@ import os import sys from pathlib import Path + from environs import Env # type: ignore from loguru import logger diff --git a/cashu/mint/ledger.py b/cashu/mint/ledger.py index 12c610d..5813fd0 100644 --- a/cashu/mint/ledger.py +++ b/cashu/mint/ledger.py @@ -16,14 +16,9 @@ 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 3184b4c..cd2310b 100644 --- a/cashu/mint/router.py +++ b/cashu/mint/router.py @@ -3,16 +3,9 @@ from typing import Union from fastapi import APIRouter from secp256k1 import PublicKey -from cashu.core.base import ( - CashuError, - CheckRequest, - MeltRequest, - MintRequest, - SplitRequest, - GetMintResponse, - GetMeltResponse, - PostSplitResponse, -) +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 916f9ad..40ffb47 100755 --- a/cashu/wallet/cli.py +++ b/cashu/wallet/cli.py @@ -6,8 +6,8 @@ import json import math import os import sys -from datetime import datetime import time +from datetime import datetime from functools import wraps from itertools import groupby from operator import itemgetter @@ -20,7 +20,8 @@ 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, LIGHTNING, MINT_URL, VERSION, ENV_FILE +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/crud.py b/cashu/wallet/crud.py index bacb968..da29451 100644 --- a/cashu/wallet/crud.py +++ b/cashu/wallet/crud.py @@ -1,7 +1,7 @@ import time -from typing import Optional, List, Any +from typing import Any, List, Optional -from cashu.core.base import Proof, P2SHScript +from cashu.core.base import P2SHScript, Proof from cashu.core.db import Connection, Database diff --git a/cashu/wallet/wallet.py b/cashu/wallet/wallet.py index 744c1e0..1c41869 100644 --- a/cashu/wallet/wallet.py +++ b/cashu/wallet/wallet.py @@ -8,34 +8,19 @@ 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.script import ( - step0_carol_privkey, - step0_carol_checksig_redeemscrip, - step1_carol_create_p2sh_address, - step2_carol_sign_tx, -) +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.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_proof, - update_proof_reserved, - store_p2sh, -) +from cashu.wallet.crud import (get_proofs, invalidate_proof, secret_used, + store_p2sh, store_proof, update_proof_reserved) class LedgerAPI: diff --git a/tests/test_wallet.py b/tests/test_wallet.py index f0b20db..36bb3c5 100644 --- a/tests/test_wallet.py +++ b/tests/test_wallet.py @@ -1,5 +1,6 @@ import time from re import S + import pytest from cashu.core.helpers import async_unwrap