LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-08-23 17:47:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

history: better handling of None timestamps

Browse source
This commit is contained in:
ThomasV 2019-02-01 21:22:39 +01:00
parent 2a112b867b
commit 42cbe74e95
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
electrum/gui/qt/history_list.py
View file

@ -140,7 +140,6 @@ class HistoryModel(QAbstractItemModel, Logger):
if is_lightning: if is_lightning:
status = 0 status = 0
if timestamp is None: if timestamp is None:
timestamp = sys.maxsize
status_str = 'unconfirmed' status_str = 'unconfirmed'
else: else:
status_str = format_time(int(timestamp)) status_str = format_time(int(timestamp))
@ -154,9 +153,10 @@ class HistoryModel(QAbstractItemModel, Logger):
except KeyError: except KeyError:
tx_mined_info = self.tx_mined_info_from_tx_item(tx_item) tx_mined_info = self.tx_mined_info_from_tx_item(tx_item)
status, status_str = self.parent.wallet.get_tx_status(tx_hash, tx_mined_info) status, status_str = self.parent.wallet.get_tx_status(tx_hash, tx_mined_info)
# we sort by timestamp # we sort by timestamp
if conf<=0: if timestamp is None:
timestamp = sys.maxsize timestamp = float("inf")
if role == Qt.UserRole: if role == Qt.UserRole:
# for sorting # for sorting

4
electrum/lnworker.py
View file

@ -11,7 +11,6 @@ from typing import Optional, Sequence, Tuple, List, Dict, TYPE_CHECKING
import threading import threading
import socket import socket
import json import json
import operator
from datetime import datetime, timezone from datetime import datetime, timezone
from functools import partial from functools import partial
@ -197,7 +196,8 @@ class LNWorker(PrintError):
'timestamp': closing_timestamp, 'timestamp': closing_timestamp,
} }
out.append(item) out.append(item)
out.sort(key=operator.itemgetter('timestamp')) # sort by timestamp
out.sort(key=lambda x: (x.get('timestamp') or float("inf")))
balance_msat = 0 balance_msat = 0
for item in out: for item in out:
balance_msat += item['amount_msat'] * (1 if item['direction']=='received' else -1) balance_msat += item['amount_msat'] * (1 if item['direction']=='received' else -1)