Changed fixtures submodule commit in order to pass transaction tests. Fixed the difficulty tests.

Author: RomanZacharia

ethereum/tests/test_difficulty.py

@@ -25,12 +25,19 @@ def test_difficulty(filename, testname, testdata):
     reference_dif = int(testdata["currentDifficulty"], 10 if testdata["currentDifficulty"].isdigit() else 16)
 
 
+    env = tester.state().env
+    if 'Homestead' in filename:
+        env.config['HOMESTEAD_FORK_BLKNUM'] = 0
+    if 'difficultyMorden' in filename:
+        env.config['HOMESTEAD_FORK_BLKNUM'] = 494000
+
     parent_bh = blocks.BlockHeader(timestamp=parent_timestamp,
                              difficulty=parent_difficulty,
                              number=parent_blk_number)
-    block = blocks.Block(parent_bh, [], env=tester.state().env,
+    block = blocks.Block(parent_bh, [], env=env,
                       making=True)
 
+
     calculated_dif = blocks.calc_difficulty(block, cur_blk_timestamp)
 
     print calculated_dif

ethereum/testutils.py

@@ -576,18 +576,19 @@ def generate_test_params(testsource, metafunc, skip_func=None, exclude_func=None
     base_dir = os.path.dirname(os.path.dirname(__file__))
     params = []
     for filename, tests in fixtures.items():
-        filename = os.path.relpath(filename, base_dir)
-        for testname, testdata in tests.items():
-            if exclude_func and exclude_func(filename, testname, testdata):
-                continue
-            if skip_func:
-                skipif = pytest.mark.skipif(
-                    skip_func(filename, testname, testdata),
-                    reason="Excluded"
-                )
-                params.append(skipif((filename, testname, testdata)))
-            else:
-                params.append((filename, testname, testdata))
+        if isinstance(tests, dict):
+            filename = os.path.relpath(filename, base_dir)
+            for testname, testdata in tests.items():
+                if exclude_func and exclude_func(filename, testname, testdata):
+                    continue
+                if skip_func:
+                    skipif = pytest.mark.skipif(
+                        skip_func(filename, testname, testdata),
+                        reason="Excluded"
+                    )
+                    params.append(skipif((filename, testname, testdata)))
+                else:
+                    params.append((filename, testname, testdata))
 
     metafunc.parametrize(
         ('filename', 'testname', 'testdata'),