mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-03-12 10:30:08 +01:00
Merge bitcoin/bitcoin#22150: test: Remove unused node from feature_nulldummy
fa2b6c62cd
test: Remove unused node from feature_nulldummy (MarcoFalke) Pull request description: This is confusing and might even slow down the test. This reverts a change that was added a year ago ind438d60
and then the need for it was removed by95d5d5e
six months ago. Top commit has no ACKs. Tree-SHA512: 9a86792e9a634cf7bbd4e7a21b1acdfc3baba1b1962fe2b9b73848436d10351d2326dca01313c097ba2342dde7207add73e731d053c0bfa888a5d8f2b233a7cf
This commit is contained in:
commit
898dd9e262
1 changed files with 4 additions and 4 deletions
|
@ -28,6 +28,7 @@ from test_framework.util import assert_equal, assert_raises_rpc_error
|
||||||
|
|
||||||
NULLDUMMY_ERROR = "non-mandatory-script-verify-flag (Dummy CHECKMULTISIG argument must be zero)"
|
NULLDUMMY_ERROR = "non-mandatory-script-verify-flag (Dummy CHECKMULTISIG argument must be zero)"
|
||||||
|
|
||||||
|
|
||||||
def trueDummy(tx):
|
def trueDummy(tx):
|
||||||
scriptSig = CScript(tx.vin[0].scriptSig)
|
scriptSig = CScript(tx.vin[0].scriptSig)
|
||||||
newscript = []
|
newscript = []
|
||||||
|
@ -40,18 +41,17 @@ def trueDummy(tx):
|
||||||
tx.vin[0].scriptSig = CScript(newscript)
|
tx.vin[0].scriptSig = CScript(newscript)
|
||||||
tx.rehash()
|
tx.rehash()
|
||||||
|
|
||||||
class NULLDUMMYTest(BitcoinTestFramework):
|
|
||||||
|
|
||||||
|
class NULLDUMMYTest(BitcoinTestFramework):
|
||||||
def set_test_params(self):
|
def set_test_params(self):
|
||||||
# Need two nodes so GBT (getblocktemplate) doesn't complain that it's not connected.
|
self.num_nodes = 1
|
||||||
self.num_nodes = 2
|
|
||||||
self.setup_clean_chain = True
|
self.setup_clean_chain = True
|
||||||
# This script tests NULLDUMMY activation, which is part of the 'segwit' deployment, so we go through
|
# This script tests NULLDUMMY activation, which is part of the 'segwit' deployment, so we go through
|
||||||
# normal segwit activation here (and don't use the default always-on behaviour).
|
# normal segwit activation here (and don't use the default always-on behaviour).
|
||||||
self.extra_args = [[
|
self.extra_args = [[
|
||||||
f'-segwitheight={COINBASE_MATURITY + 5}',
|
f'-segwitheight={COINBASE_MATURITY + 5}',
|
||||||
'-addresstype=legacy',
|
'-addresstype=legacy',
|
||||||
]] * 2
|
]]
|
||||||
|
|
||||||
def skip_test_if_missing_module(self):
|
def skip_test_if_missing_module(self):
|
||||||
self.skip_if_no_wallet()
|
self.skip_if_no_wallet()
|
||||||
|
|
Loading…
Add table
Reference in a new issue