mirrors/lnbits-legend
1
0
Fork 0
mirror of https://github.com/lnbits/lnbits-legend.git synced 2025-03-10 09:19:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

increase readability by using f-strings (#1597)

Browse source 
* increase readability by using f-strings

* readd merge conflict stuff

---------

Co-authored-by: calle <93376500+callebtc@users.noreply.github.com>
This commit is contained in:
Pavol Rusnak 2023-04-03 15:34:17 +02:00 • committed by GitHub
parent 58c3b05e29
commit 689c443d72
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 33 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lnbits/bolt11.py
View file

@ -171,7 +171,7 @@ def lnencode(addr, privkey):
else:
amount = addr.currency if addr.currency else ""
hrp = "ln" + amount + "0n"
hrp = f"ln{amount}0n"
# Start with the timestamp
data = bitstring.pack("uint:35", addr.date)
@ -257,7 +257,7 @@ class LnAddr:
def __str__(self):
pubkey = bytes.hex(self.pubkey.serialize()).decode()
tags = ", ".join([k + "=" + str(v) for k, v in self.tags])
tags = ", ".join([f"{k}={v}" for k, v in self.tags])
return f"LnAddr[{pubkey}, amount={self.amount}{self.currency} tags=[{tags}]]"

2
lnbits/core/migrations.py
View file

@ -107,7 +107,7 @@ async def m002_add_fields_to_apipayments(db):
continue
for ext in ["withdraw", "events", "lnticket", "paywall", "tpos"]:
prefix = "#" + ext + " "
prefix = f"#{ext} "
if row["memo"].startswith(prefix):
new = row["memo"][len(prefix) :]
await db.execute(

2
lnbits/core/views/api.py
View file

@ -570,7 +570,7 @@ async def api_lnurlscan(code: str, wallet: WalletTypeInfo = Depends(get_key_type
if k == "text/plain":
params.update(description=v)
if k in ("image/jpeg;base64", "image/png;base64"):
data_uri = "data:" + k + "," + v
data_uri = f"data:{k},{v}"
params.update(image=data_uri)
if k in ("text/email", "text/identifier"):
params.update(targetUser=v)

4
lnbits/core/views/generic.py
View file

@ -369,7 +369,7 @@ async def manifest(usr: str):
"sizes": "900x900",
}
],
"start_url": "/wallet?usr=" + usr + "&wal=" + user.wallets[0].id,
"start_url": f"/wallet?usr={usr}&wal={user.wallets[0].id}",
"background_color": "#1F2234",
"description": "Bitcoin Lightning Wallet",
"display": "standalone",
@ -380,7 +380,7 @@ async def manifest(usr: str):
"name": wallet.name,
"short_name": wallet.name,
"description": wallet.name,
"url": "/wallet?usr=" + usr + "&wal=" + wallet.id,
"url": f"/wallet?usr={usr}&wal={wallet.id}",
}
for wallet in user.wallets
],

2
lnbits/extension_manager.py
View file

@ -520,7 +520,7 @@ async def fetch_github_releases(org: str, repo: str) -> List[GitHubRepoRelease]:
async def gihub_api_get(url: str, error_msg: Optional[str]) -> Any:
async with httpx.AsyncClient() as client:
headers = (
{"Authorization": "Bearer " + settings.lnbits_ext_github_token}
{"Authorization": f"Bearer {settings.lnbits_ext_github_token}"}
if settings.lnbits_ext_github_token
else None
)

2
lnbits/wallets/lndrest.py
View file

@ -26,7 +26,7 @@ class LndRestWallet(Wallet):
endpoint = settings.lnd_rest_endpoint
endpoint = endpoint[:-1] if endpoint.endswith("/") else endpoint
endpoint = (
"https://" + endpoint if not endpoint.startswith("http") else endpoint
f"https://{endpoint}" if not endpoint.startswith("http") else endpoint
)
self.endpoint = endpoint

2
lnbits/wallets/spark.py
View file

@ -60,7 +60,7 @@ class SparkWallet(Wallet):
httpx.HTTPError,
httpx.TimeoutException,
) as exc:
raise UnknownError("error connecting to spark: " + str(exc))
raise UnknownError(f"error connecting to spark: {exc}")
try:
data = r.json()

70
tests/core/views/test_generic.py
View file

