ethereum · obscuren · Jul 29, 2015 · Jul 29, 2015
diff --git a/tests/block_test.go b/tests/block_test.go
@@ -17,36 +17,17 @@
 package tests
 
 import (
-	"math/big"
 	"path/filepath"
 	"testing"
-
-	"github.com/ethereum/go-ethereum/core"
 )
 
-func init() {
-	// XXX remove me when block tests have been updated
-	core.BlockReward = big.NewInt(1.5e+18)
-}
-
 func TestBcValidBlockTests(t *testing.T) {
 	err := RunBlockTest(filepath.Join(blockTestDir, "bcValidBlockTest.json"), BlockSkipTests)
 	if err != nil {
 		t.Fatal(err)
 	}
 }
 
-func TestBcUncleTests(t *testing.T) {
-	err := RunBlockTest(filepath.Join(blockTestDir, "bcUncleTest.json"), BlockSkipTests)
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = RunBlockTest(filepath.Join(blockTestDir, "bcBruncleTest.json"), BlockSkipTests)
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
 func TestBcUncleHeaderValidityTests(t *testing.T) {
 	err := RunBlockTest(filepath.Join(blockTestDir, "bcUncleHeaderValiditiy.json"), BlockSkipTests)
 	if err != nil {

diff --git a/tests/files/ABITests/basic_abi_tests.json b/tests/files/ABITests/basic_abi_tests.json
diff --git a/tests/files/BasicTests/blockgenesistest.json b/tests/files/BasicTests/blockgenesistest.json
diff --git a/tests/files/BasicTests/crypto.json b/tests/files/BasicTests/crypto.json
diff --git a/tests/files/BasicTests/genesishashestest.json b/tests/files/BasicTests/genesishashestest.json
diff --git a/tests/files/BasicTests/hexencodetest.json b/tests/files/BasicTests/hexencodetest.json
diff --git a/tests/files/BasicTests/keyaddrtest.json b/tests/files/BasicTests/keyaddrtest.json
diff --git a/tests/files/BasicTests/rlptest.json b/tests/files/BasicTests/rlptest.json
diff --git a/tests/files/BasicTests/txtest.json b/tests/files/BasicTests/txtest.json
diff --git a/tests/files/BlockchainTests/RandomTests/bl10251623GO.json b/tests/files/BlockchainTests/RandomTests/bl10251623GO.json
@@ -0,0 +1,65 @@
+
+
+{
+    "randomBlockTest" : {
+        "blocks" : [
+            {
+                "rlp" : "0xf90200f901fba0335308346793ec1eb6cc16eef19f1ff027ceefa34c9b7a5ecd7402ea5877ebada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942219451200266cfd877c592688f576037a7900e2a05adaee38b9f78988ca2496bbc1727456815eeeeaa26e309dac7c4389824a8ae1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302004001832fefd88088c97e2552cf26c85780a0fdd49bed77192d2763d8de89c8623c6df019f3cceb97f7c9fb1594870dbd581788960de57ff83fd34dc0c0"
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2219451200266cfd877c592688f576037a7900e2",
+            "difficulty" : "0x020000",
+            "extraData" : "0x7003d4b0321b9d4fc771e127daf787d407c065f371b35aac34f3674e40b5003451919c756835f9108395e257dfce878b12a9d99aa1471920bd3a07727ffa859f39172e0e4bdf66fb0b75993b67de9078e87975af2a78917dd6ebb2c5a8c669d16ccfe9bf174b216a81033665a0b81f8c75937797c9a8402b2fd36080733ce2a6022de56496d83239c296aa6ae2d722212b83b8c1b1299f7e2c50ecd443d445faea68a430371a0dde476c072c45e2b100c1b9e11cad8c4170b9d44d1cb29adf09534336acdbc8d5c52170260c9da3de0e7b78d3c9da27ab1857f790a464c4db92ef8b72a502bf00767b72b913e989723d943a28a43b96675da3f8efd436dd3b629336a271e46fcd1ff8747eb681c352d30532a819bddc66a3e941af314e3065d55102060a65760aea6cd017a180c8b33c9dc2020c5d238856f776a02e95783b01ad0737c864d2cb5436adf3366171a1b6e1c7ab713cba0e7db2b0c976c747136f63e3f08d3e51b3a26213ac3c8a720c0ed27f3d655dbb74a9faff3e7b722ede8352988734037897378f526d8499755919f3bb36eafdbc0e21fa01d713e5d672a26937ead56ae807e680c823d51c7ef91170ed5bc81b136ee43bff961eae5310bc6e626b70ce18dcf2b776acaf63004f6590dbce8e893b6399acdfe176b3198b754e7c48a2a5916a09dfd6c923613ce1a72105df6b422d73d68f7015705d1fb1f3736bd6c0492e0b8d44165184c9175bf4a3c2feb0c070dc8d587c45d493f3ab736c9316422d7f6e654faeeacb202c7ee4eedfe56112d4466a6d39d12463af335b1e81033d75aaf3ebdb014f048edb6238874870885a79c327d276abdf7833223204cfabbe787cb5f73d799a3e8867b397867c0db5b6de6050b0f2e91f6433705d90ea4fb89f325eae47b3087c270b94258f",
+            "gasLimit" : "0x2fefd8",
+            "gasUsed" : "0x00",
+            "hash" : "335308346793ec1eb6cc16eef19f1ff027ceefa34c9b7a5ecd7402ea5877ebad",
+            "mixHash" : "bf95450fbebfcb92bd1d3a67d2d7b88f4868cccef36bd9d4d534ed4dcd5928a9",
+            "nonce" : "74217d8e224e3189",
+            "number" : "0x00",
+            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "98aaca75380c46b58a50fb7076cdd2e6dc376364763415c473ab89fd184f5417",
+            "stateRoot" : "36c549e72161cec71e4cc6059c728d4ef3d3199ec3b53809833356932d3ba0d2",
+            "timestamp" : "0xc97e2552cf26c856",
+            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf90493f9048ea00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942219451200266cfd877c592688f576037a7900e2a036c549e72161cec71e4cc6059c728d4ef3d3199ec3b53809833356932d3ba0d2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a098aaca75380c46b58a50fb7076cdd2e6dc376364763415c473ab89fd184f5417b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080832fefd88088c97e2552cf26c856b902917003d4b0321b9d4fc771e127daf787d407c065f371b35aac34f3674e40b5003451919c756835f9108395e257dfce878b12a9d99aa1471920bd3a07727ffa859f39172e0e4bdf66fb0b75993b67de9078e87975af2a78917dd6ebb2c5a8c669d16ccfe9bf174b216a81033665a0b81f8c75937797c9a8402b2fd36080733ce2a6022de56496d83239c296aa6ae2d722212b83b8c1b1299f7e2c50ecd443d445faea68a430371a0dde476c072c45e2b100c1b9e11cad8c4170b9d44d1cb29adf09534336acdbc8d5c52170260c9da3de0e7b78d3c9da27ab1857f790a464c4db92ef8b72a502bf00767b72b913e989723d943a28a43b96675da3f8efd436dd3b629336a271e46fcd1ff8747eb681c352d30532a819bddc66a3e941af314e3065d55102060a65760aea6cd017a180c8b33c9dc2020c5d238856f776a02e95783b01ad0737c864d2cb5436adf3366171a1b6e1c7ab713cba0e7db2b0c976c747136f63e3f08d3e51b3a26213ac3c8a720c0ed27f3d655dbb74a9faff3e7b722ede8352988734037897378f526d8499755919f3bb36eafdbc0e21fa01d713e5d672a26937ead56ae807e680c823d51c7ef91170ed5bc81b136ee43bff961eae5310bc6e626b70ce18dcf2b776acaf63004f6590dbce8e893b6399acdfe176b3198b754e7c48a2a5916a09dfd6c923613ce1a72105df6b422d73d68f7015705d1fb1f3736bd6c0492e0b8d44165184c9175bf4a3c2feb0c070dc8d587c45d493f3ab736c9316422d7f6e654faeeacb202c7ee4eedfe56112d4466a6d39d12463af335b1e81033d75aaf3ebdb014f048edb6238874870885a79c327d276abdf7833223204cfabbe787cb5f73d799a3e8867b397867c0db5b6de6050b0f2e91f6433705d90ea4fb89f325eae47b3087c270b94258fa0bf95450fbebfcb92bd1d3a67d2d7b88f4868cccef36bd9d4d534ed4dcd5928a98874217d8e224e3189c0c0",
+        "lastblockhash" : "335308346793ec1eb6cc16eef19f1ff027ceefa34c9b7a5ecd7402ea5877ebad",
+        "postState" : {
+            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x4595b755cd04f3c4",
+                "code" : "0x34417fd82aff0d2fa87b68dfa1bdae931053828baa041e2fcc3f89a0433f250bfc656760a260317316b1cb0a9c8408f7eb6bf6ad4f19f9ebc6fdc8de79975ae848c855a57d49485af67f36ce837190ac84633e8cff723179a327368d7afe885683a82f50b82090f9e29964b858e1f29f3c7f6a2751676b09ad8e9483b7c365e0c20bf054bf67022e155222b69592663bf3d1183f061069673f551ee9f6d80460e7650d1010bee423672f7de1042d5ed6337f85b40d80b2964e36257591b2a6d8cba022d46f3f77b098278bc2d77fc3cb6e8c65889900f6ebf077dbdc3112d6e16963cd043de47eded90699688a0b4cb1205e8f30",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x49297048",
+                "code" : "0x",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x4595b755cd04f3c4",
+                "code" : "0x34417fd82aff0d2fa87b68dfa1bdae931053828baa041e2fcc3f89a0433f250bfc656760a260317316b1cb0a9c8408f7eb6bf6ad4f19f9ebc6fdc8de79975ae848c855a57d49485af67f36ce837190ac84633e8cff723179a327368d7afe885683a82f50b82090f9e29964b858e1f29f3c7f6a2751676b09ad8e9483b7c365e0c20bf054bf67022e155222b69592663bf3d1183f061069673f551ee9f6d80460e7650d1010bee423672f7de1042d5ed6337f85b40d80b2964e36257591b2a6d8cba022d46f3f77b098278bc2d77fc3cb6e8c65889900f6ebf077dbdc3112d6e16963cd043de47eded90699688a0b4cb1205e8f30",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x49297048",
+                "code" : "0x",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
+}
+
+
diff --git a/tests/files/BlockchainTests/RandomTests/bl201507071825GO.json b/tests/files/BlockchainTests/RandomTests/bl201507071825GO.json