From fafe896a0b870d85250927bd5374caf73d379468 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Thu, 5 Aug 2021 12:06:23 +0200
Subject: test: Set regtest.BIP66Height = 102 to speed up tests

---
 test/functional/feature_dersig.py            | 7 ++++---
 test/functional/rpc_blockchain.py            | 3 ++-
 test/functional/test_framework/blocktools.py | 1 +
 3 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'test')

diff --git a/test/functional/feature_dersig.py b/test/functional/feature_dersig.py
index eb027c554a..5dd6cb6cb2 100755
--- a/test/functional/feature_dersig.py
+++ b/test/functional/feature_dersig.py
@@ -4,10 +4,11 @@
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 """Test BIP66 (DER SIG).
 
-Test that the DERSIG soft-fork activates at (regtest) height 1251.
+Test the DERSIG soft-fork activation on regtest.
 """
 
 from test_framework.blocktools import (
+    DERSIG_HEIGHT,
     create_block,
     create_coinbase,
 )
@@ -23,8 +24,6 @@ from test_framework.wallet import (
     MiniWalletMode,
 )
 
-DERSIG_HEIGHT = 1251
-
 
 # A canonical signature consists of:
 # <30> <total len> <02> <len R> <R> <02> <len S> <S> <hashtype>
@@ -90,8 +89,10 @@ class BIP66Test(BitcoinTestFramework):
         block.rehash()
         block.solve()
 
+        assert_equal(self.nodes[0].getblockcount(), DERSIG_HEIGHT - 2)
         self.test_dersig_info(is_active=False)  # Not active as of current tip and next block does not need to obey rules
         peer.send_and_ping(msg_block(block))
+        assert_equal(self.nodes[0].getblockcount(), DERSIG_HEIGHT - 1)
         self.test_dersig_info(is_active=True)  # Not active as of current tip, but next block must obey rules
         assert_equal(self.nodes[0].getbestblockhash(), block.hash)
 
diff --git a/test/functional/rpc_blockchain.py b/test/functional/rpc_blockchain.py
index 721e3f93a3..1e73dcf5cd 100755
--- a/test/functional/rpc_blockchain.py
+++ b/test/functional/rpc_blockchain.py
@@ -27,6 +27,7 @@ import subprocess
 
 from test_framework.address import ADDRESS_BCRT1_P2WSH_OP_TRUE
 from test_framework.blocktools import (
+    DERSIG_HEIGHT,
     create_block,
     create_coinbase,
     TIME_GENESIS_BLOCK,
@@ -141,7 +142,7 @@ class BlockchainTest(BitcoinTestFramework):
 
         assert_equal(res['softforks'], {
             'bip34': {'type': 'buried', 'active': True, 'height': 2},
-            'bip66': {'type': 'buried', 'active': False, 'height': 1251},
+            'bip66': {'type': 'buried', 'active': True, 'height': DERSIG_HEIGHT},
             'bip65': {'type': 'buried', 'active': False, 'height': 1351},
             'csv': {'type': 'buried', 'active': False, 'height': 432},
             'segwit': {'type': 'buried', 'active': True, 'height': 0},
diff --git a/test/functional/test_framework/blocktools.py b/test/functional/test_framework/blocktools.py
index a88a119e6f..0c7aaee306 100644
--- a/test/functional/test_framework/blocktools.py
+++ b/test/functional/test_framework/blocktools.py
@@ -55,6 +55,7 @@ TIME_GENESIS_BLOCK = 1296688602
 COINBASE_MATURITY = 100
 
 # Soft-fork activation heights
+DERSIG_HEIGHT = 102  # BIP 66
 CLTV_HEIGHT = 1351
 CSV_ACTIVATION_HEIGHT = 432
 
-- 
cgit v1.2.3