From 061cc5f645b3f9a24630af53044598a7292bdaf8 Mon Sep 17 00:00:00 2001
From: codegeschrei <codegeschrei@gmail.com>
Date: Thu, 23 Aug 2018 15:40:32 +0200
Subject: [PATCH] Problem: there are still unused fixtures Solution: remove
 Merlin keys

---
 tests/commands/test_commands.py |  1 -
 tests/conftest.py               | 10 ----------
 2 files changed, 11 deletions(-)

diff --git a/tests/commands/test_commands.py b/tests/commands/test_commands.py
index a0c070d8..b3f0c58c 100644
--- a/tests/commands/test_commands.py
+++ b/tests/commands/test_commands.py
@@ -274,7 +274,6 @@ def test_calling_main(start_mock, monkeypatch):
     assert start_mock.called is True
 
 
-@patch('bigchaindb.config_utils.autoconfigure')
 @patch('bigchaindb.commands.bigchaindb.run_recover')
 @patch('bigchaindb.start.start')
 def test_recover_db_on_start(mock_run_recover,
diff --git a/tests/conftest.py b/tests/conftest.py
index 65d248ce..34e197ec 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -246,16 +246,6 @@ def merlin():
     return generate_key_pair()
 
 
-@pytest.fixture
-def merlin_privkey(merlin):
-    return merlin.private_key
-
-
-@pytest.fixture
-def merlin_pubkey(merlin):
-    return merlin.public_key
-
-
 @pytest.fixture
 def b():
     from bigchaindb import BigchainDB