Madiator2011/lbry-sdk
1
0
Fork 0
forked from LBRYCommunity/lbry-sdk
Code Pull requests Activity

improve test_reorg_change_claim_height

Browse source
This commit is contained in:
Jack Robison 2020-04-05 16:58:36 -04:00
parent 57fd47022e
commit 87cdf1e3a0
No known key found for this signature in database
GPG key ID: DF25C68FE0239BB2
2 changed files with 32 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lbry/wallet/server/db/writer.py
View file

@ -435,7 +435,7 @@ class SQLDB:
def delete_claims_above_height(self, height: int): def delete_claims_above_height(self, height: int):
claim_hashes = [x[0] for x in self.execute( claim_hashes = [x[0] for x in self.execute(
"SELECT claim_hash FROM claim WHERE height>=?", (height, ) "SELECT claim_hash FROM claim WHERE height>?", (height, )
).fetchall()] ).fetchall()]
while claim_hashes: while claim_hashes:
batch = set(claim_hashes[:500]) batch = set(claim_hashes[:500])

44
tests/integration/blockchain/test_blockchain_reorganization.py
View file

@ -43,60 +43,78 @@ class BlockchainReorganizationTests(CommandTestCase):
txos, _, _, _ = await self.ledger.claim_search([], name='hovercraft') txos, _, _, _ = await self.ledger.claim_search([], name='hovercraft')
self.assertListEqual(txos, []) self.assertListEqual(txos, [])
still_valid = await self.daemon.jsonrpc_stream_create(
'still-valid', '1.0', file_path=self.create_upload_file(data=b'hi!')
)
await self.ledger.wait(still_valid)
await self.generate(1)
# create a claim and verify it's returned by claim_search # create a claim and verify it's returned by claim_search
self.assertEqual(self.ledger.headers.height, 206) self.assertEqual(self.ledger.headers.height, 207)
broadcast_tx = await self.daemon.jsonrpc_stream_create( broadcast_tx = await self.daemon.jsonrpc_stream_create(
'hovercraft', '1.0', file_path=self.create_upload_file(data=b'hi!') 'hovercraft', '1.0', file_path=self.create_upload_file(data=b'hi!')
) )
await self.ledger.wait(broadcast_tx) await self.ledger.wait(broadcast_tx)
await self.generate(1) await self.generate(1)
await self.ledger.wait(broadcast_tx, self.blockchain.block_expected) await self.ledger.wait(broadcast_tx, self.blockchain.block_expected)
self.assertEqual(self.ledger.headers.height, 207) self.assertEqual(self.ledger.headers.height, 208)
txos, _, _, _ = await self.ledger.claim_search([], name='hovercraft') txos, _, _, _ = await self.ledger.claim_search([], name='hovercraft')
self.assertEqual(1, len(txos)) self.assertEqual(1, len(txos))
txo = txos[0] txo = txos[0]
self.assertEqual(txo.tx_ref.id, broadcast_tx.id) self.assertEqual(txo.tx_ref.id, broadcast_tx.id)
self.assertEqual(txo.tx_ref.height, 207) self.assertEqual(txo.tx_ref.height, 208)
# check that our tx is in block 207 as returned by lbrycrdd # check that our tx is in block 208 as returned by lbrycrdd
invalidated_block_hash = (await self.ledger.headers.hash(207)).decode() invalidated_block_hash = (await self.ledger.headers.hash(208)).decode()
block_207 = await self.blockchain.get_block(invalidated_block_hash) block_207 = await self.blockchain.get_block(invalidated_block_hash)
self.assertIn(txo.tx_ref.id, block_207['tx']) self.assertIn(txo.tx_ref.id, block_207['tx'])
self.assertEqual(208, txos[0].tx_ref.height)
# reorg the last block dropping our claim tx # reorg the last block dropping our claim tx
await self.blockchain.invalidate_block(invalidated_block_hash) await self.blockchain.invalidate_block(invalidated_block_hash)
await self.blockchain.clear_mempool() await self.blockchain.clear_mempool()
await self.blockchain.generate(2) await self.blockchain.generate(2)
# verify the claim was dropped from block 207 as returned by lbrycrdd # verify the claim was dropped from block 208 as returned by lbrycrdd
reorg_block_hash = await self.blockchain.get_block_hash(207) reorg_block_hash = await self.blockchain.get_block_hash(208)
self.assertNotEqual(invalidated_block_hash, reorg_block_hash) self.assertNotEqual(invalidated_block_hash, reorg_block_hash)
block_207 = await self.blockchain.get_block(reorg_block_hash) block_207 = await self.blockchain.get_block(reorg_block_hash)
self.assertNotIn(txo.tx_ref.id, block_207['tx']) self.assertNotIn(txo.tx_ref.id, block_207['tx'])
# wait for the client to catch up and verify the reorg # wait for the client to catch up and verify the reorg
await asyncio.wait_for(self.on_header(208), 3.0) await asyncio.wait_for(self.on_header(209), 3.0)
await self.assertBlockHash(206)
await self.assertBlockHash(207) await self.assertBlockHash(207)
await self.assertBlockHash(208) await self.assertBlockHash(208)
client_reorg_block_hash = (await self.ledger.headers.hash(207)).decode() await self.assertBlockHash(209)
client_reorg_block_hash = (await self.ledger.headers.hash(208)).decode()
self.assertEqual(client_reorg_block_hash, reorg_block_hash) self.assertEqual(client_reorg_block_hash, reorg_block_hash)
# verify the dropped claim is no longer returned by claim search # verify the dropped claim is no longer returned by claim search
txos, _, _, _ = await self.ledger.claim_search([], name='hovercraft') txos, _, _, _ = await self.ledger.claim_search([], name='hovercraft')
self.assertListEqual(txos, []) self.assertListEqual(txos, [])
# verify the claim published a block earlier wasn't also reverted
txos, _, _, _ = await self.ledger.claim_search([], name='still-valid')
self.assertEqual(1, len(txos))
self.assertEqual(207, txos[0].tx_ref.height)
# broadcast the claim in a different block # broadcast the claim in a different block
new_txid = await self.blockchain.sendrawtransaction(hexlify(broadcast_tx.raw).decode()) new_txid = await self.blockchain.sendrawtransaction(hexlify(broadcast_tx.raw).decode())
self.assertEqual(broadcast_tx.id, new_txid) self.assertEqual(broadcast_tx.id, new_txid)
await self.blockchain.generate(1) await self.blockchain.generate(1)
# wait for the client to catch up # wait for the client to catch up
await asyncio.wait_for(self.on_header(209), 1.0) await asyncio.wait_for(self.on_header(210), 1.0)
# verify the claim is in the new block and that it is returned by claim_search # verify the claim is in the new block and that it is returned by claim_search
block_209 = await self.blockchain.get_block((await self.ledger.headers.hash(209)).decode()) block_210 = await self.blockchain.get_block((await self.ledger.headers.hash(210)).decode())
self.assertIn(txo.tx_ref.id, block_209['tx']) self.assertIn(txo.tx_ref.id, block_210['tx'])
txos, _, _, _ = await self.ledger.claim_search([], name='hovercraft') txos, _, _, _ = await self.ledger.claim_search([], name='hovercraft')
self.assertEqual(1, len(txos)) self.assertEqual(1, len(txos))
self.assertEqual(txos[0].tx_ref.id, new_txid) self.assertEqual(txos[0].tx_ref.id, new_txid)
self.assertEqual(210, txos[0].tx_ref.height)
# this should still be unchanged
txos, _, _, _ = await self.ledger.claim_search([], name='still-valid')
self.assertEqual(1, len(txos))
self.assertEqual(207, txos[0].tx_ref.height)