From 7ac6e6666c195d1d7403d624f30d09c91247b967 Mon Sep 17 00:00:00 2001
From: nolash <dev@holbrook.no>
Date: Tue, 19 Oct 2021 14:35:22 +0200
Subject: [PATCH] Uncomment tests

---
 tests/test_query.py | 398 ++++++++++++++++++++++----------------------
 1 file changed, 199 insertions(+), 199 deletions(-)

diff --git a/tests/test_query.py b/tests/test_query.py
index eb8896c..9d43b43 100644
--- a/tests/test_query.py
+++ b/tests/test_query.py
@@ -30,205 +30,205 @@ logg = logging.getLogger()
 
 class TestTxQuery(TestTxBase):
 
-#    def test_get_tx(self):
-#        tx = get_tx(self.chain_spec, self.tx_hash) 
-#        expected_keys = [
-#                'otx_id',
-#                'status',
-#                'signed_tx',
-#                'nonce',
-#                ]
-#        for k in tx.keys():
-#            expected_keys.remove(k)
-#
-#        self.assertEqual(len(expected_keys), 0)
-#
-#
-#    def test_nonce_tx(self):
-#
-#        nonce_hashes = [self.tx_hash]
-#        tx_hash = add_0x(os.urandom(32).hex())
-#        signed_tx = add_0x(os.urandom(128).hex())
-#        create(
-#                self.chain_spec,
-#                42,
-#                self.alice,
-#                tx_hash,
-#                signed_tx,
-#                session=self.session,
-#                )
-#        txc = TxCache(
-#                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()
-#
-#        nonce_hashes.append(tx_hash)
-#
-#        tx_hash = add_0x(os.urandom(32).hex())
-#        signed_tx = add_0x(os.urandom(128).hex())
-#        create(
-#                self.chain_spec,
-#                41,
-#                self.alice,
-#                tx_hash,
-#                signed_tx,
-#                session=self.session,
-#                )
-#        txc = TxCache(
-#                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)
-#
-#        txs = get_nonce_tx_cache(self.chain_spec, 42, self.alice)
-#        self.assertEqual(len(txs.keys()), 2)
-#    
-#        for h in nonce_hashes:
-#            self.assertTrue(strip_0x(h) in txs)
-#
-#
-#    def test_paused_tx_cache(self):
-#        set_waitforgas(self.chain_spec, self.tx_hash)
-#        
-#        tx_hash = add_0x(os.urandom(32).hex())
-#        signed_tx = add_0x(os.urandom(128).hex())
-#        create(
-#                self.chain_spec,
-#                43,
-#                self.alice,
-#                tx_hash,
-#                signed_tx,
-#                session=self.session,
-#                )
-#        txc = TxCache(
-#                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()
-#
-#        txs = get_paused_tx_cache(self.chain_spec, status=StatusBits.GAS_ISSUES, sender=self.alice, session=self.session)
-#        self.assertEqual(len(txs.keys()), 1)
-#
-#        txs = get_paused_tx_cache(self.chain_spec, status=StatusBits.GAS_ISSUES, session=self.session)
-#        self.assertEqual(len(txs.keys()), 1)
-#
-#        tx_hash = add_0x(os.urandom(32).hex())
-#        signed_tx = add_0x(os.urandom(128).hex())
-#        create(
-#                self.chain_spec,
-#                42,
-#                self.bob,
-#                tx_hash,
-#                signed_tx,
-#                session=self.session,
-#                )
-#        txc = TxCache(
-#                tx_hash,
-#                self.bob,
-#                self.alice,
-#                self.bar_token,
-#                self.foo_token,
-#                self.to_value,
-#                self.from_value,
-#                session=self.session,
-#                )
-#        self.session.add(txc)
-#        self.session.commit()
-#
-#        txs = get_paused_tx_cache(self.chain_spec, status=StatusBits.GAS_ISSUES, session=self.session)
-#        self.assertEqual(len(txs.keys()), 1)
-#
-#        set_waitforgas(self.chain_spec, tx_hash)
-#        self.session.commit()
-#
-#        txs = get_paused_tx_cache(self.chain_spec, status=StatusBits.GAS_ISSUES, session=self.session)
-#        self.assertEqual(len(txs.keys()), 2)
-#
-#        txs = get_paused_tx_cache(self.chain_spec, status=StatusBits.GAS_ISSUES, sender=self.bob, session=self.session)
-#        self.assertEqual(len(txs.keys()), 1)
-#
-#
-#    def test_count(self):
-#        for i in range(3):
-#            tx_hash = add_0x(os.urandom(32).hex())
-#            signed_tx = add_0x(os.urandom(128).hex())
-#            create(
-#                    self.chain_spec,
-#                    i,
-#                    self.alice,
-#                    tx_hash,
-#                    signed_tx,
-#                    session=self.session,
-#                    )
-#            txc = TxCache(
-#                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)
-#            set_ready(self.chain_spec, tx_hash, session=self.session)
-#            set_reserved(self.chain_spec, tx_hash, session=self.session)
-#            if i > 0:
-#                set_sent(self.chain_spec, tx_hash, session=self.session)
-#            if i == 2:
-#                set_final(self.chain_spec, tx_hash, session=self.session)
-#
-#        tx_hash = add_0x(os.urandom(32).hex())
-#        signed_tx = add_0x(os.urandom(128).hex())
-#        create(
-#                self.chain_spec,
-#                i,
-#                self.bob,
-#                tx_hash,
-#                signed_tx,
-#                session=self.session,
-#                )
-#        txc = TxCache(
-#            tx_hash,
-#            self.bob,
-#            self.carol,
-#            self.foo_token,
-#            self.bar_token,
-#            self.from_value,
-#            self.to_value,
-#            session=self.session,
-#            )
-#
-#        self.session.add(txc)
-#        set_ready(self.chain_spec, tx_hash, session=self.session)
-#        set_reserved(self.chain_spec, tx_hash, session=self.session)
-#        set_sent(self.chain_spec, tx_hash, session=self.session)
-#        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)
-#
+    def test_get_tx(self):
+        tx = get_tx(self.chain_spec, self.tx_hash) 
+        expected_keys = [
+                'otx_id',
+                'status',
+                'signed_tx',
+                'nonce',
+                ]
+        for k in tx.keys():
+            expected_keys.remove(k)
+
+        self.assertEqual(len(expected_keys), 0)
+
+
+    def test_nonce_tx(self):
+
+        nonce_hashes = [self.tx_hash]
+        tx_hash = add_0x(os.urandom(32).hex())
+        signed_tx = add_0x(os.urandom(128).hex())
+        create(
+                self.chain_spec,
+                42,
+                self.alice,
+                tx_hash,
+                signed_tx,
+                session=self.session,
+                )
+        txc = TxCache(
+                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()
+
+        nonce_hashes.append(tx_hash)
+
+        tx_hash = add_0x(os.urandom(32).hex())
+        signed_tx = add_0x(os.urandom(128).hex())
+        create(
+                self.chain_spec,
+                41,
+                self.alice,
+                tx_hash,
+                signed_tx,
+                session=self.session,
+                )
+        txc = TxCache(
+                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)
+
+        txs = get_nonce_tx_cache(self.chain_spec, 42, self.alice)
+        self.assertEqual(len(txs.keys()), 2)
+    
+        for h in nonce_hashes:
+            self.assertTrue(strip_0x(h) in txs)
+
+
+    def test_paused_tx_cache(self):
+        set_waitforgas(self.chain_spec, self.tx_hash)
+        
+        tx_hash = add_0x(os.urandom(32).hex())
+        signed_tx = add_0x(os.urandom(128).hex())
+        create(
+                self.chain_spec,
+                43,
+                self.alice,
+                tx_hash,
+                signed_tx,
+                session=self.session,
+                )
+        txc = TxCache(
+                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()
+
+        txs = get_paused_tx_cache(self.chain_spec, status=StatusBits.GAS_ISSUES, sender=self.alice, session=self.session)
+        self.assertEqual(len(txs.keys()), 1)
+
+        txs = get_paused_tx_cache(self.chain_spec, status=StatusBits.GAS_ISSUES, session=self.session)
+        self.assertEqual(len(txs.keys()), 1)
+
+        tx_hash = add_0x(os.urandom(32).hex())
+        signed_tx = add_0x(os.urandom(128).hex())
+        create(
+                self.chain_spec,
+                42,
+                self.bob,
+                tx_hash,
+                signed_tx,
+                session=self.session,
+                )
+        txc = TxCache(
+                tx_hash,
+                self.bob,
+                self.alice,
+                self.bar_token,
+                self.foo_token,
+                self.to_value,
+                self.from_value,
+                session=self.session,
+                )
+        self.session.add(txc)
+        self.session.commit()
+
+        txs = get_paused_tx_cache(self.chain_spec, status=StatusBits.GAS_ISSUES, session=self.session)
+        self.assertEqual(len(txs.keys()), 1)
+
+        set_waitforgas(self.chain_spec, tx_hash)
+        self.session.commit()
+
+        txs = get_paused_tx_cache(self.chain_spec, status=StatusBits.GAS_ISSUES, session=self.session)
+        self.assertEqual(len(txs.keys()), 2)
+
+        txs = get_paused_tx_cache(self.chain_spec, status=StatusBits.GAS_ISSUES, sender=self.bob, session=self.session)
+        self.assertEqual(len(txs.keys()), 1)
+
+
+    def test_count(self):
+        for i in range(3):
+            tx_hash = add_0x(os.urandom(32).hex())
+            signed_tx = add_0x(os.urandom(128).hex())
+            create(
+                    self.chain_spec,
+                    i,
+                    self.alice,
+                    tx_hash,
+                    signed_tx,
+                    session=self.session,
+                    )
+            txc = TxCache(
+                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)
+            set_ready(self.chain_spec, tx_hash, session=self.session)
+            set_reserved(self.chain_spec, tx_hash, session=self.session)
+            if i > 0:
+                set_sent(self.chain_spec, tx_hash, session=self.session)
+            if i == 2:
+                set_final(self.chain_spec, tx_hash, session=self.session)
+
+        tx_hash = add_0x(os.urandom(32).hex())
+        signed_tx = add_0x(os.urandom(128).hex())
+        create(
+                self.chain_spec,
+                i,
+                self.bob,
+                tx_hash,
+                signed_tx,
+                session=self.session,
+                )
+        txc = TxCache(
+            tx_hash,
+            self.bob,
+            self.carol,
+            self.foo_token,
+            self.bar_token,
+            self.from_value,
+            self.to_value,
+            session=self.session,
+            )
+
+        self.session.add(txc)
+        set_ready(self.chain_spec, tx_hash, session=self.session)
+        set_reserved(self.chain_spec, tx_hash, session=self.session)
+        set_sent(self.chain_spec, tx_hash, session=self.session)
+        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)
+
 
     def test_account_tx(self):