Skip to content
This repository has been archived by the owner on Aug 2, 2022. It is now read-only.

Fix incorrect prune state of a signed_block issue for v2.1 #10354

Merged
merged 5 commits into from
May 12, 2021
Merged

Fix incorrect prune state of a signed_block issue for v2.1 #10354

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0cb5dfe
Update var prune_state after trxs get pruned in a block
nickjjzhao May 6, 2021
7227dc4
Add a new test case
nickjjzhao May 6, 2021
eefac70
Turn off opt p2p-reject-incomplete-blocks so light validation node ca…
nickjjzhao May 7, 2021
21503b4
Update assert condition
nickjjzhao May 10, 2021
14d6451
Remove new added opt p2p-reject-incomplete-blocks from the producer
nickjjzhao May 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update assert condition
  • Loading branch information
@nickjjzhao
nickjjzhao committed May 11, 2021
commit 21503b4d5b87472221fe7f0189f557eb5c5080fc
4 changes: 2 additions & 2 deletions tests/eosio_blocklog_prune_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@
Utils.Print("Pre waiting info for each node:\nproducer: {}\nfull: {},\nlight: {}".format(json.dumps(pvnPreInfo, indent=1), json.dumps(fvnPreInfo, indent=1), json.dumps(lvnPreInfo, indent=1)))
Utils.Print("Post light validation waiting info for each node:\nproducer: {}\nfull: {},\nlight: {}".format(json.dumps(pvnPostInfo, indent=1), json.dumps(fvnPostInfo, indent=1), json.dumps(lvnPostInfo, indent=1)))

assert headAdvanced or lvnPostInfo["head_block_num"] > cfTrxBlockNum, "the light validation node stops syncing"
assert headAdvanced or lvnPostInfo["head_block_num"] >= cfTrxBlockNum, "the light validation node stops syncing"

fullValidationNode.waitForBlock(cfTrxBlockNum-1, blockType=BlockType.lib, timeout=WaitSpec.calculate(), errorContext="fullValidationNode LIB did not advance")
Utils.Print("Ensure full validation node stops syncing")
Expand All @@ -186,7 +186,7 @@
Utils.Print("Post light validation waiting info for each node:\nproducer: {}\nfull: {},\nlight: {}".format(json.dumps(pvnPostInfo, indent=1), json.dumps(fvnPostInfo, indent=1), json.dumps(lvnPostInfo, indent=1)))
Utils.Print("Post full validation waiting info for each node:\nproducer: {}\nfull: {},\nlight: {}".format(json.dumps(pvnPost2Info, indent=1), json.dumps(fvnPost2Info, indent=1), json.dumps(lvnPost2Info, indent=1)))

assert (not headAdvanced) or (fvnPost2Info["head_block_num"]<=cfTrxBlockNum), "the full validation node is still syncing"
assert (not headAdvanced) or (fvnPost2Info["head_block_num"] < cfTrxBlockNum), "the full validation node is still syncing"

testSuccessful = True
finally:
Expand Down