From fac578b9561c63d3f7dec9ace16ec00a1e934429 Mon Sep 17 00:00:00 2001 From: callebtc <93376500+callebtc@users.noreply.github.com> Date: Sat, 17 Sep 2022 16:13:11 +0300 Subject: [PATCH] isort --- core/b_dhke.py | 1 + core/helpers.py | 1 + core/migrations.py | 8 ++++---- lightning/lnbits.py | 9 ++------- mint/app.py | 3 +-- mint/ledger.py | 20 ++++++-------------- tests/test_wallet.py | 2 -- wallet/cashu.py | 10 +++++----- wallet/crud.py | 1 + wallet/wallet.py | 16 +++++----------- 10 files changed, 26 insertions(+), 45 deletions(-) diff --git a/core/b_dhke.py b/core/b_dhke.py index 8268131..e325c7a 100644 --- a/core/b_dhke.py +++ b/core/b_dhke.py @@ -26,6 +26,7 @@ If true, C must have originated from Alice """ import hashlib + from secp256k1 import PrivateKey, PublicKey diff --git a/core/helpers.py b/core/helpers.py index f6afeb5..75dab61 100644 --- a/core/helpers.py +++ b/core/helpers.py @@ -1,5 +1,6 @@ import asyncio from functools import partial, wraps + from core.settings import LIGHTNING_FEE_PERCENT, LIGHTNING_RESERVE_FEE_MIN diff --git a/core/migrations.py b/core/migrations.py index 747e42e..1133de6 100644 --- a/core/migrations.py +++ b/core/migrations.py @@ -1,9 +1,9 @@ -from loguru import logger -from core.db import Database -from core.db import COCKROACH, POSTGRES, SQLITE - import re +from loguru import logger + +from core.db import COCKROACH, POSTGRES, SQLITE, Database + async def migrate_databases(db: Database, migrations_module): """Creates the necessary databases if they don't exist already; or migrates them.""" diff --git a/lightning/lnbits.py b/lightning/lnbits.py index 5623b4f..94a49eb 100644 --- a/lightning/lnbits.py +++ b/lightning/lnbits.py @@ -8,13 +8,8 @@ import requests from 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/mint/app.py b/mint/app.py index 1a5b8e2..85add1b 100644 --- a/mint/app.py +++ b/mint/app.py @@ -7,11 +7,10 @@ import click import uvicorn from fastapi import FastAPI from loguru import logger - from secp256k1 import PublicKey import core.settings as settings -from core.base import MintPayloads, SplitPayload, MeltPayload, CheckPayload +from core.base import CheckPayload, MeltPayload, MintPayloads, SplitPayload from core.settings import MINT_PRIVATE_KEY, MINT_SERVER_HOST, MINT_SERVER_PORT from lightning import WALLET from mint.ledger import Ledger diff --git a/mint/ledger.py b/mint/ledger.py index 3c6f83e..bf47080 100644 --- a/mint/ledger.py +++ b/mint/ledger.py @@ -3,27 +3,19 @@ Implementation of https://gist.github.com/phyro/935badc682057f418842c72961cf096c """ import hashlib -from core.secp import PrivateKey, PublicKey - from typing import List, Set -from core.base import Proof, BlindedMessage, BlindedSignature import core.b_dhke as b_dhke -from core.base import Invoice +from core.base import BlindedMessage, BlindedSignature, Invoice, Proof from core.db import Database -from core.settings import MAX_ORDER, LIGHTNING from core.helpers import fee_reserve - +from core.secp import PrivateKey, PublicKey +from core.settings import LIGHTNING, MAX_ORDER from core.split import amount_split from lightning import WALLET -from mint.crud import ( - get_lightning_invoice, - get_proofs_used, - invalidate_proof, - store_lightning_invoice, - store_promise, - update_lightning_invoice, -) +from mint.crud import (get_lightning_invoice, get_proofs_used, + invalidate_proof, store_lightning_invoice, + store_promise, update_lightning_invoice) class Ledger: diff --git a/tests/test_wallet.py b/tests/test_wallet.py index c7cd235..9def85f 100644 --- a/tests/test_wallet.py +++ b/tests/test_wallet.py @@ -1,10 +1,8 @@ import asyncio from core.helpers import async_unwrap - from core.migrations import migrate_databases from wallet import migrations - from wallet.wallet import Wallet as Wallet1 from wallet.wallet import Wallet as Wallet2 diff --git a/wallet/cashu.py b/wallet/cashu.py index 7b0a69e..bf18f48 100755 --- a/wallet/cashu.py +++ b/wallet/cashu.py @@ -9,14 +9,14 @@ from functools import wraps import click from bech32 import bech32_decode, bech32_encode, convertbits -from core.settings import MINT_URL, LIGHTNING -from core.migrations import migrate_databases -from core.base import Proof -from core.helpers import fee_reserve import core.bolt11 as bolt11 +from core.base import Proof from core.bolt11 import Invoice -from wallet.wallet import Wallet as Wallet +from core.helpers import fee_reserve +from core.migrations import migrate_databases +from core.settings import LIGHTNING, MINT_URL from wallet import migrations +from wallet.wallet import Wallet as Wallet async def init_wallet(wallet: Wallet): diff --git a/wallet/crud.py b/wallet/crud.py index d76718f..edc234a 100644 --- a/wallet/crud.py +++ b/wallet/crud.py @@ -1,5 +1,6 @@ import secrets from typing import Optional + from core.base import Proof from core.db import Connection, Database diff --git a/wallet/wallet.py b/wallet/wallet.py index f546c36..4d1fd2d 100644 --- a/wallet/wallet.py +++ b/wallet/wallet.py @@ -2,21 +2,15 @@ import random from typing import List import requests -from core.secp import PublicKey import core.b_dhke as b_dhke -from core.base import ( - BlindedMessage, - MintPayloads, - Proof, - SplitPayload, - BlindedSignature, - CheckPayload, - MeltPayload, -) +from core.base import (BlindedMessage, BlindedSignature, CheckPayload, + MeltPayload, MintPayloads, Proof, SplitPayload) from core.db import Database +from core.secp import PublicKey from core.split import amount_split -from wallet.crud import get_proofs, invalidate_proof, store_proof, update_proof_reserved +from wallet.crud import (get_proofs, invalidate_proof, store_proof, + update_proof_reserved) class LedgerAPI: