Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tests: Fix Taproot activation and wallet_taproot.py functional test #258

Merged
merged 5 commits into from
Dec 19, 2024
Merged

tests: Fix Taproot activation and wallet_taproot.py functional test #258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c2538c8
tests: Fixes feature_taproot.py functional test
gto90 Dec 18, 2024
f9c5e76
tests: Fixes feature_taproot.py functional test
gto90 Dec 18, 2024
4b7d732
Merge branch 'bugfix/test-feature_taproot' of https://github.com/Digi…
gto90 Dec 18, 2024
5096210
Merge branch 'develop' into bugfix/test-feature_taproot
gto90 Dec 18, 2024
c8214f8
Merge branch 'develop' into bugfix/test-feature_taproot
gto90 Dec 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions test/functional/feature_taproot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
# Test Taproot softfork (BIPs 340-342)

from test_framework.blocktools import (
COINBASE_MATURITY,
COINBASE_MATURITY_2,
create_coinbase,
create_block,
Expand Down Expand Up @@ -598,8 +597,8 @@ def byte_popper(expr):
SINGLE_SIG = {"inputs": [getter("sign")]}
SIG_ADD_ZERO = {"failure": {"sign": zero_appender(default_sign)}}

DUST_LIMIT = 600
MIN_FEE = 1300000
DUST_LIMIT = 60000
MIN_FEE = 130000000

# === Actual test cases ===

Expand Down Expand Up @@ -1462,7 +1461,7 @@ def test_spenders(self, node, spenders, input_counts):
def run_test(self):
# Post-taproot activation tests go first (pre-taproot tests' blocks are invalid post-taproot).
self.log.info("Post-activation tests...")
self.generate(self.nodes[1], COINBASE_MATURITY + 1)
self.generate(self.nodes[1], COINBASE_MATURITY_2 + 1)
self.test_spenders(self.nodes[1], spenders_taproot_active(), input_counts=[1, 2, 2, 2, 2, 3])

# Re-connect nodes in case they have been disconnected
Expand Down
11 changes: 6 additions & 5 deletions test/functional/rpc_blockchain.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,13 +155,14 @@ def _test_getblockchaininfo(self):
'taproot': {
'type': 'bip9',
'bip9': {
'status': 'defined',
'start_time': 4070908800,
'timeout': 4099766400,
'status': 'active',
'start_time': -1,
'timeout': 9223372036854775807,
'since': 0,
'min_activation_height': 0,
'min_activation_height': 0
},
'active': False
'height': 0,
'active': True
}
})

Expand Down