sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-26 04:22:55 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge bitcoin/bitcoin#21867: test: use MiniWallet for p2p_blocksonly.py

Browse Source 
9f767e84381d678ed24e3f7f981976f9da34971e test: use MiniWallet for p2p_blocksonly.py (Sebastian Falbesoner)

Pull request description:

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

  Note that MiniWallet creates segwit transactions by default, i.e. txid and wtxid are not identical and we have to return both from `check_p2p_tx_violation(...)`: wtxid is needed to match an expected `"received getdata for: wtx ..."` debug output, whereas the txid is needed to wait for a certain tx via `wait_for_tx(...)`.

ACKs for top commit:
  jonatack:
    ACK 9f767e84381d678ed24e3f7f981976f9da34971e tested with `--disable-wallet`

Tree-SHA512: f08001f02c3c310ccdf713af0ba17304368a36414f412749908bbe8c03ad1e902190b8768b79f3b4909855762f285e7ab1b627cc4f45c90b42bb097a43cb4318
This commit is contained in:
MarcoFalke 2021-05-06 16:52:45 +02:00 committed by Konstantin Akimov
parent 81d21eea14
commit 1dffe3ab9f
No known key found for this signature in database
GPG Key ID: 2176C4A5D01EA524
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
test/functional/p2p_blocksonly.py
View File

@ -6,22 +6,25 @@
import time import time
from test_framework.blocktools import create_transaction
from test_framework.messages import msg_tx from test_framework.messages import msg_tx
from test_framework.p2p import P2PInterface, P2PTxInvStore from test_framework.p2p import P2PInterface, P2PTxInvStore
from test_framework.test_framework import BitcoinTestFramework from test_framework.test_framework import BitcoinTestFramework
from test_framework.util import assert_equal from test_framework.util import assert_equal
from test_framework.wallet import MiniWallet
class P2PBlocksOnly(BitcoinTestFramework): class P2PBlocksOnly(BitcoinTestFramework):
def set_test_params(self): def set_test_params(self):
self.setup_clean_chain = True
self.num_nodes = 1 self.num_nodes = 1
self.extra_args = [["-blocksonly"]] self.extra_args = [["-blocksonly"]]
def skip_test_if_missing_module(self):
self.skip_if_no_wallet()
def run_test(self): 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.blocksonly_mode_tests()
self.blocks_relay_conn_tests() self.blocks_relay_conn_tests()
@ -96,19 +99,18 @@ class P2PBlocksOnly(BitcoinTestFramework):
def check_p2p_tx_violation(self, index=1): def check_p2p_tx_violation(self, index=1):
self.log.info('Check that txs from P2P are rejected and result in disconnect') 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'] 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=(500 - 0.001)) utxo_to_spend = self.miniwallet.get_utxo(txid=input_txid)
txid = tx.rehash() spendtx = self.miniwallet.create_self_transfer(from_node=self.nodes[0], utxo_to_spend=utxo_to_spend)
tx_hex = tx.serialize().hex()
with self.nodes[0].assert_debug_log(['tx sent in violation of protocol peer=0']): with self.nodes[0].assert_debug_log(['tx 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() self.nodes[0].p2ps[0].wait_for_disconnect()
assert_equal(self.nodes[0].getmempoolinfo()['size'], 0) assert_equal(self.nodes[0].getmempoolinfo()['size'], 0)
# Remove the disconnected peer # Remove the disconnected peer
del self.nodes[0].p2ps[0] del self.nodes[0].p2ps[0]
return tx, txid, tx_hex return spendtx['tx'], spendtx['txid'], spendtx['hex']
if __name__ == '__main__': if __name__ == '__main__':