Skip to content

Fix p2p-fullblocktest.py #10

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
deadalnix merged 1 commit into from
May 12, 2017
Merged

Fix p2p-fullblocktest.py #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion qa/rpc-tests/p2p-fullblocktest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -693,7 +693,7 @@ def update_block(block_number, new_transactions):
b51 = block(51)
cb2 = create_coinbase(51, self.coinbase_pubkey)
b51 = update_block(51, [cb2])
yield rejected(RejectResult(16, b'bad-cb-multiple'))
yield rejected(RejectResult(16, b'bad-tx-coinbase'))

# A block w/ duplicate txns
# Note: txns have to be in the right position in the merkle tree to trigger this error
Expand Down
2 changes: 1 addition & 1 deletion src/validation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,7 +549,7 @@ bool CheckCoinbase(const CTransaction &tx, CValidationState &state,
bool CheckRegularTransaction(const CTransaction &tx, CValidationState &state,
bool fCheckDuplicateInputs) {
if (tx.IsCoinBase()) {
return state.DoS(100, false, REJECT_INVALID, "coinbase");
return state.DoS(100, false, REJECT_INVALID, "bad-tx-coinbase");
}

if (!CheckTransactionCommon(tx, state, fCheckDuplicateInputs)) {
Expand Down