From 6f913e3cc92367a2ad7ded7e058bbef79b99d17d Mon Sep 17 00:00:00 2001 From: callebtc <93376500+callebtc@users.noreply.github.com> Date: Sat, 15 Oct 2022 00:59:21 +0200 Subject: [PATCH] make format --- cashu/core/crypto.py | 1 - cashu/mint/app.py | 6 +++--- cashu/mint/ledger.py | 4 ++-- cashu/mint/router.py | 1 - cashu/mint/startup.py | 11 ++++------- tests/test_mint.py | 12 ++++++------ tests/test_wallet.py | 2 +- 7 files changed, 16 insertions(+), 21 deletions(-) diff --git a/cashu/core/crypto.py b/cashu/core/crypto.py index 3524281..a3e0500 100644 --- a/cashu/core/crypto.py +++ b/cashu/core/crypto.py @@ -5,7 +5,6 @@ from typing import Dict, List from cashu.core.secp import PrivateKey, PublicKey from cashu.core.settings import MAX_ORDER - # entropy = bytes([random.getrandbits(8) for i in range(16)]) # mnemonic = bip39.mnemonic_from_bytes(entropy) # seed = bip39.mnemonic_to_seed(mnemonic) diff --git a/cashu/mint/app.py b/cashu/mint/app.py index 675ba97..a0c572e 100644 --- a/cashu/mint/app.py +++ b/cashu/mint/app.py @@ -6,14 +6,14 @@ from loguru import logger from starlette.middleware import Middleware from starlette.middleware.base import BaseHTTPMiddleware -# from starlette_context import context -# from starlette_context.middleware import RawContextMiddleware - from cashu.core.settings import DEBUG, VERSION from .router import router from .startup import start_mint_init +# from starlette_context import context +# from starlette_context.middleware import RawContextMiddleware + # class CustomHeaderMiddleware(BaseHTTPMiddleware): # """ diff --git a/cashu/mint/ledger.py b/cashu/mint/ledger.py index 38a6ba2..794d193 100644 --- a/cashu/mint/ledger.py +++ b/cashu/mint/ledger.py @@ -7,8 +7,6 @@ from typing import Dict, List, Set from loguru import logger -# from starlette_context import context - import cashu.core.b_dhke as b_dhke import cashu.core.bolt11 as bolt11 import cashu.core.legacy as legacy @@ -28,6 +26,8 @@ from cashu.core.settings import LIGHTNING, MAX_ORDER, VERSION from cashu.core.split import amount_split from cashu.mint.crud import LedgerCrud +# from starlette_context import context + class Ledger: def __init__( diff --git a/cashu/mint/router.py b/cashu/mint/router.py index b846ae4..db18cee 100644 --- a/cashu/mint/router.py +++ b/cashu/mint/router.py @@ -16,7 +16,6 @@ from cashu.core.base import ( SplitRequest, ) from cashu.core.errors import CashuError - from cashu.mint.startup import ledger router: APIRouter = APIRouter() diff --git a/cashu/mint/startup.py b/cashu/mint/startup.py index 762533c..a006e07 100644 --- a/cashu/mint/startup.py +++ b/cashu/mint/startup.py @@ -5,15 +5,12 @@ import asyncio from loguru import logger -from cashu.core.migrations import migrate_databases -from cashu.core.settings import CASHU_DIR, LIGHTNING - -from cashu.mint import migrations - -from cashu.mint.ledger import Ledger -from cashu.core.settings import MINT_PRIVATE_KEY from cashu.core.db import Database +from cashu.core.migrations import migrate_databases +from cashu.core.settings import CASHU_DIR, LIGHTNING, MINT_PRIVATE_KEY from cashu.lightning.lnbits import LNbitsWallet +from cashu.mint import migrations +from cashu.mint.ledger import Ledger ledger = Ledger( db=Database("mint", "data/mint"), diff --git a/tests/test_mint.py b/tests/test_mint.py index 620bade..ad5713b 100644 --- a/tests/test_mint.py +++ b/tests/test_mint.py @@ -10,14 +10,14 @@ from cashu.core.migrations import migrate_databases SERVER_ENDPOINT = "http://localhost:3338" -from cashu.mint import migrations - -from cashu.mint.ledger import Ledger -from cashu.core.settings import MINT_PRIVATE_KEY, MAX_ORDER -from cashu.core.db import Database -from cashu.lightning.lnbits import LNbitsWallet import os +from cashu.core.db import Database +from cashu.core.settings import MAX_ORDER, MINT_PRIVATE_KEY +from cashu.lightning.lnbits import LNbitsWallet +from cashu.mint import migrations +from cashu.mint.ledger import Ledger + async def assert_err(f, msg): """Compute f() and expect an error message 'msg'.""" diff --git a/tests/test_wallet.py b/tests/test_wallet.py index 7f5706b..bcccebe 100644 --- a/tests/test_wallet.py +++ b/tests/test_wallet.py @@ -7,11 +7,11 @@ import pytest_asyncio from cashu.core.base import Proof from cashu.core.helpers import async_unwrap, sum_proofs from cashu.core.migrations import migrate_databases +from cashu.core.settings import MAX_ORDER from cashu.wallet import migrations from cashu.wallet.wallet import Wallet from cashu.wallet.wallet import Wallet as Wallet1 from cashu.wallet.wallet import Wallet as Wallet2 -from cashu.core.settings import MAX_ORDER SERVER_ENDPOINT = "http://localhost:3338"