chainqueue

commit eb4fd2536e89df31be0c77a4feef1676c4755bb7
parent 84227a525ea3395ed79e18b72548242343ed3f5d
Author: williamluke <williamluke4@gmail.com>
Date:   Mon, 28 Feb 2022 12:34:27 +0000

fix(get_latest_txs): use desc ordering and switch order

Reviewed-on: https://git.grassecon.net/chaintool/chainqueue/pulls/4

Diffstat:
M
chainqueue/sql/query.py
 | 
2
+-
A
tests/__init__.py
 | 
0

M
tests/test_query.py
 | 
3
+--

3 files changed, 2 insertions(+), 3 deletions(-)
diff --git 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
diff --git 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)