From 621ad11abda01fb2dbc22e793fc1acc84659ff93 Mon Sep 17 00:00:00 2001
From: Dimitry <dimitry@ethereum.org>
Date: Thu, 29 Mar 2018 04:08:47 +0300
Subject: fix more tests with coinbase touch

---
 .../stRevertTest/RevertOpcodeInInitFiller.json     | 24 +++++++++++++++++++-
 .../RevertOpcodeWithBigOutputInInitFiller.json     | 26 ++++++++++++++++++++--
 .../ecmul_0-3_5616_28000_96Filler.json             |  9 +++-----
 3 files changed, 50 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeInInitFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeInInitFiller.json
index 083e3ae4f..d759f0974 100644
--- a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeInInitFiller.json
+++ b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeInInitFiller.json
@@ -47,13 +47,35 @@
                     "gas" : 1,
                     "value" : -1
                 },
-                "network" : ["Homestead", "EIP158", "EIP150"],
+                "network" : ["EIP158"],
                 "result" : {
 		    "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
 		        "shouldnotexist" : "1"
 		    },
 		    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
 			"nonce" : "0"
+		     },
+		    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+			"shouldnotexist" : "1"
+		     }
+                }
+            },
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : 1,
+                    "value" : -1
+                },
+                "network" : ["Homestead", "EIP150"],
+                "result" : {
+		    "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+		        "shouldnotexist" : "1"
+		    },
+		    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+			"nonce" : "0"
+		     },
+		    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+			"balance" : "0"
 		     }
                 }
             },
diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeWithBigOutputInInitFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeWithBigOutputInInitFiller.json
index 58fc63354..049b91b11 100644
--- a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeWithBigOutputInInitFiller.json
+++ b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeWithBigOutputInInitFiller.json
@@ -50,14 +50,36 @@
                     "gas" : 1,
                     "value" : -1
                 },
-                "network" : ["Homestead", "EIP158", "EIP150"],
+                "network" : ["EIP158"],
                 "result" : {
 		    "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
 		        "shouldnotexist" : "1"
 		    },
 		    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
 			"nonce" : "0"
-		     }
+		    },
+		    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+			"shouldnotexist" : "1"
+		    }
+                }
+            },
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : 1,
+                    "value" : -1
+                },
+                "network" : ["Homestead", "EIP150"],
+                "result" : {
+		    "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+		        "shouldnotexist" : "1"
+		    },
+		    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+			"nonce" : "0"
+		    },
+		    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+			"balance" : "0"
+		    }
                 }
             },
 	    {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_5616_28000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_5616_28000_96Filler.json
index 269a6e178..85b76416b 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_5616_28000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_5616_28000_96Filler.json
@@ -248,11 +248,6 @@
                         "balance": "1000000000000000000",
                         "code": "0x"
                     },
-                    "3535353535353535353535353535353535353535": {
-                        "storage": {},
-                        "nonce": "0",
-                        "code": "0x"
-                    },
                     "0000000000000000000000000000000000000002": {
                         "storage": {},
                         "nonce": "0",
@@ -280,6 +275,8 @@
                 }
             }
         ],
-        "explanation": "Puts the point (0, 3) and the factor 21888242871839275222246405745257275088548364400416034343698204186575808495616 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 28000 bytes"
+        "_info": { 
+	    "comment" : "Puts the point (0, 3) and the factor 21888242871839275222246405745257275088548364400416034343698204186575808495616 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 28000 bytes"
+	}
     }
 }
-- 
cgit