aljaz/nutshell
1
0
Fork 0
mirror of https://github.com/aljazceru/nutshell.git synced 2025-12-20 10:34:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

chore: run pyupgrade (#623)

Browse Source 
- use `{...}` instead of `set([...])`
- do not use `class Foo(object):`, just use `class Foo:`
- do not specify default flags (`"r"`) for `open()`
This commit is contained in:
Pavol Rusnak
2024-09-24 13:53:35 +02:00
committed by GitHub
parent 870d75b205
commit 25f0763f94
16 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cashu/core/base.py
View File

@@ -839,7 +839,7 @@ class TokenV3(Token):
@property
def keysets(self) -> List[str]:
return list(set([p.id for p in self.proofs]))
return list({p.id for p in self.proofs})
@property
def mint(self) -> str:
@@ -847,7 +847,7 @@ class TokenV3(Token):
@property
def mints(self) -> List[str]:
return list(set([t.mint for t in self.token if t.mint]))
return list({t.mint for t in self.token if t.mint})
@property
def memo(self) -> Optional[str]:
@@ -1037,7 +1037,7 @@ class TokenV4(Token):
@property
def keysets(self) -> List[str]:
return list(set([p.i.hex() for p in self.t]))
return list({p.i.hex() for p in self.t})
@classmethod
def from_tokenv3(cls, tokenv3: TokenV3):

2
cashu/core/helpers.py
View File

@@ -10,7 +10,7 @@ from ..core.settings import settings
def amount_summary(proofs: List[Proof], unit: Unit) -> str:
amounts_we_have = [
(amount, len([p for p in proofs if p.amount == amount]))
for amount in set([p.amount for p in proofs])
for amount in {p.amount for p in proofs}
]
amounts_we_have.sort(key=lambda x: x[0])
return (

2
cashu/lightning/blink.py
View File

@@ -46,7 +46,7 @@ class BlinkWallet(LightningBackend):
}
payment_statuses = {"SUCCESS": True, "PENDING": None, "FAILURE": False}
supported_units = set([Unit.sat, Unit.msat])
supported_units = {Unit.sat, Unit.msat}
supports_description: bool = True
unit = Unit.sat

4
cashu/lightning/clnrest.py
View File

@@ -27,7 +27,7 @@ from .base import (
class CLNRestWallet(LightningBackend):
supported_units = set([Unit.sat, Unit.msat])
supported_units = {Unit.sat, Unit.msat}
unit = Unit.sat
supports_mpp = settings.mint_clnrest_enable_mpp
supports_incoming_payment_stream: bool = True
@@ -41,7 +41,7 @@ class CLNRestWallet(LightningBackend):
raise Exception("missing rune for clnrest")
# load from file or use as is
if os.path.exists(rune_settings):
with open(rune_settings, "r") as f:
with open(rune_settings) as f:
rune = f.read()
rune = rune.strip()
else:

2
cashu/lightning/corelightningrest.py
View File

@@ -27,7 +27,7 @@ from .macaroon import load_macaroon
class CoreLightningRestWallet(LightningBackend):
supported_units = set([Unit.sat, Unit.msat])
supported_units = {Unit.sat, Unit.msat}
unit = Unit.sat
supports_incoming_payment_stream: bool = True
supports_description: bool = True

4
cashu/lightning/fake.py
View File

@@ -39,12 +39,12 @@ class FakeWallet(LightningBackend):
privkey: str = hashlib.pbkdf2_hmac(
"sha256",
secret.encode(),
("FakeWallet").encode(),
b"FakeWallet",
2048,
32,
).hex()
supported_units = set([Unit.sat, Unit.msat, Unit.usd, Unit.eur])
supported_units = {Unit.sat, Unit.msat, Unit.usd, Unit.eur}
unit = Unit.sat
supports_incoming_payment_stream: bool = True

2
cashu/lightning/lnbits.py
View File

@@ -25,7 +25,7 @@ from .base import (
class LNbitsWallet(LightningBackend):
"""https://github.com/lnbits/lnbits"""
supported_units = set([Unit.sat])
supported_units = {Unit.sat}
unit = Unit.sat
supports_incoming_payment_stream: bool = True
supports_description: bool = True

2
cashu/lightning/lnd_grpc/lnd_grpc.py
View File

@@ -49,7 +49,7 @@ INVOICE_STATUSES = {
class LndRPCWallet(LightningBackend):
supports_mpp = settings.mint_lnd_enable_mpp
supports_incoming_payment_stream = True
supported_units = set([Unit.sat, Unit.msat])
supported_units = {Unit.sat, Unit.msat}
supports_description: bool = True
unit = Unit.sat

2
cashu/lightning/lndrest.py
View File

@@ -32,7 +32,7 @@ class LndRestWallet(LightningBackend):
supports_mpp = settings.mint_lnd_enable_mpp
supports_incoming_payment_stream = True
supported_units = set([Unit.sat, Unit.msat])
supported_units = {Unit.sat, Unit.msat}
supports_description: bool = True
unit = Unit.sat

2
cashu/mint/conditions.py
View File

@@ -274,7 +274,7 @@ class LedgerSpendingConditions:
# all pubkeys and n_sigs must be the same
assert (
len(set([tuple(pubs_output) for pubs_output in pubkeys_per_proof])) == 1
len({tuple(pubs_output) for pubs_output in pubkeys_per_proof}) == 1
), "pubkeys in all proofs must match."
assert len(set(n_sigs_per_proof)) == 1, "n_sigs in all proofs must match."

2
cashu/mint/verification.py
View File

@@ -234,7 +234,7 @@ class LedgerVerification(
return units_proofs[0]
def get_fees_for_proofs(self, proofs: List[Proof]) -> int:
if not len(set([self.keysets[p.id].unit for p in proofs])) == 1:
if not len({self.keysets[p.id].unit for p in proofs}) == 1:
raise TransactionUnitError("inputs have different units.")
fee = (sum([self.keysets[p.id].input_fee_ppk for p in proofs]) + 999) // 1000
return fee

2
cashu/nostr/client/cbc.py
View File

@@ -11,7 +11,7 @@ key = bytes.fromhex("3aa925cb69eb613e2928f8a18279c78b1dca04541dfd064df2eda66b598
BLOCK_SIZE = 16
class AESCipher(object):
class AESCipher:
"""This class is compatible with crypto.createCipheriv('aes-256-cbc')"""
def __init__(self, key=None):

2
cashu/nostr/filter.py
View File

@@ -76,7 +76,7 @@ class Filter:
return False
if self.tags:
e_tag_identifiers = set([e_tag[0] for e_tag in event.tags])
e_tag_identifiers = {e_tag[0] for e_tag in event.tags}
for f_tag, f_tag_values in self.tags.items():
# Omit any NIP-01 or NIP-12 "#" chars on single-letter tags
f_tag = f_tag.replace("#", "")

2
cashu/tor/tor.py
View File

@@ -144,7 +144,7 @@ class TorProxy:
def read_pid(self):
if not os.path.isfile(self.pid_file):
return None
with open(self.pid_file, "r") as f:
with open(self.pid_file) as f:
pid = f.readlines()
# check if pid is valid
if len(pid) == 0 or not int(pid[0]) > 0:

8
cashu/wallet/proofs.py
View File

@@ -34,7 +34,7 @@ class WalletProofs(SupportsDb, SupportsKeysets):
self, proofs: List[Proof], unit: Optional[Unit] = None
) -> Dict[str, List[Proof]]:
ret: Dict[str, List[Proof]] = {}
keyset_ids = set([p.id for p in proofs])
keyset_ids = {p.id for p in proofs}
for id in keyset_ids:
if id is None:
continue
@@ -178,7 +178,7 @@ class WalletProofs(SupportsDb, SupportsKeysets):
if not keysets:
raise ValueError("No keysets found for proofs")
assert (
len(set([k.unit for k in keysets.values()])) == 1
len({k.unit for k in keysets.values()}) == 1
), "All keysets must have the same unit"
unit = keysets[list(keysets.keys())[0]].unit
@@ -216,14 +216,14 @@ class WalletProofs(SupportsDb, SupportsKeysets):
except KeyError:
raise ValueError("Keysets of proofs are not loaded in wallet")
# we make sure that all proofs are from keysets of the same mint
if len(set([k.mint_url for k in keysets])) > 1:
if len({k.mint_url for k in keysets}) > 1:
raise ValueError("TokenV4 can only contain proofs from a single mint URL")
mint_url = keysets[0].mint_url
if not mint_url:
raise ValueError("No mint URL found for keyset")
# we make sure that all keysets have the same unit
if len(set([k.unit for k in keysets])) > 1:
if len({k.unit for k in keysets}) > 1:
raise ValueError(
"TokenV4 can only contain proofs from keysets with the same unit"
)

2
cashu/wallet/v1_api.py
View File

@@ -99,7 +99,7 @@ def async_ensure_mint_loaded(func):
return wrapper
class LedgerAPI(LedgerAPIDeprecated, object):
class LedgerAPI(LedgerAPIDeprecated):
tor: TorProxy
db: Database # we need the db for melt_deprecated
httpx: httpx.AsyncClient