GlcoinCore/blitz_api
1
0
Fork 0
mirror of https://github.com/fusion44/blitz_api.git synced 2026-08-17 12:26:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: code changes for pydantic 2.4

Browse source
This commit is contained in:
fusion44 2024-03-10 07:57:38 +01:00
parent c72f78a0be
commit 62d3f3da9b
No known key found for this signature in database
5 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/bitcoind/service.py
View file

@ -213,7 +213,7 @@ async def _handle_gather_bitcoin_status():
if last_info != info:
# only send data if anything has changed
await broadcast_sse_msg(SSE.BTC_INFO, info.dict())
await broadcast_sse_msg(SSE.BTC_INFO, info.model_dump())
last_info = info
await asyncio.sleep(2)

2
app/lightning/impl/cln_grpc.py
View file

@ -647,7 +647,7 @@ class LnNodeCLNgRPC(LightningNodeBase):
)
response = await self._cln_stub.Withdraw(req)
r = SendCoinsResponse.from_cln_grpc(response, input)
await broadcast_sse_msg(SSE.LN_ONCHAIN_PAYMENT_STATUS, r.dict())
await broadcast_sse_msg(SSE.LN_ONCHAIN_PAYMENT_STATUS, r.model_dump())
return r
except grpc.aio._call.AioRpcError as error:
details = error.details()

6
app/lightning/impl/lnd_grpc.py
View file

@ -278,7 +278,7 @@ This will show more debug information.
):
pass # do nothing here
else:
logger.warning(f"Unhandled initialization event: {res.dict()}")
logger.warning(f"Unhandled initialization event: {res.model_dump()}")
yield res
@ -566,7 +566,7 @@ This will show more debug information.
break
r = SendCoinsResponse.from_lnd_grpc(tx, input)
await broadcast_sse_msg(SSE.LN_ONCHAIN_PAYMENT_STATUS, r.dict())
await broadcast_sse_msg(SSE.LN_ONCHAIN_PAYMENT_STATUS, r.model_dump())
return r
except grpc.aio._call.AioRpcError as error:
_check_if_locked(error)
@ -613,7 +613,7 @@ This will show more debug information.
p = None
async for response in self._router_stub.SendPaymentV2(r):
p = Payment.from_lnd_grpc(response)
await broadcast_sse_msg(SSE.LN_PAYMENT_STATUS, p.dict())
await broadcast_sse_msg(SSE.LN_PAYMENT_STATUS, p.model_dump())
return p
except grpc.aio._call.AioRpcError as error:
_check_if_locked(error)

12
app/lightning/service.py
View file

@ -220,13 +220,13 @@ async def _handle_info_listener():
info = await ln.get_ln_info()
if last_info != info:
await broadcast_sse_msg(SSE.LN_INFO, info.dict())
await broadcast_sse_msg(SSE.LN_INFO, info.model_dump())
last_info = info
info_lite = LightningInfoLite.from_lninfo(info)
if last_info_lite != info_lite:
await broadcast_sse_msg(SSE.LN_INFO_LITE, info_lite.dict())
await broadcast_sse_msg(SSE.LN_INFO_LITE, info_lite.model_dump())
last_info_lite = info_lite
await asyncio.sleep(GATHER_INFO_INTERVALL)
@ -234,7 +234,7 @@ async def _handle_info_listener():
async def _handle_invoice_listener():
async for i in ln.listen_invoices():
await broadcast_sse_msg(SSE.LN_INVOICE_STATUS, i.dict())
await broadcast_sse_msg(SSE.LN_INVOICE_STATUS, i.model_dump())
_schedule_wallet_balance_update()
@ -258,13 +258,13 @@ async def _handle_forward_event_listener():
_schedule_wallet_balance_update()
rev = await get_fee_revenue()
await broadcast_sse_msg(SSE.LN_FEE_REVENUE, rev.dict())
await broadcast_sse_msg(SSE.LN_FEE_REVENUE, rev.model_dump())
_fwd_update_scheduled = False
async for i in ln.listen_forward_events():
if ENABLE_FWD_NOTIFICATIONS:
_fwd_successes.append(i.dict())
_fwd_successes.append(i.model_dump())
if not _fwd_update_scheduled:
loop = asyncio.get_event_loop()
@ -281,7 +281,7 @@ def _schedule_wallet_balance_update():
await asyncio.sleep(1.1)
wb = await ln.get_wallet_balance()
if _CACHE["wallet_balance"] != wb:
await broadcast_sse_msg(SSE.WALLET_BALANCE, wb.dict())
await broadcast_sse_msg(SSE.WALLET_BALANCE, wb.model_dump())
_CACHE["wallet_balance"] = wb
_wallet_balance_update_scheduled = False

4
tests/routers/test_lightning.py
View file

@ -49,10 +49,10 @@ def test_get_ln_status(monkeypatch):
response = test_client.get(f"{prefix_latest}/get-info-lite")
r_js = response.json()
v_js = get_valid_lightning_info_lite().dict()
v_js = get_valid_lightning_info_lite().model_dump()
assert r_js == v_js
response = test_client.get(f"{prefix_v1}/get-info-lite")
r_js = response.json()
v_js = get_valid_lightning_info_lite().dict()
v_js = get_valid_lightning_info_lite().model_dump()
assert r_js == v_js