Merge commit 'e2c75b0f' into poc-9

30584c7c · obscuren · 5dfc67ef · e2c75b0f · 30584c7c · 30584c7c
Commit 30584c7c authored Mar 08, 2015 by obscuren
Showing with 723 additions and 4 deletions

bcBlockChainTest.json tests/files/BlockTests/bcBlockChainTest.json +1 -1

bcUncleTest.json tests/files/BlockTests/bcUncleTest.json +707 -0

ethash_tests.json tests/files/PoWTests/ethash_tests.json +15 -3

No files found.
--- a/tests/files/BlockTests/bcBlockChainTest.json
+++ b/tests/files/BlockTests/bcBlockChainTest.json
@@ -105,4 +105,4 @@
            }
        }
    }
-}
\ No newline at end of file
+}
--- a/tests/files/BlockTests/bcUncleTest.json
+++ b/tests/files/BlockTests/bcUncleTest.json
--- a/tests/files/PoWTests/ethash_tests.json
+++ b/tests/files/PoWTests/ethash_tests.json
 {
    "first": {
        "nonce": "000000000000002a", 
-        "header": "f90213a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347940000000000000000000000000000000000000000a09178d0f23c965d81f0834a4c72c6253ce6830f4022b1359aaebfc1ecba442d4ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000082080080830f4240808080a00000000000000000000000000000000000000000000000000000000000000000a02d6d07473c065de9b3b3a2388562926b599b9e5d457acb84f12e420abfd570ff88000000000000002a", 
+        "mixhash": "86d46c9a313b096d66609ef84a334d6c3376d3a5e13b18aa5c666094ae04a1eb", 
+        "header": "f90213a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347940000000000000000000000000000000000000000a09178d0f23c965d81f0834a4c72c6253ce6830f4022b1359aaebfc1ecba442d4ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000082080080830f4240808080a00000000000000000000000000000000000000000000000000000000000000000a086d46c9a313b096d66609ef84a334d6c3376d3a5e13b18aa5c666094ae04a1eb88000000000000002a", 
        "seed": "0000000000000000000000000000000000000000000000000000000000000000", 
-        "result": "b89e367b101a53a09c28fc839d6913129b30a81f91bd6ee2a5f84758d932a693", 
+        "result": "a91eb868c6262d5456a696bd59cf67191ca7578c04dc72f40c5ece41fb1c3f9f", 
        "cache_size": 1048384, 
        "full_size": 1073739904, 
        "header_hash": "f71b596d43b462f63552a6d73a525dc777f172de3e9a023c8a85d3271144038b", 
        "cache_hash": "86a62f39bc1def6c35b54babdca953425392827c1992538c145bad931c546494"
+    },
+    "second": {
+        "nonce": "deabd91c21ade2ee", 
+        "mixhash": "64eed5af263695ac6c248cf6d0bb49d822ce9b7565cd1ef6c7ec5b2d3e58f98c", 
+        "number": 0, 
+        "header": "f90213a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347940000000000000000000000000000000000000000a09178d0f23c965d81f0834a4c72c6253ce6830f4022b1359aaebfc1ecba442d4ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000082080080830f4240808080a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a064eed5af263695ac6c248cf6d0bb49d822ce9b7565cd1ef6c7ec5b2d3e58f98c88deabd91c21ade2ee", 
+        "seed": "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", 
+        "result": "bcc43b3d16b0f022fbd0a6a8a3330b411a9013f8d8b401e0fe2368195cd1926d", 
+        "cache_size": 1048384, 
+        "full_size": 1073739904, 
+        "header_hash": "5171c7de44b0e86cafa28a2ee81bbdcc2ef0a3e08a407acf7c7f7674d9f17d0b", 
+        "cache_hash": "6df1ff657ed71b5b71d7d8ee32aac9d74316bc0ee42546c295b2cd5cfa4169bd"
    }
-}