Skip to content

Backport bitcoin#11773: [tests] Change feature_block.py to use BitcoinTestFramework #3277

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
UdjinM6 merged 14 commits into from
Jan 11, 2020
Merged

Backport bitcoin#11773: [tests] Change feature_block.py to use BitcoinTestFramework #3277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
662d6d0
[tests] Fix flake8 warnings in feature_block.py
jnewbery Nov 22, 2017
f1beeb1
Temporarely rename MAX_BLOCK_SIZE -> MAX_BLOCK_BASE_SIZE
codablock Jan 4, 2020
1fee550
[tests] Tidy up feature_block.py
jnewbery Nov 22, 2017
9d75923
[tests] Add logging to feature_block.py
jnewbery Nov 22, 2017
7a81a42
[tests] Change feature_block.py to use BitcoinTestFramework
jnewbery Apr 8, 2017
07099ac
[tests] Improve assert message when wait_until() fails
jnewbery Dec 13, 2017
99748f0
Rename MAX_BLOCK_BASE_SIZE back to MAX_BLOCK_SIZE
codablock Jan 4, 2020
c037c23
Use DoS score of 100 for bad-blk-sigops
codablock Jan 4, 2020
6a9c964
Use allowOptimisticSend=true when sending reject messages
codablock Jan 4, 2020
3c8149f
Fix p2p-fullblocktest.py
codablock Jan 4, 2020
87d879d
Backport missing changes from bitcoin#13003
codablock Jan 5, 2020
91fad61
Merge #13048: [tests] Fix feature_block flakiness
Apr 22, 2018
c75f09c
Bump p2p-fullblocktest timeouts
codablock Jan 7, 2020
a300461
Increase RPC timeout in p2p-fullblocktest.py
codablock Jan 10, 2020
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
4 changes: 3 additions & 1 deletion src/net_processing.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3186,7 +3186,9 @@ static bool SendRejectsAndCheckIfBanned(CNode* pnode, CConnman* connman)
CNodeState &state = *State(pnode->GetId());

for (const CBlockReject& reject : state.rejects) {
connman->PushMessage(pnode, CNetMsgMaker(INIT_PROTO_VERSION).Make(NetMsgType::REJECT, (std::string)NetMsgType::BLOCK, reject.chRejectCode, reject.strRejectReason, reject.hashBlock));
// Pass allowOptimisticSend=true here to allow sending the reject message immediately instead of waiting for the
// network thread to do it. This gives us a chance of actually sending out the reject before we close the connection.
connman->PushMessage(pnode, CNetMsgMaker(INIT_PROTO_VERSION).Make(NetMsgType::REJECT, (std::string)NetMsgType::BLOCK, reject.chRejectCode, reject.strRejectReason, reject.hashBlock), true);
}
state.rejects.clear();

Expand Down
4 changes: 2 additions & 2 deletions src/validation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3357,7 +3357,7 @@ static bool ContextualCheckBlock(const CBlock& block, CValidationState& state, c
// Size limits
unsigned int nMaxBlockSize = MaxBlockSize(fDIP0001Active_context);
if (block.vtx.empty() || block.vtx.size() > nMaxBlockSize || ::GetSerializeSize(block, SER_NETWORK, PROTOCOL_VERSION) > nMaxBlockSize)
return state.DoS(10, false, REJECT_INVALID, "bad-blk-length", false, "size limits failed");
return state.DoS(100, false, REJECT_INVALID, "bad-blk-length", false, "size limits failed");

// Check that all transactions are finalized and not over-sized
// Also count sigops
Expand All @@ -3374,7 +3374,7 @@ static bool ContextualCheckBlock(const CBlock& block, CValidationState& state, c

// Check sigops
if (nSigOps > MaxBlockSigOps(fDIP0001Active_context))
return state.DoS(10, false, REJECT_INVALID, "bad-blk-sigops", false, "out-of-bounds SigOpCount");
return state.DoS(100, false, REJECT_INVALID, "bad-blk-sigops", false, "out-of-bounds SigOpCount");

// Enforce rule that the coinbase starts with serialized block height
// After DIP3/DIP4 activation, we don't enforce the height in the input script anymore.
Expand Down
Loading