Merge pull request #673 from ethereum/blockchainfill_valid

Blockchainfill valid
ethereum · Feb 20, 2020 · f2863bf · f2863bf
2 parents 4896b6f + 09fa317
commit f2863bf
Show file tree

Hide file tree

Showing 12 changed files with 72,409 additions and 14,055 deletions.
diff --git a/BlockchainTests/InvalidBlocks/bcForgedTest/bcForkBlockTest.json b/BlockchainTests/InvalidBlocks/bcForgedTest/bcForkBlockTest.json
diff --git a/BlockchainTests/InvalidBlocks/bcForgedTest/bcInvalidRLPTest.json b/BlockchainTests/InvalidBlocks/bcForgedTest/bcInvalidRLPTest.json
diff --git a/BlockchainTests/InvalidBlocks/bcForgedTest/bcInvalidRLPTest_BLOCK_.json b/BlockchainTests/InvalidBlocks/bcForgedTest/bcInvalidRLPTest_BLOCK_.json
diff --git a/BlockchainTests/InvalidBlocks/bcForgedTest/bcInvalidRLPTest_TRANSACT_.json b/BlockchainTests/InvalidBlocks/bcForgedTest/bcInvalidRLPTest_TRANSACT_.json
diff --git a/BlockchainTests/ValidBlocks/bcStateTests/TransactionNonceCheck.json b/BlockchainTests/ValidBlocks/bcStateTests/TransactionNonceCheck.json
@@ -2,11 +2,11 @@
     "TransactionNonceCheck_Istanbul" : {
         "_info" : {
             "comment" : "check what happens if transaction nonce is incorrect. transaction must be rejected. must be a blockchain test",
-            "filling-rpc-server" : "Geth-1.9.11-unstable-a382d783-20200127",
-            "filling-tool-version" : "retesteth-0.0.2+commit.ce1fdd3d.Linux.g++",
+            "filling-rpc-server" : "Geth-1.9.11-unstable-a806cedf-20200204",
+            "filling-tool-version" : "retesteth-0.0.2+commit.6d37c10c.Linux.g++",
             "lllcversion" : "Version: 0.5.14-develop.2019.11.27+commit.8f259595.Linux.g++",
             "source" : "src/BlockchainTestsFiller/ValidBlocks/bcStateTests/TransactionNonceCheckFiller.json",
-            "sourceHash" : "44cf713324069720131157c0cb664de09a283ff22e3307deb2da0a0d02e24944"
+            "sourceHash" : "7bec80a997912dab34dd5129606902fa37fbf44f899b0de9ab2b5c744c1271c8"
         },
         "sealEngine" : "NoProof",
         "network" : "Istanbul",

diff --git a/PRLOG.md b/PRLOG.md
@@ -1,5 +1,11 @@
 # Pull Requests changes log
 
+- PR [#673](https://github.com/ethereum/tests/pull/673)
+upgrade and regenerate invalid RLP blockchain tests
+
+- PR [#672](https://github.com/ethereum/tests/pull/672)
+Major blockchain test refactoring, and regeneration on geth + retesteth
+
 - PR[#671](https://github.com/ethereum/tests/pull/671)
 Add test cases for SELFBALANCE inside of CALL, DELEGATECALL, and CALLCODE
 

diff --git a/src/BlockchainTestsFiller/InvalidBlocks/bcForgedTest/bcForkBlockTestCopier.json b/src/BlockchainTestsFiller/InvalidBlocks/bcForgedTest/bcForkBlockTestCopier.json
diff --git a/src/BlockchainTestsFiller/InvalidBlocks/bcForgedTest/bcForkBlockTestFiller.json b/src/BlockchainTestsFiller/InvalidBlocks/bcForgedTest/bcForkBlockTestFiller.json
diff --git a/src/BlockchainTestsFiller/InvalidBlocks/bcForgedTest/bcInvalidRLPTestCopier.json b/src/BlockchainTestsFiller/InvalidBlocks/bcForgedTest/bcInvalidRLPTestCopier.json
diff --git a/src/BlockchainTestsFiller/InvalidBlocks/bcForgedTest/bcInvalidRLPTest_BLOCK_Filler.json b/src/BlockchainTestsFiller/InvalidBlocks/bcForgedTest/bcInvalidRLPTest_BLOCK_Filler.json
diff --git a/src/BlockchainTestsFiller/InvalidBlocks/bcForgedTest/bcInvalidRLPTest_TRANSACT_Filler.json b/src/BlockchainTestsFiller/InvalidBlocks/bcForgedTest/bcInvalidRLPTest_TRANSACT_Filler.json
diff --git a/src/BlockchainTestsFiller/ValidBlocks/bcStateTests/TransactionNonceCheckFiller.json b/src/BlockchainTestsFiller/ValidBlocks/bcStateTests/TransactionNonceCheckFiller.json
@@ -27,6 +27,9 @@
                 "result" : {
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "nonce" : "10"
+                    },
+                    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "shouldnotexist" : "1"
                     }
                 }
             }