aiolabs/lnbits
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

Queens English

Browse source
This commit is contained in:
ben 2022-08-01 10:19:07 +01:00
parent f7a675962a
commit cf85018f9d
1 changed files with 34 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

30
lnbits/wallets/cliche.py
View file

@ -60,18 +60,22 @@ class ClicheWallet(Wallet):
checking_id = None checking_id = None
payment_request = None payment_request = None
error_message = None error_message = None
try:
if data.get("error") is not None and data["error"].get("message"): if data.get("error") is not None and data["error"].get("message"):
logger.error(data["error"]["message"]) logger.error(data["error"]["message"])
error_message = data["error"]["message"] error_message = data["error"]["message"]
return InvoiceResponse( return InvoiceResponse(
False, checking_id, payment_request, error_message False, checking_id, payment_request, error_message
) )
except:
if data.get("result") is not None:
checking_id, payment_request = ( checking_id, payment_request = (
data["result"]["payment_hash"], data["result"]["payment_hash"],
data["result"]["invoice"], data["result"]["invoice"],
) )
else:
return InvoiceResponse(False, checking_id, payment_request, "Could not get payment hash")
return InvoiceResponse(True, checking_id, payment_request, error_message) return InvoiceResponse(True, checking_id, payment_request, error_message)
async def pay_invoice(self, bolt11: str, fee_limit_msat: int) -> PaymentResponse: async def pay_invoice(self, bolt11: str, fee_limit_msat: int) -> PaymentResponse:
@ -81,13 +85,17 @@ class ClicheWallet(Wallet):
data = json.loads(r) data = json.loads(r)
checking_id = None checking_id = None
error_message = None error_message = None
try:
if data["error"]["message"]: if data.get("error") is not None and data["error"].get("message"):
logger.error(data["error"]["message"]) logger.error(data["error"]["message"])
error_message = data["error"]["message"] error_message = data["error"]["message"]
return PaymentResponse(False, None, 0, error_message) return PaymentResponse(False, None, 0, error_message)
except:
if data.get("result") is not None and data["result"].get("payment_hash"):
checking_id = data["result"]["payment_hash"] checking_id = data["result"]["payment_hash"]
else:
return PaymentResponse(False, checking_id, 0, "Could not get payment hash")
return PaymentResponse(True, checking_id, 0, error_message) return PaymentResponse(True, checking_id, 0, error_message)
async def get_invoice_status(self, checking_id: str) -> PaymentStatus: async def get_invoice_status(self, checking_id: str) -> PaymentStatus:
@ -95,11 +103,11 @@ class ClicheWallet(Wallet):
ws.send(f"check-payment --hash {checking_id}") ws.send(f"check-payment --hash {checking_id}")
r = ws.recv() r = ws.recv()
data = json.loads(r) data = json.loads(r)
try:
if data["error"]["message"]: if data.get("error") is not None and data["error"].get("message"):
logger.error(data["error"]["message"]) logger.error(data["error"]["message"])
return PaymentStatus(None) return PaymentStatus(None)
except:
statuses = {"pending": None, "complete": True, "failed": False} statuses = {"pending": None, "complete": True, "failed": False}
return PaymentStatus(statuses[data["result"]["status"]]) return PaymentStatus(statuses[data["result"]["status"]])
@ -108,11 +116,11 @@ class ClicheWallet(Wallet):
ws.send(f"check-payment --hash {checking_id}") ws.send(f"check-payment --hash {checking_id}")
r = ws.recv() r = ws.recv()
data = json.loads(r) data = json.loads(r)
try:
if data["error"]["message"]: if data.get("error") is not None and data["error"].get("message"):
logger.error(data["error"]["message"]) logger.error(data["error"]["message"])
return PaymentStatus(None) return PaymentStatus(None)
except:
statuses = {"pending": None, "complete": True, "failed": False} statuses = {"pending": None, "complete": True, "failed": False}
return PaymentStatus(statuses[data["result"]["status"]]) return PaymentStatus(statuses[data["result"]["status"]])