Python/relative_import (#186)

* relative import all the things

* make format

* add __init__.py to cli/

* fix mypy errors

* get rid of more mypy

* mypy fix crud.py

* fix another mypy error
This commit is contained in:
calle
2023-05-01 22:39:23 +02:00
committed by GitHub
parent c9c8c1d12f
commit 89fb2787e6
21 changed files with 104 additions and 139 deletions

View File

@@ -1,9 +1,9 @@
import time
from typing import Any, List, Optional
from cashu.core.base import Invoice, MintKeyset, Proof
from cashu.core.db import Connection, Database
from cashu.core.migrations import table_with_schema
from ..core.base import Invoice, MintKeyset, Proof
from ..core.db import Connection, Database
from ..core.migrations import table_with_schema
class LedgerCrud:
@@ -14,48 +14,37 @@ class LedgerCrud:
"""
async def get_keyset(*args, **kwags):
return await get_keyset(*args, **kwags)
return await get_keyset(*args, **kwags) # type: ignore
async def get_lightning_invoice(*args, **kwags):
return await get_lightning_invoice(*args, **kwags)
return await get_lightning_invoice(*args, **kwags) # type: ignore
async def get_proofs_used(*args, **kwags):
return await get_proofs_used(*args, **kwags)
return await get_proofs_used(*args, **kwags) # type: ignore
async def invalidate_proof(*args, **kwags):
return await invalidate_proof(*args, **kwags)
return await invalidate_proof(*args, **kwags) # type: ignore
async def get_proofs_pending(*args, **kwags):
return await get_proofs_pending(*args, **kwags)
return await get_proofs_pending(*args, **kwags) # type: ignore
async def set_proof_pending(*args, **kwags):
return await set_proof_pending(*args, **kwags)
return await set_proof_pending(*args, **kwags) # type: ignore
async def unset_proof_pending(*args, **kwags):
return await unset_proof_pending(*args, **kwags)
return await unset_proof_pending(*args, **kwags) # type: ignore
async def store_keyset(*args, **kwags):
return await store_keyset(*args, **kwags)
return await store_keyset(*args, **kwags) # type: ignore
async def store_lightning_invoice(*args, **kwags):
return await store_lightning_invoice(*args, **kwags)
return await store_lightning_invoice(*args, **kwags) # type: ignore
async def store_promise(*args, **kwags):
return await store_promise(*args, **kwags)
return await store_promise(*args, **kwags) # type: ignore
async def update_lightning_invoice(*args, **kwags):
return await update_lightning_invoice(*args, **kwags)
return await update_lightning_invoice(*args, **kwags) # type: ignore
async def store_promise(
@@ -65,7 +54,6 @@ async def store_promise(
C_: str,
conn: Optional[Connection] = None,
):
await (conn or db).execute(
f"""
INSERT INTO {table_with_schema(db, 'promises')}
@@ -84,7 +72,6 @@ async def get_proofs_used(
db: Database,
conn: Optional[Connection] = None,
):
rows = await (conn or db).fetchall(
f"""
SELECT secret from {table_with_schema(db, 'proofs_used')}
@@ -98,7 +85,6 @@ async def invalidate_proof(
proof: Proof,
conn: Optional[Connection] = None,
):
# we add the proof and secret to the used list
await (conn or db).execute(
f"""
@@ -118,7 +104,6 @@ async def get_proofs_pending(
db: Database,
conn: Optional[Connection] = None,
):
rows = await (conn or db).fetchall(
f"""
SELECT * from {table_with_schema(db, 'proofs_pending')}
@@ -132,7 +117,6 @@ async def set_proof_pending(
proof: Proof,
conn: Optional[Connection] = None,
):
# we add the proof and secret to the used list
await (conn or db).execute(
f"""
@@ -153,7 +137,6 @@ async def unset_proof_pending(
db: Database,
conn: Optional[Connection] = None,
):
await (conn or db).execute(
f"""
DELETE FROM {table_with_schema(db, 'proofs_pending')}
@@ -168,7 +151,6 @@ async def store_lightning_invoice(
invoice: Invoice,
conn: Optional[Connection] = None,
):
await (conn or db).execute(
f"""
INSERT INTO {table_with_schema(db, 'invoices')}
@@ -189,7 +171,6 @@ async def get_lightning_invoice(
hash: str,
conn: Optional[Connection] = None,
):
row = await (conn or db).fetchone(
f"""
SELECT * from {table_with_schema(db, 'invoices')}
@@ -220,7 +201,6 @@ async def store_keyset(
keyset: MintKeyset,
conn: Optional[Connection] = None,
):
await (conn or db).execute( # type: ignore
f"""
INSERT INTO {table_with_schema(db, 'keysets')}
@@ -241,7 +221,7 @@ async def store_keyset(
async def get_keyset(
db: Database,
id: str = None,
id: str = "",
derivation_path: str = "",
conn: Optional[Connection] = None,
):