chaintool/chainqueue
4
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

fix(get_latest_txs): use desc ordering and switch order #4

Merged
williamluke merged 1 commits from fix/get_latest_txs into master 2022-02-28 13:34:28 +01:00
Conversation 0 Commits 1 Files Changed 3 +2 -3
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3d1d0d6dd2 - Show all commits

2
chainqueue/sql/query.py
View File

@ -515,7 +515,7 @@ def get_latest_txs(chain_spec, count=10, since=None, until=None, status=None, n
if not_status != None: if not_status != None:
q = q.filter(Otx.status.op('&')(not_status)==0) q = q.filter(Otx.status.op('&')(not_status)==0)
q = q.order_by(Otx.nonce.asc(), Otx.date_created.asc()).limit(count) q = q.order_by(Otx.date_created.desc(), Otx.nonce.desc()).limit(count)
results = q.all() results = q.all()
for r in results: for r in results:
if txs.get(r.tx_hash) != None: if txs.get(r.tx_hash) != None:

0
tests/__init__.py Normal file
View File

3
tests/test_query.py
View File

@ -373,7 +373,6 @@ class TestTxQuery(TestTxBase):
nonce_hashes.append(tx_hash) nonce_hashes.append(tx_hash)
time_between = datetime.datetime.utcnow()
tx_hash = add_0x(os.urandom(32).hex()) tx_hash = add_0x(os.urandom(32).hex())
signed_tx = add_0x(os.urandom(128).hex()) signed_tx = add_0x(os.urandom(128).hex())
@ -401,7 +400,7 @@ class TestTxQuery(TestTxBase):
txs = get_latest_txs(self.chain_spec, session=self.session) txs = get_latest_txs(self.chain_spec, session=self.session)
self.assertEqual(len(txs.keys()), 3) self.assertEqual(len(txs.keys()), 3)
txs = get_latest_txs(self.chain_spec, count=1, session=self.session) txs = get_latest_txs(self.chain_spec, count=1, session=self.session)
self.assertEqual(len(txs.keys()), 1) self.assertEqual(len(txs.keys()), 1)