From 1ba8a430d73f03d9d1ae1c2f7c1bf23d481089cb Mon Sep 17 00:00:00 2001 From: Jack Robison Date: Fri, 21 Jan 2022 13:38:04 -0500 Subject: [PATCH] fix merge conflict --- tests/integration/takeovers/test_resolve_command.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/integration/takeovers/test_resolve_command.py b/tests/integration/takeovers/test_resolve_command.py index 875079bf9..7ef48c435 100644 --- a/tests/integration/takeovers/test_resolve_command.py +++ b/tests/integration/takeovers/test_resolve_command.py @@ -73,10 +73,8 @@ class BaseResolveTestCase(CommandTestCase): # ensure that if we do have the matching claim that it is not active self.assertEqual(expected['claims'][0]['effectiveamount'], 0) - claim_from_es = await self.conductor.spv_node.server.bp.db.search_index.search(claim_id=claim_id) - self.assertListEqual([], claim_from_es[0]) claim_from_es = await self.conductor.spv_node.server.session_manager.search_index.search(claim_id=claim_id) - self.assertIsNone(claim) + self.assertListEqual([], claim_from_es[0]) async def assertMatchWinningClaim(self, name): expected = json.loads(await self.blockchain._cli_cmnd('getclaimsfornamebybid', name, "[0]"))