[test]: remove duplicate WITNESS_SCALE_FACTOR

ismaelsadeeq · ismaelsadeeq · commit af3c18169a07 · 2024-05-03T10:30:50.000+01:00
diff --git a/test/functional/feature_taproot.py b/test/functional/feature_taproot.py
@@ -10,7 +10,6 @@
     create_block,
     add_witness_commitment,
     MAX_BLOCK_SIGOPS_WEIGHT,
-    WITNESS_SCALE_FACTOR,
 )
 from test_framework.messages import (
     COutPoint,
@@ -20,6 +19,7 @@
     CTxOut,
     SEQUENCE_FINAL,
     tx_from_hex,
+    WITNESS_SCALE_FACTOR,
 )
 from test_framework.script import (
     ANNEX_TAG,
diff --git a/test/functional/test_framework/blocktools.py b/test/functional/test_framework/blocktools.py
@@ -28,6 +28,7 @@
     ser_uint256,
     tx_from_hex,
     uint256_from_str,
+    WITNESS_SCALE_FACTOR,
 )
 from .script import (
     CScript,
@@ -45,7 +46,6 @@
 )
 from .util import assert_equal
 
-WITNESS_SCALE_FACTOR = 4
 MAX_BLOCK_SIGOPS = 20000
 MAX_BLOCK_SIGOPS_WEIGHT = MAX_BLOCK_SIGOPS * WITNESS_SCALE_FACTOR
 

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@`
`28`	`28`	`ser_uint256,`
`29`	`29`	`tx_from_hex,`
`30`	`30`	`uint256_from_str,`
	`31`	`+ WITNESS_SCALE_FACTOR,`
`31`	`32`	`)`
`32`	`33`	`from .script import (`
`33`	`34`	`CScript,`
`@@ -45,7 +46,6 @@`
`45`	`46`	`)`
`46`	`47`	`from .util import assert_equal`
`47`	`48`
`48`		`-WITNESS_SCALE_FACTOR = 4`
`49`	`49`	`MAX_BLOCK_SIGOPS = 20000`
`50`	`50`	`MAX_BLOCK_SIGOPS_WEIGHT = MAX_BLOCK_SIGOPS * WITNESS_SCALE_FACTOR`
`51`	`51`