Add test for all list query combinations

apps/cic-cache/tests/conftest.py

@@ -127,7 +127,8 @@ def more_txs(
 
     session.commit()
 
-    return txs + [tx_hash] 
+    return [tx_hash] + txs
+
 
 @pytest.fixture(scope='function')
 def tag_txs(

apps/cic-cache/tests/test_cache.py

@@ -44,7 +44,6 @@ def test_cache_data(
     session = init_database
 
     c = DataCache(session)
-    #b = c.load_transactions_with_data(0, 100, block_offset=410000, block_limit=420000, oldest=True)
     b = c.load_transactions_with_data(0, 3) #410000, 420000) #, 100, block_offset=410000, block_limit=420000, oldest=True)
 
     assert len(b[2]) == 2
@@ -96,6 +95,10 @@ def test_cache_ranges(
     assert b[0] == oldest
     assert b[1] == mid
 
+    b = c.load_transactions(0, 100, block_offset=list_defaults['block'] - 1, block_limit=list_defaults['block'], oldest=True)
+    assert b[0] == oldest
+    assert b[1] == mid
+
     # now check when supplying account
     b = c.load_transactions_account(list_actors['alice'], 0, 100)
     assert b[0] == oldest
@@ -132,7 +135,7 @@ def test_cache_ranges_data(
         list_defaults,
         list_actors,
         list_tokens,
-        txs,
+        more_txs,
         ):
 
     session = init_database
@@ -142,62 +145,108 @@ def test_cache_ranges_data(
     newest = list_defaults['block'] + 2
 
     c = DataCache(session)
+
     b = c.load_transactions_with_data(0, 100)
-    assert len(b) == 3
+    assert b[0] == oldest
+    assert b[1] == newest
+    assert len(b[2]) == 3
+    assert b[2][0]['tx_hash'] == more_txs[0]
+    assert b[2][2]['tx_hash'] == more_txs[2]
 
+    b = c.load_transactions_with_data(1, 2)
+    assert b[0] == oldest
+    assert b[1] == mid
+    assert len(b[2]) == 2
+    assert b[2][0]['tx_hash'] == more_txs[1]
+    assert b[2][1]['tx_hash'] == more_txs[2]
 
-#    b = c.load_transactions(1, 2)
-#    assert b[0] == oldest
-#    assert b[1] == mid
-#
-#    b = c.load_transactions(0, 2)
-#    assert b[0] == mid
-#    assert b[1] == newest
-#
-#    b = c.load_transactions(0, 1)
-#    assert b[0] == newest
-#    assert b[1] == newest
-#
-#    b = c.load_transactions(0, 100, oldest=True)
-#    assert b[0] == oldest
-#    assert b[1] == newest
-#
-#    b = c.load_transactions(0, 100, block_offset=list_defaults['block'])
-#    assert b[0] == mid
-#    assert b[1] == newest
-#
-#    b = c.load_transactions(0, 100, block_offset=list_defaults['block'] - 1, block_limit=list_defaults['block'])
-#    assert b[0] == oldest
-#    assert b[1] == mid
-#
-#    # now check when supplying account
-#    b = c.load_transactions_account(list_actors['alice'], 0, 100)
-#    assert b[0] == oldest
-#    assert b[1] == newest
-#
-#    b = c.load_transactions_account(list_actors['bob'], 0, 100)
-#    assert b[0] == mid
-#    assert b[1] == mid
-#
-#    b = c.load_transactions_account(list_actors['diane'], 0, 100)
-#    assert b[0] == oldest
-#    assert b[1] == newest
-#
-#    # add block filter to the mix
-#    b = c.load_transactions_account(list_actors['alice'], 0, 100, block_offset=list_defaults['block'])
-#    assert b[0] == mid
-#    assert b[1] == newest
-#    
-#    b = c.load_transactions_account(list_actors['alice'], 0, 100, block_offset=list_defaults['block'])
-#    assert b[0] == mid
-#    assert b[1] == newest
-#
-#    b = c.load_transactions_account(list_actors['bob'], 0, 100, block_offset=list_defaults['block'] - 1, block_limit=list_defaults['block'])
-#    assert b[0] == mid
-#    assert b[1] == mid
-#
-#    b = c.load_transactions_account(list_actors['diane'], 0, 100, block_offset=list_defaults['block'] - 1, block_limit=list_defaults['block'])
-#    assert b[0] == oldest
-#    assert b[1] == oldest
-#
-#
+    b = c.load_transactions_with_data(0, 2)
+    assert b[0] == mid
+    assert b[1] == newest
+    assert len(b[2]) == 2
+    assert b[2][0]['tx_hash'] == more_txs[0]
+    assert b[2][1]['tx_hash'] == more_txs[1]
+
+    b = c.load_transactions_with_data(0, 1)
+    assert b[0] == newest
+    assert b[1] == newest
+    assert len(b[2]) == 1
+    assert b[2][0]['tx_hash'] == more_txs[0]
+
+    b = c.load_transactions_with_data(0, 100, oldest=True)
+    assert b[0] == oldest
+    assert b[1] == newest
+    assert len(b[2]) == 3
+    assert b[2][0]['tx_hash'] == more_txs[2]
+    assert b[2][1]['tx_hash'] == more_txs[1]
+    assert b[2][2]['tx_hash'] == more_txs[0]
+
+    b = c.load_transactions_with_data(0, 100, block_offset=list_defaults['block'])
+    assert b[0] == mid
+    assert b[1] == newest
+    assert len(b[2]) == 2
+    assert b[2][0]['tx_hash'] == more_txs[0]
+    assert b[2][1]['tx_hash'] == more_txs[1]
+
+    b = c.load_transactions_with_data(0, 100, block_offset=list_defaults['block'] - 1, block_limit=list_defaults['block'])
+    assert b[0] == oldest
+    assert b[1] == mid
+    assert len(b[2]) == 2
+    assert b[2][0]['tx_hash'] == more_txs[1]
+    assert b[2][1]['tx_hash'] == more_txs[2]
+
+    b = c.load_transactions_with_data(0, 100, block_offset=list_defaults['block'] - 1, block_limit=list_defaults['block'], oldest=True)
+    assert b[0] == oldest
+    assert b[1] == mid
+    assert len(b[2]) == 2
+    assert b[2][0]['tx_hash'] == more_txs[2]
+    assert b[2][1]['tx_hash'] == more_txs[1]
+
+    # now check when supplying account
+    b = c.load_transactions_account_with_data(list_actors['alice'], 0, 100)
+    assert b[0] == oldest
+    assert b[1] == newest
+    assert len(b[2]) == 3
+    assert b[2][0]['tx_hash'] == more_txs[0]
+    assert b[2][1]['tx_hash'] == more_txs[1]
+    assert b[2][2]['tx_hash'] == more_txs[2]
+
+    b = c.load_transactions_account_with_data(list_actors['bob'], 0, 100)
+    assert b[0] == mid
+    assert b[1] == mid
+    assert len(b[2]) == 1
+    assert b[2][0]['tx_hash'] == more_txs[1]
+
+    b = c.load_transactions_account_with_data(list_actors['diane'], 0, 100)
+    assert b[0] == oldest
+    assert b[1] == newest
+    assert len(b[2]) == 2
+    assert b[2][0]['tx_hash'] == more_txs[0]
+    assert b[2][1]['tx_hash'] == more_txs[2]
+
+    # add block filter to the mix
+    b = c.load_transactions_account_with_data(list_actors['alice'], 0, 100, block_offset=list_defaults['block'])
+    assert b[0] == mid
+    assert b[1] == newest
+    assert len(b[2]) == 2
+    assert b[2][0]['tx_hash'] == more_txs[0]
+    assert b[2][1]['tx_hash'] == more_txs[1]
+
+    b = c.load_transactions_account_with_data(list_actors['alice'], 0, 100, block_offset=list_defaults['block'])
+    assert b[0] == mid
+    assert b[1] == newest
+    assert len(b[2]) == 2
+    assert b[2][0]['tx_hash'] == more_txs[0]
+    assert b[2][1]['tx_hash'] == more_txs[1]
+
+    b = c.load_transactions_account_with_data(list_actors['bob'], 0, 100, block_offset=list_defaults['block'] - 1, block_limit=list_defaults['block'])
+    assert b[0] == mid
+    assert b[1] == mid
+    assert len(b[2]) == 1
+    assert b[2][0]['tx_hash'] == more_txs[1]
+
+    b = c.load_transactions_account_with_data(list_actors['diane'], 0, 100, block_offset=list_defaults['block'] - 1, block_limit=list_defaults['block'])
+    assert b[0] == oldest
+    assert b[1] == oldest
+    assert len(b[2]) == 1
+    assert b[2][0]['tx_hash'] == more_txs[2]