Problem: tests in test_bigchain_api are not activated

Solution: remove or active tests

bigchaindb/common/exceptions.py

@@ -66,12 +66,6 @@ class InvalidSignature(ValidationError):
     """
 
 
-class TransactionNotInValidBlock(ValidationError):
-    """Raised when a transfer transaction is attempting to fulfill the
-    outputs of a transaction that is in an invalid or undecided block
-    """
-
-
 class AssetIdMismatch(ValidationError):
     """Raised when multiple transaction inputs related to different assets"""
 

tests/db/test_bigchain_api.py

@@ -62,7 +62,7 @@ class TestBigchainApi(object):
             b.get_spent(tx.id, 0)
 
     @pytest.mark.tendermint
-    def test_get_block_status_for_tx_with_double_inclusion(self, b, alice):
+    def test_double_inclusion(self, b, alice):
         from bigchaindb.models import Transaction
         from bigchaindb.backend.exceptions import OperationError
 
@@ -144,7 +144,9 @@ class TestBigchainApi(object):
 
 
 class TestTransactionValidation(object):
-    def test_non_create_input_not_found(self, b, user_pk, signed_transfer_tx):
+
+    @pytest.mark.tendermint
+    def test_non_create_input_not_found(self, b, signed_transfer_tx):
         from bigchaindb.common.exceptions import InputDoesNotExist
         from bigchaindb.common.transaction import TransactionLink
 
@@ -152,13 +154,14 @@ class TestTransactionValidation(object):
         with pytest.raises(InputDoesNotExist):
             b.validate_transaction(signed_transfer_tx)
 
+    @pytest.mark.tendermint
     @pytest.mark.usefixtures('inputs')
     def test_non_create_valid_input_wrong_owner(self, b, user_pk):
         from bigchaindb.common.crypto import generate_key_pair
         from bigchaindb.common.exceptions import InvalidSignature
         from bigchaindb.models import Transaction
 
-        input_tx = b.get_owned_ids(user_pk).pop()
+        input_tx = b.fastquery.get_outputs_by_public_key(user_pk).pop()
         input_transaction = b.get_transaction(input_tx.txid)
         sk, pk = generate_key_pair()
         tx = Transaction.create([pk], [([user_pk], 1)])
@@ -169,93 +172,31 @@ class TestTransactionValidation(object):
         with pytest.raises(InvalidSignature):
             b.validate_transaction(tx)
 
+    @pytest.mark.tendermint
     @pytest.mark.usefixtures('inputs')
     def test_non_create_double_spend(self, b, signed_create_tx,
                                      signed_transfer_tx, double_spend_tx):
         from bigchaindb.common.exceptions import DoubleSpend
 
-        block1 = b.create_block([signed_create_tx])
+        b.store_bulk_transactions([signed_create_tx, signed_transfer_tx])
-        b.write_block(block1)
-
-        # vote block valid
-        vote = b.vote(block1.id, b.get_last_voted_block().id, True)
-        b.write_vote(vote)
-
-        b.write_transaction(signed_transfer_tx)
-        block = b.create_block([signed_transfer_tx])
-        b.write_block(block)
-
-        # vote block valid
-        vote = b.vote(block.id, b.get_last_voted_block().id, True)
-        b.write_vote(vote)
 
         sleep(1)
 
         with pytest.raises(DoubleSpend):
             b.validate_transaction(double_spend_tx)
 
-    @pytest.mark.usefixtures('inputs')
-    def test_valid_non_create_transaction_after_block_creation(self, b,
-                                                               user_pk,
-                                                               user_sk):
-        from bigchaindb.models import Transaction
-
-        input_tx = b.get_owned_ids(user_pk).pop()
-        input_tx = b.get_transaction(input_tx.txid)
-        inputs = input_tx.to_inputs()
-        transfer_tx = Transaction.transfer(inputs, [([user_pk], 1)],
-                                           asset_id=input_tx.id)
-        transfer_tx = transfer_tx.sign([user_sk])
-
-        assert transfer_tx == b.validate_transaction(transfer_tx)
-
-        # create block
-        block = b.create_block([transfer_tx])
-        assert b.validate_block(block) == block
-        b.write_block(block)
-
-        # check that the transaction is still valid after being written to the
-        # bigchain
-        assert transfer_tx == b.validate_transaction(transfer_tx)
-
-    @pytest.mark.usefixtures('inputs')
-    def test_transaction_not_in_valid_block(self, b, user_pk, user_sk):
-        from bigchaindb.models import Transaction
-        from bigchaindb.common.exceptions import TransactionNotInValidBlock
-
-        input_tx = b.get_owned_ids(user_pk).pop()
-        input_tx = b.get_transaction(input_tx.txid)
-        inputs = input_tx.to_inputs()
-
-        # create a transaction that's valid but not in a voted valid block
-        transfer_tx = Transaction.transfer(inputs, [([user_pk], 1)],
-                                           asset_id=input_tx.id)
-        transfer_tx = transfer_tx.sign([user_sk])
-
-        assert transfer_tx == b.validate_transaction(transfer_tx)
-
-        # create block
-        block = b.create_block([transfer_tx])
-        b.write_block(block)
-
-        # create transaction with the undecided input
-        tx_invalid = Transaction.transfer(transfer_tx.to_inputs(),
-                                          [([user_pk], 1)],
-                                          asset_id=transfer_tx.asset['id'])
-        tx_invalid = tx_invalid.sign([user_sk])
-
-        with pytest.raises(TransactionNotInValidBlock):
-            b.validate_transaction(tx_invalid)
-
 
 class TestMultipleInputs(object):
+
+    @pytest.mark.tendermint
     def test_transfer_single_owner_single_input(self, b, inputs, user_pk,
                                                 user_sk):
         from bigchaindb.common import crypto
         from bigchaindb.models import Transaction
+
         user2_sk, user2_pk = crypto.generate_key_pair()
 
-        tx_link = b.get_owned_ids(user_pk).pop()
+        tx_link = b.fastquery.get_outputs_by_public_key(user_pk).pop()
         input_tx = b.get_transaction(tx_link.txid)
         inputs = input_tx.to_inputs()
         tx = Transaction.transfer(inputs, [([user2_pk], 1)],
@@ -267,6 +208,7 @@ class TestMultipleInputs(object):
         assert len(tx.inputs) == 1
         assert len(tx.outputs) == 1
 
+    @pytest.mark.tendermint
     def test_single_owner_before_multiple_owners_after_single_input(self, b,
                                                                     user_sk,
                                                                     user_pk,
@@ -276,9 +218,8 @@ class TestMultipleInputs(object):
 
         user2_sk, user2_pk = crypto.generate_key_pair()
         user3_sk, user3_pk = crypto.generate_key_pair()
+        tx_link = b.fastquery.get_outputs_by_public_key(user_pk).pop()
 
-        owned_inputs = b.get_owned_ids(user_pk)
-        tx_link = owned_inputs.pop()
         input_tx = b.get_transaction(tx_link.txid)
         tx = Transaction.transfer(input_tx.to_inputs(),
                                   [([user2_pk, user3_pk], 1)],
@@ -289,6 +230,7 @@ class TestMultipleInputs(object):
         assert len(tx.inputs) == 1
         assert len(tx.outputs) == 1
 
+    @pytest.mark.tendermint
     @pytest.mark.usefixtures('inputs')
     def test_multiple_owners_before_single_owner_after_single_input(self, b,
                                                                     user_sk,
@@ -302,14 +244,9 @@ class TestMultipleInputs(object):
 
         tx = Transaction.create([alice.public_key], [([user_pk, user2_pk], 1)])
         tx = tx.sign([alice.private_key])
-        block = b.create_block([tx])
+        b.store_bulk_transactions([tx])
-        b.write_block(block)
 
-        # vote block valid
+        owned_input = b.fastquery.get_outputs_by_public_key(user_pk).pop()
-        vote = b.vote(block.id, b.get_last_voted_block().id, True)
-        b.write_vote(vote)
-
-        owned_input = b.get_owned_ids(user_pk).pop()
         input_tx = b.get_transaction(owned_input.txid)
         inputs = input_tx.to_inputs()
 
@@ -322,6 +259,7 @@ class TestMultipleInputs(object):
         assert len(transfer_tx.inputs) == 1
         assert len(transfer_tx.outputs) == 1
 
+    @pytest.mark.tendermint
     @pytest.mark.usefixtures('inputs')
     def test_multiple_owners_before_multiple_owners_after_single_input(self, b,
                                                                        user_sk,
@@ -336,15 +274,10 @@ class TestMultipleInputs(object):
 
         tx = Transaction.create([alice.public_key], [([user_pk, user2_pk], 1)])
         tx = tx.sign([alice.private_key])
-        block = b.create_block([tx])
+        b.store_bulk_transactions([tx])
-        b.write_block(block)
-
-        # vote block valid
-        vote = b.vote(block.id, b.get_last_voted_block().id, True)
-        b.write_vote(vote)
 
         # get input
-        tx_link = b.get_owned_ids(user_pk).pop()
+        tx_link = b.fastquery.get_outputs_by_public_key(user_pk).pop()
         tx_input = b.get_transaction(tx_link.txid)
 
         tx = Transaction.transfer(tx_input.to_inputs(),
@@ -356,6 +289,7 @@ class TestMultipleInputs(object):
         assert len(tx.inputs) == 1
         assert len(tx.outputs) == 1
 
+    @pytest.mark.tendermint
     def test_get_owned_ids_single_tx_single_output(self, b, user_sk, user_pk, alice):
         from bigchaindb.common import crypto
         from bigchaindb.common.transaction import TransactionLink
@@ -365,69 +299,25 @@ class TestMultipleInputs(object):
 
         tx = Transaction.create([alice.public_key], [([user_pk], 1)])
         tx = tx.sign([alice.private_key])
-        block = b.create_block([tx])
+        b.store_bulk_transactions([tx])
-        b.write_block(block)
 
-        owned_inputs_user1 = b.get_owned_ids(user_pk)
+        owned_inputs_user1 = b.fastquery.get_outputs_by_public_key(user_pk)
-        owned_inputs_user2 = b.get_owned_ids(user2_pk)
+        owned_inputs_user2 = b.fastquery.get_outputs_by_public_key(user2_pk)
         assert owned_inputs_user1 == [TransactionLink(tx.id, 0)]
         assert owned_inputs_user2 == []
 
-        tx = Transaction.transfer(tx.to_inputs(), [([user2_pk], 1)],
+        tx_transfer = Transaction.transfer(tx.to_inputs(), [([user2_pk], 1)],
-                                  asset_id=tx.id)
+                                           asset_id=tx.id)
-        tx = tx.sign([user_sk])
+        tx_transfer = tx_transfer.sign([user_sk])
-        block = b.create_block([tx])
+        b.store_bulk_transactions([tx_transfer])
-        b.write_block(block)
 
-        owned_inputs_user1 = b.get_owned_ids(user_pk)
+        owned_inputs_user1 = b.fastquery.get_outputs_by_public_key(user_pk)
-        owned_inputs_user2 = b.get_owned_ids(user2_pk)
+        owned_inputs_user2 = b.fastquery.get_outputs_by_public_key(user2_pk)
-        assert owned_inputs_user1 == []
-        assert owned_inputs_user2 == [TransactionLink(tx.id, 0)]
 
-    def test_get_owned_ids_single_tx_single_output_invalid_block(self, b,
-                                                                 user_sk,
-                                                                 user_pk,
-                                                                 genesis_block,
-                                                                 alice):
-        from bigchaindb.common import crypto
-        from bigchaindb.common.transaction import TransactionLink
-        from bigchaindb.models import Transaction
-
-        user2_sk, user2_pk = crypto.generate_key_pair()
-
-        tx = Transaction.create([alice.public_key], [([user_pk], 1)])
-        tx = tx.sign([alice.private_key])
-        block = b.create_block([tx])
-        b.write_block(block)
-
-        # vote the block VALID
-        vote = b.vote(block.id, genesis_block.id, True)
-        b.write_vote(vote)
-
-        owned_inputs_user1 = b.get_owned_ids(user_pk)
-        owned_inputs_user2 = b.get_owned_ids(user2_pk)
         assert owned_inputs_user1 == [TransactionLink(tx.id, 0)]
-        assert owned_inputs_user2 == []
+        assert owned_inputs_user2 == [TransactionLink(tx_transfer.id, 0)]
-
-        # NOTE: The transaction itself is valid, still will mark the block
-        #       as invalid to mock the behavior.
-        tx_invalid = Transaction.transfer(tx.to_inputs(), [([user2_pk], 1)],
-                                          asset_id=tx.id)
-        tx_invalid = tx_invalid.sign([user_sk])
-        block = b.create_block([tx_invalid])
-        b.write_block(block)
-
-        # vote the block invalid
-        vote = b.vote(block.id, b.get_last_voted_block().id, False)
-        b.write_vote(vote)
-
-        owned_inputs_user1 = b.get_owned_ids(user_pk)
-        owned_inputs_user2 = b.get_owned_ids(user2_pk)
-
-        # should be the same as before (note tx, not tx_invalid)
-        assert owned_inputs_user1 == [TransactionLink(tx.id, 0)]
-        assert owned_inputs_user2 == []
 
+    @pytest.mark.tendermint
     def test_get_owned_ids_single_tx_multiple_outputs(self, b, user_sk,
                                                       user_pk, alice):
         from bigchaindb.common import crypto
@@ -439,12 +329,11 @@ class TestMultipleInputs(object):
         # create divisible asset
         tx_create = Transaction.create([alice.public_key], [([user_pk], 1), ([user_pk], 1)])
         tx_create_signed = tx_create.sign([alice.private_key])
-        block = b.create_block([tx_create_signed])
+        b.store_bulk_transactions([tx_create_signed])
-        b.write_block(block)
 
         # get input
-        owned_inputs_user1 = b.get_owned_ids(user_pk)
+        owned_inputs_user1 = b.fastquery.get_outputs_by_public_key(user_pk)
-        owned_inputs_user2 = b.get_owned_ids(user2_pk)
+        owned_inputs_user2 = b.fastquery.get_outputs_by_public_key(user2_pk)
 
         expected_owned_inputs_user1 = [TransactionLink(tx_create.id, 0),
                                        TransactionLink(tx_create.id, 1)]
@@ -456,15 +345,15 @@ class TestMultipleInputs(object):
                                            [([user2_pk], 1), ([user2_pk], 1)],
                                            asset_id=tx_create.id)
         tx_transfer_signed = tx_transfer.sign([user_sk])
-        block = b.create_block([tx_transfer_signed])
+        b.store_bulk_transactions([tx_transfer_signed])
-        b.write_block(block)
 
-        owned_inputs_user1 = b.get_owned_ids(user_pk)
+        owned_inputs_user1 = b.fastquery.get_outputs_by_public_key(user_pk)
-        owned_inputs_user2 = b.get_owned_ids(user2_pk)
+        owned_inputs_user2 = b.fastquery.get_outputs_by_public_key(user2_pk)
-        assert owned_inputs_user1 == []
+        assert owned_inputs_user1 == expected_owned_inputs_user1
         assert owned_inputs_user2 == [TransactionLink(tx_transfer.id, 0),
                                       TransactionLink(tx_transfer.id, 1)]
 
+    @pytest.mark.tendermint
     def test_get_owned_ids_multiple_owners(self, b, user_sk, user_pk, alice):
         from bigchaindb.common import crypto
         from bigchaindb.common.transaction import TransactionLink
@@ -475,11 +364,11 @@ class TestMultipleInputs(object):
 
         tx = Transaction.create([alice.public_key], [([user_pk, user2_pk], 1)])
         tx = tx.sign([alice.private_key])
-        block = b.create_block([tx])
-        b.write_block(block)
 
-        owned_inputs_user1 = b.get_owned_ids(user_pk)
+        b.store_bulk_transactions([tx])
-        owned_inputs_user2 = b.get_owned_ids(user2_pk)
+
+        owned_inputs_user1 = b.fastquery.get_outputs_by_public_key(user_pk)
+        owned_inputs_user2 = b.fastquery.get_outputs_by_public_key(user_pk)
         expected_owned_inputs_user1 = [TransactionLink(tx.id, 0)]
 
         assert owned_inputs_user1 == owned_inputs_user2
@@ -488,14 +377,16 @@ class TestMultipleInputs(object):
         tx = Transaction.transfer(tx.to_inputs(), [([user3_pk], 1)],
                                   asset_id=tx.id)
         tx = tx.sign([user_sk, user2_sk])
-        block = b.create_block([tx])
+        b.store_bulk_transactions([tx])
-        b.write_block(block)
+
+        owned_inputs_user1 = b.fastquery.get_outputs_by_public_key(user_pk)
+        owned_inputs_user2 = b.fastquery.get_outputs_by_public_key(user2_pk)
+        spent_user1 = b.get_spent(tx.id, 0)
 
-        owned_inputs_user1 = b.get_owned_ids(user_pk)
-        owned_inputs_user2 = b.get_owned_ids(user2_pk)
         assert owned_inputs_user1 == owned_inputs_user2
-        assert owned_inputs_user1 == []
+        assert not spent_user1
 
+    @pytest.mark.tendermint
     def test_get_spent_single_tx_single_output(self, b, user_sk, user_pk, alice):
         from bigchaindb.common import crypto
         from bigchaindb.models import Transaction
@@ -504,72 +395,25 @@ class TestMultipleInputs(object):
 
         tx = Transaction.create([alice.public_key], [([user_pk], 1)])
         tx = tx.sign([alice.private_key])
-        block = b.create_block([tx])
+        b.store_bulk_transactions([tx])
-        b.write_block(block)
 
-        owned_inputs_user1 = b.get_owned_ids(user_pk).pop()
+        owned_inputs_user1 = b.fastquery.get_outputs_by_public_key(user_pk).pop()
 
         # check spents
         input_txid = owned_inputs_user1.txid
-        input_idx = owned_inputs_user1.output
+        spent_inputs_user1 = b.get_spent(input_txid, 0)
-        spent_inputs_user1 = b.get_spent(input_txid, input_idx)
         assert spent_inputs_user1 is None
 
-        # create a transaction and block
+        # create a transaction and send it
         tx = Transaction.transfer(tx.to_inputs(), [([user2_pk], 1)],
                                   asset_id=tx.id)
         tx = tx.sign([user_sk])
-        block = b.create_block([tx])
+        b.store_bulk_transactions([tx])
-        b.write_block(block)
 
-        spent_inputs_user1 = b.get_spent(input_txid, input_idx)
+        spent_inputs_user1 = b.get_spent(input_txid, 0)
         assert spent_inputs_user1 == tx
 
-    def test_get_spent_single_tx_single_output_invalid_block(self, b,
+    @pytest.mark.tendermint
-                                                             user_sk,
-                                                             user_pk,
-                                                             genesis_block,
-                                                             alice):
-        from bigchaindb.common import crypto
-        from bigchaindb.models import Transaction
-
-        # create a new users
-        user2_sk, user2_pk = crypto.generate_key_pair()
-
-        tx = Transaction.create([alice.public_key], [([user_pk], 1)])
-        tx = tx.sign([alice.private_key])
-        block = b.create_block([tx])
-        b.write_block(block)
-
-        # vote the block VALID
-        vote = b.vote(block.id, genesis_block.id, True)
-        b.write_vote(vote)
-
-        owned_inputs_user1 = b.get_owned_ids(user_pk).pop()
-
-        # check spents
-        input_txid = owned_inputs_user1.txid
-        input_idx = owned_inputs_user1.output
-        spent_inputs_user1 = b.get_spent(input_txid, input_idx)
-        assert spent_inputs_user1 is None
-
-        # create a transaction and block
-        tx = Transaction.transfer(tx.to_inputs(), [([user2_pk], 1)],
-                                  asset_id=tx.id)
-        tx = tx.sign([user_sk])
-        block = b.create_block([tx])
-        b.write_block(block)
-
-        # vote the block invalid
-        vote = b.vote(block.id, b.get_last_voted_block().id, False)
-        b.write_vote(vote)
-        # NOTE: I have no idea why this line is here
-        b.get_transaction(tx.id)
-        spent_inputs_user1 = b.get_spent(input_txid, input_idx)
-
-        # Now there should be no spents (the block is invalid)
-        assert spent_inputs_user1 is None
-
     def test_get_spent_single_tx_multiple_outputs(self, b, user_sk, user_pk, alice):
         from bigchaindb.common import crypto
         from bigchaindb.models import Transaction
@@ -583,10 +427,9 @@ class TestMultipleInputs(object):
                                         ([user_pk], 1),
                                         ([user_pk], 1)])
         tx_create_signed = tx_create.sign([alice.private_key])
-        block = b.create_block([tx_create_signed])
+        b.store_bulk_transactions([tx_create_signed])
-        b.write_block(block)
 
-        owned_inputs_user1 = b.get_owned_ids(user_pk)
+        owned_inputs_user1 = b.fastquery.get_outputs_by_public_key(user_pk)
 
         # check spents
         for input_tx in owned_inputs_user1:
@@ -597,8 +440,7 @@ class TestMultipleInputs(object):
                                            [([user2_pk], 1), ([user2_pk], 1)],
                                            asset_id=tx_create.id)
         tx_transfer_signed = tx_transfer.sign([user_sk])
-        block = b.create_block([tx_transfer_signed])
+        b.store_bulk_transactions([tx_transfer_signed])
-        b.write_block(block)
 
         # check that used inputs are marked as spent
         for ffill in tx_create.to_inputs()[:2]:
@@ -609,6 +451,7 @@ class TestMultipleInputs(object):
         # spendable by BigchainDB
         assert b.get_spent(tx_create.to_inputs()[2].fulfills.txid, 2) is None
 
+    @pytest.mark.tendermint
     def test_get_spent_multiple_owners(self, b, user_sk, user_pk, alice):
         from bigchaindb.common import crypto
         from bigchaindb.models import Transaction
@@ -623,11 +466,10 @@ class TestMultipleInputs(object):
                                     payload)
             tx = tx.sign([alice.private_key])
             transactions.append(tx)
-        block = b.create_block(transactions)
-        b.write_block(block)
 
-        owned_inputs_user1 = b.get_owned_ids(user_pk)
+        b.store_bulk_transactions(transactions)
 
+        owned_inputs_user1 = b.fastquery.get_outputs_by_public_key(user_pk)
         # check spents
         for input_tx in owned_inputs_user1:
             assert b.get_spent(input_tx.txid, input_tx.output) is None
@@ -637,26 +479,15 @@ class TestMultipleInputs(object):
                                   [([user3_pk], 1)],
                                   asset_id=transactions[0].id)
         tx = tx.sign([user_sk, user2_sk])
-        block = b.create_block([tx])
+        b.store_bulk_transactions([tx])
-        b.write_block(block)
 
         # check that used inputs are marked as spent
         assert b.get_spent(transactions[0].id, 0) == tx
-
         # check that the other remain marked as unspent
         for unspent in transactions[1:]:
             assert b.get_spent(unspent.id, 0) is None
 
 
-def test_get_owned_ids_calls_get_outputs_filtered():
-    from bigchaindb import BigchainDB
-    with patch('bigchaindb.BigchainDB.get_outputs_filtered') as gof:
-        b = BigchainDB()
-        res = b.get_owned_ids('abc')
-    gof.assert_called_once_with('abc', spent=False)
-    assert res == gof()
-
-
 @pytest.mark.tendermint
 def test_get_outputs_filtered_only_unspent():
     from bigchaindb.common.transaction import TransactionLink
@@ -708,8 +539,8 @@ def test_get_outputs_filtered(filter_spent, filter_unspent):
     assert out == get_outputs.return_value
 
 
-@pytest.mark.bdb
+@pytest.mark.tendermint
-def test_cant_spend_same_input_twice_in_tx(b, genesis_block, alice):
+def test_cant_spend_same_input_twice_in_tx(b, alice):
     """Recreate duplicated fulfillments bug
     https://github.com/bigchaindb/bigchaindb/issues/1099
     """
@@ -721,11 +552,7 @@ def test_cant_spend_same_input_twice_in_tx(b, genesis_block, alice):
     tx_create_signed = tx_create.sign([alice.private_key])
     assert b.validate_transaction(tx_create_signed) == tx_create_signed
 
-    # create a block and valid vote
+    b.store_bulk_transactions([tx_create_signed])
-    block = b.create_block([tx_create_signed])
-    b.write_block(block)
-    vote = b.vote(block.id, genesis_block.id, True)
-    b.write_vote(vote)
 
     # Create a transfer transaction with duplicated fulfillments
     dup_inputs = tx_create.to_inputs() + tx_create.to_inputs()
@@ -736,8 +563,9 @@ def test_cant_spend_same_input_twice_in_tx(b, genesis_block, alice):
         tx_transfer_signed.validate(b)
 
 
-@pytest.mark.bdb
+@pytest.mark.tendermint
 def test_transaction_unicode(b, alice):
+    import copy
     from bigchaindb.common.utils import serialize
     from bigchaindb.models import Transaction
 
@@ -747,45 +575,8 @@ def test_transaction_unicode(b, alice):
 
     tx = (Transaction.create([alice.public_key], [([alice.public_key], 100)], beer_python)
           ).sign([alice.private_key])
-    block = b.create_block([tx])
-    b.write_block(block)
-    assert b.get_block(block.id) == block.to_dict()
-    assert block.validate(b) == block
-    assert beer_json in serialize(block.to_dict())
 
+    tx_1 = copy.deepcopy(tx)
+    b.store_bulk_transactions([tx])
 
-@pytest.mark.bdb
+    assert beer_json in serialize(tx_1.to_dict())
-def test_is_new_transaction(b, genesis_block, alice):
-    from bigchaindb.models import Transaction
-
-    def write_tx(n):
-        tx = Transaction.create([alice.public_key], [([alice.public_key], n)])
-        tx = tx.sign([alice.private_key])
-        # Tx is new because it's not in any block
-        assert b.is_new_transaction(tx.id)
-
-        block = b.create_block([tx])
-        b.write_block(block)
-        return tx, block
-
-    # test VALID case
-    tx, block = write_tx(1)
-    # Tx is now in undecided block
-    assert not b.is_new_transaction(tx.id)
-    assert b.is_new_transaction(tx.id, exclude_block_id=block.id)
-    # After voting valid, should not be new
-    vote = b.vote(block.id, genesis_block.id, True)
-    b.write_vote(vote)
-    assert not b.is_new_transaction(tx.id)
-    assert b.is_new_transaction(tx.id, exclude_block_id=block.id)
-
-    # test INVALID case
-    tx, block = write_tx(2)
-    # Tx is now in undecided block
-    assert not b.is_new_transaction(tx.id)
-    assert b.is_new_transaction(tx.id, exclude_block_id=block.id)
-    vote = b.vote(block.id, genesis_block.id, False)
-    b.write_vote(vote)
-    # Tx is new because it's only found in an invalid block
-    assert b.is_new_transaction(tx.id)
-    assert b.is_new_transaction(tx.id, exclude_block_id=block.id)