LBRYCommunity/lbry-sdk
1
0
Fork 1
Code Issues Pull requests Packages Projects Releases 282 Wiki Activity

fix more merge conflicts

Browse source
This commit is contained in:
Jack Robison 2022-01-21 13:44:11 -05:00
parent 1ba8a430d7
commit 493470681b
No known key found for this signature in database
GPG key ID: DF25C68FE0239BB2
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
tests/integration/takeovers/test_resolve_command.py
View file

@ -95,8 +95,8 @@ class BaseResolveTestCase(CommandTestCase):
claim_from_es[0][0]['support_amount'])
async def assertMatchClaim(self, name, claim_id, is_active_in_lbrycrd=True):
claim = await self.conductor.spv_node.server.bp.db.fs_getclaimbyid(claim_id)
claim_from_es = await self.conductor.spv_node.server.bp.db.search_index.search(
claim = await self.conductor.spv_node.server.db.fs_getclaimbyid(claim_id)
claim_from_es = await self.conductor.spv_node.server.session_manager.search_index.search(
claim_id=claim.claim_hash.hex()
)
self.assertEqual(len(claim_from_es[0]), 1)
@ -168,7 +168,7 @@ class BaseResolveTestCase(CommandTestCase):
claim = db._fs_get_claim_by_hash(claim_hash)
self.assertMatchDBClaim(c, claim)
claim_from_es = await self.conductor.spv_node.server.bp.db.search_index.search(
claim_from_es = await self.conductor.spv_node.server.session_manager.search_index.search(
claim_id=claim_id
)
self.assertEqual(len(claim_from_es[0]), 1)
@ -183,7 +183,7 @@ class BaseResolveTestCase(CommandTestCase):
await self.assertMatchClaimIsWinning(name, winning_claim_id)
for non_winning in non_winning_claims:
claim = await self.assertMatchClaim(
non_winning.claim_id, is_active_in_lbrycrd=non_winning.active_in_lbrycrd
name, non_winning.claim_id, is_active_in_lbrycrd=non_winning.active_in_lbrycrd
)
self.assertEqual(non_winning.activation_height, claim.activation_height)
self.assertEqual(last_takeover_height, claim.last_takeover_height)
@ -1354,7 +1354,7 @@ class ResolveClaimTakeovers(BaseResolveTestCase):
# abandon the support that causes the winning claim to have the highest staked
tx = await self.daemon.jsonrpc_txo_spend(type='support', txid=controlling_support_tx.id)
await self.generate(1)
await self.assertMatchClaim(second_claim_id, is_active_in_lbrycrd=False)
await self.assertMatchClaim(name, second_claim_id, is_active_in_lbrycrd=False)
await self.assertMatchClaimIsWinning(name, first_claim_id)
await self.generate(1)