From 592157b7594693da389e4bd9b2cdedbdba7556fc Mon Sep 17 00:00:00 2001 From: Sjors Provoost Date: Tue, 5 Aug 2025 13:19:45 +0200 Subject: [PATCH] test: move SEQUENCE_LOCKTIME flags to script --- test/functional/feature_bip68_sequence.py | 9 ++++----- test/functional/test_framework/script.py | 5 +++++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/test/functional/feature_bip68_sequence.py b/test/functional/feature_bip68_sequence.py index 2f54183fd70..ac2d56fb32b 100755 --- a/test/functional/feature_bip68_sequence.py +++ b/test/functional/feature_bip68_sequence.py @@ -24,6 +24,10 @@ from test_framework.messages import ( from test_framework.script import ( CScript, OP_TRUE, + SEQUENCE_LOCKTIME_DISABLE_FLAG, + SEQUENCE_LOCKTIME_TYPE_FLAG, + SEQUENCE_LOCKTIME_GRANULARITY, + SEQUENCE_LOCKTIME_MASK, ) from test_framework.test_framework import BitcoinTestFramework from test_framework.util import ( @@ -36,11 +40,6 @@ from test_framework.wallet import MiniWallet SCRIPT_W0_SH_OP_TRUE = script_to_p2wsh_script(CScript([OP_TRUE])) -SEQUENCE_LOCKTIME_DISABLE_FLAG = (1<<31) -SEQUENCE_LOCKTIME_TYPE_FLAG = (1<<22) # this means use time (0 means height) -SEQUENCE_LOCKTIME_GRANULARITY = 9 # this is a bit-shift -SEQUENCE_LOCKTIME_MASK = 0x0000ffff - # RPC error for non-BIP68 final transactions NOT_FINAL_ERROR = "non-BIP68-final" diff --git a/test/functional/test_framework/script.py b/test/functional/test_framework/script.py index 369bd2d7521..9386064f5dd 100644 --- a/test/functional/test_framework/script.py +++ b/test/functional/test_framework/script.py @@ -28,6 +28,11 @@ MAX_PUBKEYS_PER_MULTI_A = 999 LOCKTIME_THRESHOLD = 500000000 ANNEX_TAG = 0x50 +SEQUENCE_LOCKTIME_DISABLE_FLAG = (1<<31) +SEQUENCE_LOCKTIME_TYPE_FLAG = (1<<22) # this means use time (0 means height) +SEQUENCE_LOCKTIME_GRANULARITY = 9 # this is a bit-shift +SEQUENCE_LOCKTIME_MASK = 0x0000ffff + LEAF_VERSION_TAPSCRIPT = 0xc0 def hash160(s):