LBRYFoundation/lbry-sdk
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/lbry-sdk.git synced 2025-08-23 17:27:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

reorgs do not hang the wallet server

Browse source
This commit is contained in:
Lex Berezhny 2019-06-18 18:52:33 -04:00
parent bfeed40bfe
commit fd6cbe0f6c
2 changed files with 32 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lbrynet/wallet/server/db.py
View file

@ -310,7 +310,7 @@ class SQLDB:
claims = self._upsertable_claims(txos, header) claims = self._upsertable_claims(txos, header)
if claims: if claims:
self.db.executemany(""" self.db.executemany("""
INSERT INTO claim ( INSERT OR IGNORE INTO claim (
claim_hash, claim_id, claim_name, normalized, txo_hash, tx_position, amount, claim_hash, claim_id, claim_name, normalized, txo_hash, tx_position, amount,
claim_type, media_type, stream_type, timestamp, creation_timestamp, height, claim_type, media_type, stream_type, timestamp, creation_timestamp, height,
creation_height, release_time, activation_height, expiration_height, short_url) creation_height, release_time, activation_height, expiration_height, short_url)

32
tests/integration/test_resolve_command.py
View file

@ -9,7 +9,7 @@ from lbrynet.schema.compat import OldClaimMessage
from torba.client.hash import sha256, Base58 from torba.client.hash import sha256, Base58
class ResolveCommand(CommandTestCase): class BaseResolveTestCase(CommandTestCase):
def get_claim_id(self, tx): def get_claim_id(self, tx):
return tx['outputs'][0]['claim_id'] return tx['outputs'][0]['claim_id']
@ -21,6 +21,9 @@ class ResolveCommand(CommandTestCase):
else: else:
self.assertEqual(claim_id, other['claim_id']) self.assertEqual(claim_id, other['claim_id'])
class ResolveCommand(BaseResolveTestCase):
async def test_resolve_response(self): async def test_resolve_response(self):
channel_id = self.get_claim_id( channel_id = self.get_claim_id(
await self.channel_create('@abc', '0.01') await self.channel_create('@abc', '0.01')
@ -306,6 +309,33 @@ class ResolveCommand(CommandTestCase):
self.assertFalse(called_again.is_set()) self.assertFalse(called_again.is_set())
class ResolveAfterReorg(BaseResolveTestCase):
async def reorg(self, start):
blocks = self.ledger.headers.height - start
self.blockchain._block_expected = start - 1
# go back to start
await self.blockchain.invalidate_block(self.ledger.headers.hash(start).decode())
# go to previous + 1
await self.generate(blocks + 2)
async def test_reorg(self):
self.assertEqual(self.ledger.headers.height, 206)
name = '@abc'
channel_id = self.get_claim_id(
await self.channel_create(name, '0.01')
)
self.assertNotIn('error', (await self.resolve(name))[name])
await self.reorg(206)
self.assertNotIn('error', (await self.resolve(name))[name])
await self.channel_abandon(channel_id)
self.assertIn('error', (await self.resolve(name))[name])
await self.reorg(206)
self.assertIn('error', (await self.resolve(name))[name])
def generate_signed_legacy(address: bytes, output: Output): def generate_signed_legacy(address: bytes, output: Output):
decoded_address = Base58.decode(address) decoded_address = Base58.decode(address)
claim = OldClaimMessage() claim = OldClaimMessage()