From b7557a779bbd60c816fbf49b0bd155a5f430eb75 Mon Sep 17 00:00:00 2001 From: Sara Reynolds Date: Fri, 8 Jul 2022 17:07:27 -0400 Subject: [PATCH] move to ValidBlocks folder --- .../bcEIP1153/tloadDoesNotPersistAcrossBlocks.json | 6 +++--- .../bcEIP1153/tloadDoesNotPersistCrossTxn.json | 6 +++--- .../stEIP1153/14_revertAfterNestedStaticcall.json | 2 +- .../bcEIP1153/tloadDoesNotPersistAcrossBlocksFiller.yml | 0 .../bcEIP1153/tloadDoesNotPersistCrossTxnFiller.yml | 0 .../stEIP1153/14_revertAfterNestedStaticcallFiller.yml | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) rename BlockchainTests/{InvalidBlocks => ValidBlocks}/bcEIP1153/tloadDoesNotPersistAcrossBlocks.json (98%) rename BlockchainTests/{InvalidBlocks => ValidBlocks}/bcEIP1153/tloadDoesNotPersistCrossTxn.json (98%) rename src/BlockchainTestsFiller/{InvalidBlocks => ValidBlocks}/bcEIP1153/tloadDoesNotPersistAcrossBlocksFiller.yml (100%) rename src/BlockchainTestsFiller/{InvalidBlocks => ValidBlocks}/bcEIP1153/tloadDoesNotPersistCrossTxnFiller.yml (100%) diff --git a/BlockchainTests/InvalidBlocks/bcEIP1153/tloadDoesNotPersistAcrossBlocks.json b/BlockchainTests/ValidBlocks/bcEIP1153/tloadDoesNotPersistAcrossBlocks.json similarity index 98% rename from BlockchainTests/InvalidBlocks/bcEIP1153/tloadDoesNotPersistAcrossBlocks.json rename to BlockchainTests/ValidBlocks/bcEIP1153/tloadDoesNotPersistAcrossBlocks.json index 8b8745eb1e0..8d7168a8ece 100644 --- a/BlockchainTests/InvalidBlocks/bcEIP1153/tloadDoesNotPersistAcrossBlocks.json +++ b/BlockchainTests/ValidBlocks/bcEIP1153/tloadDoesNotPersistAcrossBlocks.json @@ -3,11 +3,11 @@ "_info" : { "comment" : "", "filling-rpc-server" : "evm version 1.10.17-unstable-7fc695ba-20220630", - "filling-tool-version" : "retesteth-0.2.2-testinfo+commit.b42fcf0b.Linux.g++", + "filling-tool-version" : "retesteth-0.2.2-testinfo+commit.23cb284b.Linux.g++", "generatedTestHash" : "d2a6e4b35044885d194325dd774070841177ffd5d141b7e3e8cb6804e6b852e6", - "lllcversion" : "Version: 0.5.14-develop.2022.7.5+commit.401d5358.Linux.g++", + "lllcversion" : "Version: 0.5.14-develop.2022.7.8+commit.401d5358.Linux.g++", "solidity" : "Version: 0.8.5+commit.a4f2e591.Linux.g++", - "source" : "src/BlockchainTestsFiller/InvalidBlocks/bcEIP1153/tloadDoesNotPersistAcrossBlocksFiller.yml", + "source" : "src/BlockchainTestsFiller/ValidBlocks/bcEIP1153/tloadDoesNotPersistAcrossBlocksFiller.yml", "sourceHash" : "ee9f25db1c76c52ef2ec78162f6cebbe011f15abdeeddc221ad6f4d45fcdcc6b" }, "blocks" : [ diff --git a/BlockchainTests/InvalidBlocks/bcEIP1153/tloadDoesNotPersistCrossTxn.json b/BlockchainTests/ValidBlocks/bcEIP1153/tloadDoesNotPersistCrossTxn.json similarity index 98% rename from BlockchainTests/InvalidBlocks/bcEIP1153/tloadDoesNotPersistCrossTxn.json rename to BlockchainTests/ValidBlocks/bcEIP1153/tloadDoesNotPersistCrossTxn.json index 905bc0dfae6..b3807304c5b 100644 --- a/BlockchainTests/InvalidBlocks/bcEIP1153/tloadDoesNotPersistCrossTxn.json +++ b/BlockchainTests/ValidBlocks/bcEIP1153/tloadDoesNotPersistCrossTxn.json @@ -3,11 +3,11 @@ "_info" : { "comment" : "", "filling-rpc-server" : "evm version 1.10.17-unstable-7fc695ba-20220630", - "filling-tool-version" : "retesteth-0.2.2-testinfo+commit.b42fcf0b.Linux.g++", + "filling-tool-version" : "retesteth-0.2.2-testinfo+commit.23cb284b.Linux.g++", "generatedTestHash" : "b60e11c984e0090179a1fb46ddb2d831b66f6f10b0069b125c852a612228aef2", - "lllcversion" : "Version: 0.5.14-develop.2022.7.5+commit.401d5358.Linux.g++", + "lllcversion" : "Version: 0.5.14-develop.2022.7.8+commit.401d5358.Linux.g++", "solidity" : "Version: 0.8.5+commit.a4f2e591.Linux.g++", - "source" : "src/BlockchainTestsFiller/InvalidBlocks/bcEIP1153/tloadDoesNotPersistCrossTxnFiller.yml", + "source" : "src/BlockchainTestsFiller/ValidBlocks/bcEIP1153/tloadDoesNotPersistCrossTxnFiller.yml", "sourceHash" : "060e80e5cb37f5413135e90cff5e564034f0aef2044dc08358d410e854c560cb" }, "blocks" : [ diff --git a/GeneralStateTests/stEIP1153/14_revertAfterNestedStaticcall.json b/GeneralStateTests/stEIP1153/14_revertAfterNestedStaticcall.json index c030dc8586c..54cd4fe7507 100644 --- a/GeneralStateTests/stEIP1153/14_revertAfterNestedStaticcall.json +++ b/GeneralStateTests/stEIP1153/14_revertAfterNestedStaticcall.json @@ -8,7 +8,7 @@ "lllcversion" : "Version: 0.5.14-develop.2022.7.5+commit.401d5358.Linux.g++", "solidity" : "Version: 0.8.5+commit.a4f2e591.Linux.g++", "source" : "src/GeneralStateTestsFiller/stEIP1153/14_revertAfterNestedStaticcallFiller.yml", - "sourceHash" : "3f7f33a70b26c8d940fb06e1746dcd9aacc6b579d2832980bb8a9c7538ff925b" + "sourceHash" : "f92c0090828afb8b877117952aee95304e92dbb43031305b754c234ebff1a910" }, "env" : { "currentBaseFee" : "0x0a", diff --git a/src/BlockchainTestsFiller/InvalidBlocks/bcEIP1153/tloadDoesNotPersistAcrossBlocksFiller.yml b/src/BlockchainTestsFiller/ValidBlocks/bcEIP1153/tloadDoesNotPersistAcrossBlocksFiller.yml similarity index 100% rename from src/BlockchainTestsFiller/InvalidBlocks/bcEIP1153/tloadDoesNotPersistAcrossBlocksFiller.yml rename to src/BlockchainTestsFiller/ValidBlocks/bcEIP1153/tloadDoesNotPersistAcrossBlocksFiller.yml diff --git a/src/BlockchainTestsFiller/InvalidBlocks/bcEIP1153/tloadDoesNotPersistCrossTxnFiller.yml b/src/BlockchainTestsFiller/ValidBlocks/bcEIP1153/tloadDoesNotPersistCrossTxnFiller.yml similarity index 100% rename from src/BlockchainTestsFiller/InvalidBlocks/bcEIP1153/tloadDoesNotPersistCrossTxnFiller.yml rename to src/BlockchainTestsFiller/ValidBlocks/bcEIP1153/tloadDoesNotPersistCrossTxnFiller.yml diff --git a/src/GeneralStateTestsFiller/stEIP1153/14_revertAfterNestedStaticcallFiller.yml b/src/GeneralStateTestsFiller/stEIP1153/14_revertAfterNestedStaticcallFiller.yml index 35ae96897ab..91f888f36a9 100644 --- a/src/GeneralStateTestsFiller/stEIP1153/14_revertAfterNestedStaticcallFiller.yml +++ b/src/GeneralStateTestsFiller/stEIP1153/14_revertAfterNestedStaticcallFiller.yml @@ -64,13 +64,13 @@ function doCallToStore() { mstore(0, hex"62fdb9be") // doStore() - let f := call(0xffff, 0x000000000000000000000000000000000000000A, 0, 0, 32, 0, 0) + let f := call(0xffff, 0x000000000000000000000000000000000000000A, 0, 0, 32, 0, 0) // call with zero-value mstore(0, f) return(0, 32) } function doStore() { - verbatim_2i_0o(hex"b4", 0, 11) + verbatim_2i_0o(hex"b4", 0, 11) // will revert } function selector() -> s {