Adjust tests for HF

Author: konradkonrad

ethereum/tests/test_blocks.py

@@ -106,7 +106,10 @@ def run_block_test(params, config_overrides={}):
 
 
 def test_block(filename, testname, testdata):
-    run_block_test(testdata, {'HOMESTEAD_FORK_BLKNUM':0 if 'Homestead' in filename else 5 if 'TestNetwork' in filename else 1000000 })
+    run_block_test(testdata, {
+        'HOMESTEAD_FORK_BLKNUM': 0 if 'Homestead' in filename else 5 if 'TestNetwork' in filename else 1000000,
+        'DAO_FORK_BLKNUM': 8 if 'bcTheDaoTest' in filename else 1920000
+    })
 
 
 excludes = {
@@ -134,14 +137,16 @@ def main():
                     print("Testing: %s %s" % (filename, testname))
                     run_block_test(testdata, {
                         'HOMESTEAD_FORK_BLKNUM': 0 if 'Homestead' in filename else 5 if 'TestNetwork' in filename
-                        else 1000000})
+                        else 1000000,
+                        'DAO_FORK_BLKNUM': 8 if 'bcTheDaoTest' in filename else 1920000})
     else:
         for filename, tests in list(fixtures.items()):
             for testname, testdata in list(tests.items()):
                 if (filename.split('/')[-1], testname) not in excludes:
                     print("Testing: %s %s" % (filename, testname))
                     run_block_test(testdata, {
-                        'HOMESTEAD_FORK_BLKNUM': 0 if 'Homestead' in filename else 5 if 'TestNetwork' in filename else 1000000})
+                        'HOMESTEAD_FORK_BLKNUM': 0 if 'Homestead' in filename else 5 if 'TestNetwork' in filename else 1000000,
+                        'DAO_FORK_BLKNUM': 8 if 'bcTheDaoTest' in filename else 1920000})
 
 
 if __name__ == '__main__':