mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2024-11-19 09:53:47 +01:00
Code Issues Projects Releases Wiki Activity

Merge bitcoin/bitcoin#23873: test: use MiniWallet for p2p_compactblocks.py

Browse Source 
d2efb66458 test: use MiniWallet for p2p_compactblocks.py (Sebastian Falbesoner)

Pull request description:

  This PR enables one more of the non-wallet functional tests (p2p_compactblocks.py) to be run even with the Bitcoin Core wallet disabled by using the MiniWallet instead, as proposed in #20078.

  The wallet RPCs calls (`getnewaddress`/`sendtoaddress`) can easily be substituted by generating/sending to the MiniWallet's internal address instead (`self.generate(self.wallet, ...)`/`self.wallet.send_self_transfer(...)`).

ACKs for top commit:
  josibake:
    ACK d2efb66458
  brunoerg:
    tACK d2efb66458

Tree-SHA512: 25340d95199ffd1fa734231c22b7710aad1ed4cda78c8c533c19cea90dc4eab65832f043d20e4fc5c0869692b1f300ad79af4e7fd3c4af8f2578ac9ccbbc9aeb
This commit is contained in:
MarcoFalke 2021-12-28 13:38:31 +01:00
commit 587cbca826
No known key found for this signature in database
GPG Key ID: CE2B75697E69A548
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/functional/p2p_compactblocks.py
View File

@ -65,6 +65,8 @@ from test_framework.util import (
assert_equal, assert_equal,
softfork_active, softfork_active,
) )
from test_framework.wallet import MiniWallet
# TestP2PConn: A peer we use to send messages to bitcoind, and store responses. # TestP2PConn: A peer we use to send messages to bitcoind, and store responses.
class TestP2PConn(P2PInterface): class TestP2PConn(P2PInterface):
@ -150,9 +152,6 @@ class CompactBlocksTest(BitcoinTestFramework):
]] ]]
self.utxos = [] self.utxos = []
def skip_test_if_missing_module(self):
self.skip_if_no_wallet()
def build_block_on_tip(self, node, segwit=False): def build_block_on_tip(self, node, segwit=False):
block = create_block(tmpl=node.getblocktemplate(NORMAL_GBT_REQUEST_PARAMS)) block = create_block(tmpl=node.getblocktemplate(NORMAL_GBT_REQUEST_PARAMS))
if segwit: if segwit:
@ -165,7 +164,7 @@ class CompactBlocksTest(BitcoinTestFramework):
block = self.build_block_on_tip(self.nodes[0]) block = self.build_block_on_tip(self.nodes[0])
self.segwit_node.send_and_ping(msg_no_witness_block(block)) self.segwit_node.send_and_ping(msg_no_witness_block(block))
assert int(self.nodes[0].getbestblockhash(), 16) == block.sha256 assert int(self.nodes[0].getbestblockhash(), 16) == block.sha256
self.generatetoaddress(self.nodes[0], COINBASE_MATURITY, self.nodes[0].getnewaddress(address_type="bech32")) self.generate(self.wallet, COINBASE_MATURITY)
total_value = block.vtx[0].vout[0].nValue total_value = block.vtx[0].vout[0].nValue
out_value = total_value // 10 out_value = total_value // 10
@ -296,12 +295,10 @@ class CompactBlocksTest(BitcoinTestFramework):
# Generate a bunch of transactions. # Generate a bunch of transactions.
self.generate(node, COINBASE_MATURITY + 1) self.generate(node, COINBASE_MATURITY + 1)
num_transactions = 25 num_transactions = 25
address = node.getnewaddress()
segwit_tx_generated = False segwit_tx_generated = False
for _ in range(num_transactions): for _ in range(num_transactions):
txid = node.sendtoaddress(address, 0.1) hex_tx = self.wallet.send_self_transfer(from_node=self.nodes[0])['hex']
hex_tx = node.gettransaction(txid)["hex"]
tx = tx_from_hex(hex_tx) tx = tx_from_hex(hex_tx)
if not tx.wit.is_null(): if not tx.wit.is_null():
segwit_tx_generated = True segwit_tx_generated = True
@ -843,8 +840,7 @@ class CompactBlocksTest(BitcoinTestFramework):
assert_highbandwidth_states(self.nodes[0], hb_to=True, hb_from=False) assert_highbandwidth_states(self.nodes[0], hb_to=True, hb_from=False)
def run_test(self): def run_test(self):
# Get the nodes out of IBD self.wallet = MiniWallet(self.nodes[0])
self.generate(self.nodes[0], 1)
# Setup the p2p connections # Setup the p2p connections
self.segwit_node = self.nodes[0].add_p2p_connection(TestP2PConn(cmpct_version=2)) self.segwit_node = self.nodes[0].add_p2p_connection(TestP2PConn(cmpct_version=2))