From 3d1d0d6dd29bfbeded26f48549122abf6354a8dd Mon Sep 17 00:00:00 2001 From: William Luke Date: Mon, 28 Feb 2022 15:33:55 +0300 Subject: [PATCH] fix(get_latest_txs): use desc ordering and switch order --- chainqueue/sql/query.py | 2 +- tests/__init__.py | 0 tests/test_query.py | 3 +-- 3 files changed, 2 insertions(+), 3 deletions(-) create mode 100644 tests/__init__.py diff --git a/chainqueue/sql/query.py b/chainqueue/sql/query.py index 1cc28d5..7ca00b3 100644 --- a/chainqueue/sql/query.py +++ b/chainqueue/sql/query.py @@ -515,7 +515,7 @@ def get_latest_txs(chain_spec, count=10, since=None, until=None, status=None, n if not_status != None: 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() for r in results: if txs.get(r.tx_hash) != None: diff --git a/tests/__init__.py b/tests/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/tests/test_query.py b/tests/test_query.py index dd21578..a896238 100644 --- a/tests/test_query.py +++ b/tests/test_query.py @@ -373,7 +373,6 @@ class TestTxQuery(TestTxBase): nonce_hashes.append(tx_hash) - time_between = datetime.datetime.utcnow() tx_hash = add_0x(os.urandom(32).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) self.assertEqual(len(txs.keys()), 3) - + txs = get_latest_txs(self.chain_spec, count=1, session=self.session) self.assertEqual(len(txs.keys()), 1)