Mirror/robosats
1
0
Fork 0
mirror of https://github.com/RoboSats/robosats.git synced 2025-02-07 13:59:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Annoy black (#293)

Browse Source
This commit is contained in:
redphix 2022-10-21 02:27:46 +05:30 committed by GitHub
parent 4d5c60239f
commit aa445418d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
api/logics.py
View File

@ -1,17 +1,16 @@
import ast
import math
from datetime import timedelta from datetime import timedelta
from django.utils import timezone
from api.lightning.node import LNNode
from django.db.models import Q, Sum
from api.models import OnchainPayment, Order, LNPayment, MarketTick, User, Currency
from api.tasks import send_message
from decouple import config
from api.utils import validate_onchain_address
import gnupg import gnupg
from decouple import config
from django.db.models import Q, Sum
from django.utils import timezone
import math from api.lightning.node import LNNode
import ast from api.models import Currency, LNPayment, MarketTick, OnchainPayment, Order, User
from api.tasks import send_message
from api.utils import validate_onchain_address
FEE = float(config("FEE")) FEE = float(config("FEE"))
MAKER_FEE_SPLIT = float(config("MAKER_FEE_SPLIT")) MAKER_FEE_SPLIT = float(config("MAKER_FEE_SPLIT"))
@ -735,11 +734,7 @@ class Logics:
if not order.taker_bond: if not order.taker_bond:
return False, {"bad_request": "Wait for your order to be taken."} return False, {"bad_request": "Wait for your order to be taken."}
if ( if (
not ( not ( order.taker_bond.status == order.maker_bond.status == LNPayment.Status.LOCKED)
order.taker_bond.status
== order.maker_bond.status
== LNPayment.Status.LOCKED
)
and not order.status == Order.Status.FAI and not order.status == Order.Status.FAI
): ):
return False, { return False, {
@ -758,7 +753,7 @@ class Logics:
payout = LNNode.validate_ln_invoice(invoice, num_satoshis) payout = LNNode.validate_ln_invoice(invoice, num_satoshis)
if not payout["valid"]: if not payout["valid"]:
return False, payout["context"] return False, payout['context']
order.payout, _ = LNPayment.objects.update_or_create( order.payout, _ = LNPayment.objects.update_or_create(
concept=LNPayment.Concepts.PAYBUYER, concept=LNPayment.Concepts.PAYBUYER,
@ -768,10 +763,10 @@ class Logics:
receiver=user, receiver=user,
# if there is a LNPayment matching these above, it updates that one with defaults below. # if there is a LNPayment matching these above, it updates that one with defaults below.
defaults={ defaults={
"invoice": invoice, "invoice":invoice,
"status": LNPayment.Status.VALIDI, "status":LNPayment.Status.VALIDI,
"num_satoshis": num_satoshis, "num_satoshis":num_satoshis,
"description": payout["description"], "description": payout['description'],
"payment_hash": payout["payment_hash"], "payment_hash": payout["payment_hash"],
"created_at": payout["created_at"], "created_at": payout["created_at"],
"expires_at": payout["expires_at"], "expires_at": payout["expires_at"],