chainqueue

commit d01ed18f12ea16a0f0e5bf6efd27f35fda6775bc
parent 7ac6e6666c195d1d7403d624f30d09c91247b967
Author: nolash <dev@holbrook.no>
Date:   Wed, 20 Oct 2021 09:24:08 +0200

Rehabilitate sql query tests

Diffstat:
M
requirements.txt
 | 
2
+-
M
tests/chainqueue_base.py
 | 
21
+++++++++++----------
M
tests/test_query.py
 | 
2
+-

3 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/requirements.txt b/requirements.txt
@@ -5,4 +5,4 @@ alembic==1.4.2
 SQLAlchemy==1.3.20
 confini>=0.4.1a1,<0.5.0
 pyxdg~=0.27
-chainlib~=0.0.10a3
+chainlib~=0.0.10a5
diff --git a/tests/chainqueue_base.py b/tests/chainqueue_base.py
@@ -66,16 +66,17 @@ class TestTxBase(TestOtxBase):
         self.to_value = 13
 
         backend = SQLBackend(self.db.dsn)
-        tx = {
-            'hash': self.tx_hash,
-            'from': self.alice,
-            'to': self.bob,
-            'source_token': self.foo_token,
-            'destination_token': self.bar_token,
-            'from_value': self.from_value,
-            'to_value': self.to_value,
-                }
-        backend.cache(tx, session=self.session)
+        txc = TxCache(
+                self.tx_hash,
+                self.alice,
+                self.bob,
+                self.foo_token,
+                self.bar_token,
+                self.from_value,
+                self.to_value,
+                session=self.session,
+                )
+        self.session.add(txc)
         self.session.commit()
 
         otx = Otx.load(self.tx_hash)
diff --git a/tests/test_query.py b/tests/test_query.py
@@ -227,7 +227,7 @@ class TestTxQuery(TestTxBase):
         self.session.commit()
 
         self.assertEqual(count_tx(self.chain_spec, status=StatusBits.IN_NETWORK | StatusBits.FINAL, status_target=StatusBits.IN_NETWORK), 2)
-        self.assertEqual(count_tx(self.chain_spec, address=self.alice, status=StatusBits.IN_NETWORK | StatusBits.FINAL, status_target=StatusBits.IN_NETWORK), 1)
+        self.assertEqual(count_tx(self.chain_spec, sender=self.alice, status=StatusBits.IN_NETWORK | StatusBits.FINAL, status_target=StatusBits.IN_NETWORK), 1)
 
 
     def test_account_tx(self):