Changeset View
Changeset View
Standalone View
Standalone View
test/functional/abc-p2p-compactblocks.py
| Show All 13 Lines | |||||
| from test_framework.test_framework import ComparisonTestFramework | from test_framework.test_framework import ComparisonTestFramework | ||||
| from test_framework.util import * | from test_framework.util import * | ||||
| from test_framework.comptool import TestManager, TestInstance, RejectResult | from test_framework.comptool import TestManager, TestInstance, RejectResult | ||||
| from test_framework.blocktools import * | from test_framework.blocktools import * | ||||
| import time | import time | ||||
| from test_framework.script import * | from test_framework.script import * | ||||
| from test_framework.cdefs import (ONE_MEGABYTE, LEGACY_MAX_BLOCK_SIZE, | from test_framework.cdefs import (ONE_MEGABYTE, LEGACY_MAX_BLOCK_SIZE, | ||||
| MAX_BLOCK_SIGOPS_PER_MB, MAX_TX_SIGOPS_COUNT) | MAX_BLOCK_SIGOPS_PER_MB, MAX_TX_SIGOPS_COUNT) | ||||
| from test_framework.txtools import pad_tx | |||||
| from collections import deque | from collections import deque | ||||
| class PreviousSpendableOutput(): | class PreviousSpendableOutput(): | ||||
| def __init__(self, tx=CTransaction(), n=-1): | def __init__(self, tx=CTransaction(), n=-1): | ||||
| self.tx = tx | self.tx = tx | ||||
| self.n = n # the output we're spending | self.n = n # the output we're spending | ||||
| ▲ Show 20 Lines • Show All 62 Lines • ▼ Show 20 Lines | def run_test(self): | ||||
| self.test.add_all_connections(self.nodes) | self.test.add_all_connections(self.nodes) | ||||
| # Start up network handling in another thread | # Start up network handling in another thread | ||||
| NetworkThread().start() | NetworkThread().start() | ||||
| # Set the blocksize to 2MB as initial condition | # Set the blocksize to 2MB as initial condition | ||||
| self.nodes[0].setexcessiveblock(self.excessive_block_size) | self.nodes[0].setexcessiveblock(self.excessive_block_size) | ||||
| self.test.run() | self.test.run() | ||||
| def add_transactions_to_block(self, block, tx_list): | def add_transactions_to_block(self, block, tx_list): | ||||
| [tx.rehash() for tx in tx_list] | for tx in tx_list: | ||||
| block.vtx.extend(tx_list) | pad_tx(tx) | ||||
| tx.rehash() | |||||
| block.vtx.extend(sorted(tx_list, key=lambda tx: tx.get_id())) | |||||
Fabien: If the block already contains transactions, you should sort all the transactions after you… | |||||
jasonbcoxAuthorUnsubmitted Done Inline ActionsGood catch. thank you jasonbcox: Good catch. thank you | |||||
| # this is a little handier to use than the version in blocktools.py | # this is a little handier to use than the version in blocktools.py | ||||
| def create_tx(self, spend_tx, n, value, script=CScript([OP_TRUE])): | def create_tx(self, spend_tx, n, value, script=CScript([OP_TRUE])): | ||||
| tx = create_transaction(spend_tx, n, b"", value, script) | tx = create_transaction(spend_tx, n, b"", value, script) | ||||
| return tx | return tx | ||||
| def next_block(self, number, spend=None, script=CScript([OP_TRUE]), block_size=0, extra_txns=0): | def next_block(self, number, spend=None, script=CScript([OP_TRUE]), block_size=0, extra_txns=0): | ||||
| if self.tip == None: | if self.tip == None: | ||||
| ▲ Show 20 Lines • Show All 78 Lines • ▼ Show 20 Lines | def next_block(self, number, spend=None, script=CScript([OP_TRUE]), block_size=0, extra_txns=0): | ||||
| script_output = CScript([b'\x00' * script_length]) | script_output = CScript([b'\x00' * script_length]) | ||||
| tx.vout.append(CTxOut(0, script_output)) | tx.vout.append(CTxOut(0, script_output)) | ||||
| # Add the tx to the list of transactions to be included | # Add the tx to the list of transactions to be included | ||||
| # in the block. | # in the block. | ||||
| self.add_transactions_to_block(block, [tx]) | self.add_transactions_to_block(block, [tx]) | ||||
| current_block_size += len(tx.serialize()) | current_block_size += len(tx.serialize()) | ||||
| # Order transactions canonically | |||||
| block.vtx = [block.vtx[0]] + \ | |||||
| sorted(block.vtx[1:], key=lambda tx: tx.get_id()) | |||||
| # Now that we added a bunch of transaction, we need to recompute | # Now that we added a bunch of transaction, we need to recompute | ||||
| # the merkle root. | # the merkle root. | ||||
| block.hashMerkleRoot = block.calc_merkle_root() | block.hashMerkleRoot = block.calc_merkle_root() | ||||
| # Check that the block size is what's expected | # Check that the block size is what's expected | ||||
| if block_size > 0: | if block_size > 0: | ||||
| assert_equal(len(block.serialize()), block_size) | assert_equal(len(block.serialize()), block_size) | ||||
| ▲ Show 20 Lines • Show All 166 Lines • Show Last 20 Lines | |||||
If the block already contains transactions, you should sort all the transactions after you added some to the block.
It works because you also added the sort in the next_block() function, but I think it could lead to errors in the future (i.e. calling the actually unused update_block function).