1919from test_framework .test_framework import DashTestFramework
2020from test_framework .util import (
2121 assert_equal ,
22- assert_greater_than ,
2322 get_bip9_details ,
2423)
2524
@@ -133,12 +132,10 @@ def run_test(self):
133132 self .set_sporks ()
134133 self .activate_v20 ()
135134 self .log .info (f"After v20 activation should be plenty of blocks: { node .getblockcount ()} " )
136- assert_greater_than (node .getblockcount (), 900 )
137- assert_equal (get_bip9_details (node , 'testdummy' )['status' ], 'defined' )
138135
139136 self .log .info ("Mine a quorum..." )
140137 self .mine_quorum ()
141- assert_equal ( get_bip9_details ( node , 'testdummy' )[ 'status' ], 'defined' )
138+ self . check_fork ( 'defined' )
142139
143140 key = ECKey ()
144141 key .generate ()
@@ -154,9 +151,6 @@ def run_test(self):
154151 self .log .info ("Checking correctness of requestId and quorumHash" )
155152 assert_equal (mnehf_payload .quorumHash , int (self .mninfo [0 ].node .quorum ("selectquorum" , 100 , 'a0eee872d7d3170dd20d5c5e8380c92b3aa887da5f63d8033289fafa35a90691' )["quorumHash" ], 16 ))
156153
157- assert_equal (get_bip9_details (node , 'testdummy' )['status' ], 'defined' )
158- assert_equal (get_bip9_details (node , 'mn_rr' )['status' ], 'defined' )
159-
160154 ehf_tx_sent = self .send_tx (ehf_tx )
161155 self .log .info (f"ehf tx: { ehf_tx_sent } " )
162156 ehf_unknown_tx_sent = self .send_tx (ehf_unknown_tx )
@@ -251,8 +245,8 @@ def run_test(self):
251245
252246 ehf_tx_new_start = self .create_mnehf (28 , pubkey )
253247
254- self .log .info ("activate MN_RR also by enabling spork 24" )
255- assert_equal ( get_bip9_details ( node , 'mn_rr' )[ 'status' ], 'defined' )
248+ self .log .info ("Test spork 24 (EHF) " )
249+ self . check_fork ( 'defined' )
256250 self .nodes [0 ].sporkupdate ("SPORK_24_TEST_EHF" , 0 )
257251 self .wait_for_sporks_same ()
258252
@@ -268,8 +262,6 @@ def run_test(self):
268262 self .check_fork ('defined' )
269263 self .slowly_generate_batch (12 * 4 )
270264 self .check_fork ('active' )
271- self .log .info (f"bip9: { get_bip9_details (node , 'mn_rr' )} " )
272- assert_equal (get_bip9_details (node , 'mn_rr' )['status' ], 'active' )
273265
274266
275267if __name__ == '__main__' :
0 commit comments