@ -4,27 +4,22 @@ import pytest
@pytest.mark.asyncio
async def test_core_views_generic(client):
response = await client.get("/")
assert response.status_code == 200, (
str(response.url) + " " + str(response.status_code)
)
assert response.status_code == 200, f"{response.url} {response.status_code}"
# check GET /wallet: wallet info
@pytest.mark.asyncio
async def test_get_wallet(client):
response = await client.get("wallet")
assert response.status_code == 307, ( # redirect not modified
str(response.url) + " " + str(response.status_code)
)
# redirect not modified
assert response.status_code == 307, f"{response.url} {response.status_code}"
# check GET /wallet: do not allow redirects, expect code 307
@pytest.mark.asyncio
async def test_get_wallet_no_redirect(client):
response = await client.get("wallet", follow_redirects=False)
assert response.status_code == 307, (
str(response.url) + " " + str(response.status_code)
)
assert response.status_code == 307, f"{response.url} {response.status_code}"
# determine the next redirect location
request = client.build_request("GET", "wallet")
@ -33,13 +28,11 @@ async def test_get_wallet_no_redirect(client):
response = await client.send(request)
request = response.next_request
if i == 0:
assert response.status_code == 307, ( # first redirect
str(response.url) + " " + str(response.status_code)
)
# first redirect
assert response.status_code == 307, f"{response.url} {response.status_code}"
elif i == 1:
assert response.status_code == 200, ( # then get the actual page
str(response.url) + " " + str(response.status_code)
)
# then get the actual page
assert response.status_code == 200, f"{response.url} {response.status_code}"
i += 1
@ -47,18 +40,14 @@ async def test_get_wallet_no_redirect(client):
@pytest.mark.asyncio
async def test_get_wallet_with_nonexistent_user(client):
response = await client.get("wallet", params={"usr": "1"})
assert response.status_code == 400, (
str(response.url) + " " + str(response.status_code)
)
assert response.status_code == 400, f"{response.url} {response.status_code}"
# check GET /wallet: with user
@pytest.mark.asyncio
async def test_get_wallet_with_user(client, to_user):
response = await client.get("wallet", params={"usr": to_user.id})
assert response.status_code == 307, (
str(response.url) + " " + str(response.status_code)
)
assert response.status_code == 307, f"{response.url} {response.status_code}"
# determine the next redirect location
request = client.build_request("GET", "wallet", params={"usr": to_user.id})
@ -67,13 +56,11 @@ async def test_get_wallet_with_user(client, to_user):
response = await client.send(request)
request = response.next_request
if i == 0:
assert response.status_code == 307, ( # first redirect
str(response.url) + " " + str(response.status_code)
)
# first redirect
assert response.status_code == 307, f"{response.url} {response.status_code}"
elif i == 1:
assert response.status_code == 200, ( # then get the actual page
str(response.url) + " " + str(response.status_code)
)
# then get the actual page
assert response.status_code == 200, f"{response.url} {response.status_code}"
i += 1
@ -83,45 +70,36 @@ async def test_get_wallet_with_user_and_wallet(client, to_user, to_wallet):
response = await client.get(
"wallet", params={"usr": to_user.id, "wal": to_wallet.id}
)
assert response.status_code == 200, (
str(response.url) + " " + str(response.status_code)
)
assert response.status_code == 200, f"{response.url} {response.status_code}"
# check GET /wallet: wrong wallet and user, expect 400
@pytest.mark.asyncio
async def test_get_wallet_with_user_and_wrong_wallet(client, to_user):
response = await client.get("wallet", params={"usr": to_user.id, "wal": "1"})
assert response.status_code == 400, (
str(response.url) + " " + str(response.status_code)
)
assert response.status_code == 400, f"{response.url} {response.status_code}"
# check GET /extensions: extensions list
@pytest.mark.asyncio
async def test_get_extensions(client, to_user):
response = await client.get("extensions", params={"usr": to_user.id})
assert response.status_code == 200, (
str(response.url) + " " + str(response.status_code)
)
assert response.status_code == 200, f"{response.url} {response.status_code}"
# check GET /extensions: extensions list wrong user, expect 400
@pytest.mark.asyncio
async def test_get_extensions_wrong_user(client, to_user):
response = await client.get("extensions", params={"usr": "1"})
assert response.status_code == 400, (
str(response.url) + " " + str(response.status_code)
)
assert response.status_code == 400, f"{response.url} {response.status_code}"
# check GET /extensions: no user given, expect code 400 bad request
@pytest.mark.asyncio
async def test_get_extensions_no_user(client):
response = await client.get("extensions")
assert response.status_code == 400, ( # bad request
str(response.url) + " " + str(response.status_code)
)
# bad request
assert response.status_code == 400, f"{response.url} {response.status_code}"
# check GET /extensions: enable extension
@ -132,7 +110,7 @@ async def test_get_extensions_no_user(client):
# "extensions", params={"usr": to_user.id, "enable": "lnurlp"}
# )
# assert response.status_code == 200, (
# str(response.url) + " " + str(response.status_code)
# f"{response.url} {response.status_code}"
# )
@ -144,7 +122,7 @@ async def test_get_extensions_no_user(client):
# params={"usr": to_user.id, "enable": "lnurlp", "disable": "lnurlp"},
# )
# assert response.status_code == 400, (
# str(response.url) + " " + str(response.status_code)
# f"{response.url} {response.status_code}"
# )
@ -154,6 +132,4 @@ async def test_get_extensions_enable_nonexistent_extension(client, to_user):
response = await client.get(
"extensions", params={"usr": to_user.id, "enable": "12341234"}
)
assert response.status_code == 400, (
str(response.url) + " " + str(response.status_code)
)
assert response.status_code == 400, f"{response.url} {response.status_code}"

2
tools/build.py
View file

@ -27,7 +27,7 @@ vendored_css = [
def url_for_vendored(abspath: str) -> str:
return "/" + os.path.relpath(abspath, LNBITS_PATH)
return f"/{os.path.relpath(abspath, LNBITS_PATH)}"
def transpile_scss():