mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-03-06 16:34:22 +01:00
test: use MiniWallet for p2p_blocksonly.py
This test can now be run even with the Bitcoin Core wallet disabled.
This commit is contained in:
parent
779aaa7f03
commit
9f767e8438
1 changed files with 14 additions and 12 deletions
|
@ -6,22 +6,25 @@
|
|||
|
||||
import time
|
||||
|
||||
from test_framework.blocktools import create_transaction
|
||||
from test_framework.messages import msg_tx
|
||||
from test_framework.p2p import P2PInterface, P2PTxInvStore
|
||||
from test_framework.test_framework import BitcoinTestFramework
|
||||
from test_framework.util import assert_equal
|
||||
from test_framework.wallet import MiniWallet
|
||||
|
||||
|
||||
class P2PBlocksOnly(BitcoinTestFramework):
|
||||
def set_test_params(self):
|
||||
self.setup_clean_chain = True
|
||||
self.num_nodes = 1
|
||||
self.extra_args = [["-blocksonly"]]
|
||||
|
||||
def skip_test_if_missing_module(self):
|
||||
self.skip_if_no_wallet()
|
||||
|
||||
def run_test(self):
|
||||
self.miniwallet = MiniWallet(self.nodes[0])
|
||||
# Add enough mature utxos to the wallet, so that all txs spend confirmed coins
|
||||
self.miniwallet.generate(2)
|
||||
self.nodes[0].generate(100)
|
||||
|
||||
self.blocksonly_mode_tests()
|
||||
self.blocks_relay_conn_tests()
|
||||
|
||||
|
@ -30,14 +33,14 @@ class P2PBlocksOnly(BitcoinTestFramework):
|
|||
assert_equal(self.nodes[0].getnetworkinfo()['localrelay'], False)
|
||||
|
||||
self.nodes[0].add_p2p_connection(P2PInterface())
|
||||
tx, txid, tx_hex = self.check_p2p_tx_violation()
|
||||
tx, txid, wtxid, tx_hex = self.check_p2p_tx_violation()
|
||||
|
||||
self.log.info('Check that txs from rpc are not rejected and relayed to other peers')
|
||||
tx_relay_peer = self.nodes[0].add_p2p_connection(P2PInterface())
|
||||
assert_equal(self.nodes[0].getpeerinfo()[0]['relaytxes'], True)
|
||||
|
||||
assert_equal(self.nodes[0].testmempoolaccept([tx_hex])[0]['allowed'], True)
|
||||
with self.nodes[0].assert_debug_log(['received getdata for: wtx {} peer=1'.format(txid)]):
|
||||
with self.nodes[0].assert_debug_log(['received getdata for: wtx {} peer=1'.format(wtxid)]):
|
||||
self.nodes[0].sendrawtransaction(tx_hex)
|
||||
tx_relay_peer.wait_for_tx(txid)
|
||||
assert_equal(self.nodes[0].getmempoolinfo()['size'], 1)
|
||||
|
@ -79,7 +82,7 @@ class P2PBlocksOnly(BitcoinTestFramework):
|
|||
# Ensure we disconnect if a block-relay-only connection sends us a transaction
|
||||
self.nodes[0].add_outbound_p2p_connection(P2PInterface(), p2p_idx=0, connection_type="block-relay-only")
|
||||
assert_equal(self.nodes[0].getpeerinfo()[0]['relaytxes'], False)
|
||||
_, txid, tx_hex = self.check_p2p_tx_violation(index=2)
|
||||
_, txid, _, tx_hex = self.check_p2p_tx_violation(index=2)
|
||||
|
||||
self.log.info("Check that txs from RPC are not sent to blockrelay connection")
|
||||
conn = self.nodes[0].add_outbound_p2p_connection(P2PTxInvStore(), p2p_idx=1, connection_type="block-relay-only")
|
||||
|
@ -95,19 +98,18 @@ class P2PBlocksOnly(BitcoinTestFramework):
|
|||
def check_p2p_tx_violation(self, index=1):
|
||||
self.log.info('Check that txs from P2P are rejected and result in disconnect')
|
||||
input_txid = self.nodes[0].getblock(self.nodes[0].getblockhash(index), 2)['tx'][0]['txid']
|
||||
tx = create_transaction(self.nodes[0], input_txid, self.nodes[0].getnewaddress(), amount=(50 - 0.001))
|
||||
txid = tx.rehash()
|
||||
tx_hex = tx.serialize().hex()
|
||||
utxo_to_spend = self.miniwallet.get_utxo(txid=input_txid)
|
||||
spendtx = self.miniwallet.create_self_transfer(from_node=self.nodes[0], utxo_to_spend=utxo_to_spend)
|
||||
|
||||
with self.nodes[0].assert_debug_log(['transaction sent in violation of protocol peer=0']):
|
||||
self.nodes[0].p2ps[0].send_message(msg_tx(tx))
|
||||
self.nodes[0].p2ps[0].send_message(msg_tx(spendtx['tx']))
|
||||
self.nodes[0].p2ps[0].wait_for_disconnect()
|
||||
assert_equal(self.nodes[0].getmempoolinfo()['size'], 0)
|
||||
|
||||
# Remove the disconnected peer
|
||||
del self.nodes[0].p2ps[0]
|
||||
|
||||
return tx, txid, tx_hex
|
||||
return spendtx['tx'], spendtx['txid'], spendtx['wtxid'], spendtx['hex']
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
|
|
Loading…
Add table
Reference in a new issue