From 949d2aae184c2da350c2fe418c078c3001d2be9a Mon Sep 17 00:00:00 2001
From: Dimitry <dimitry@ethereum.org>
Date: Tue, 7 Aug 2018 19:56:40 +0300
Subject: fix sar 2^256 0 test

---
 .../stShift/sar_2^256-1_0_d0g0v0Filler.json        | 106 +--------------------
 .../stShift/sar_2^256-1_0Filler.json               |   7 +-
 2 files changed, 7 insertions(+), 106 deletions(-)

(limited to 'src')

diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stShift/sar_2^256-1_0_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stShift/sar_2^256-1_0_d0g0v0Filler.json
index 13119aaa4..b78b25c95 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stShift/sar_2^256-1_0_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stShift/sar_2^256-1_0_d0g0v0Filler.json
@@ -26,106 +26,6 @@
             }
         ],
         "expect" : [
-            {
-                "network" : "Frontier",
-                "result" : {
-                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                        "balance" : "0x0de0b6b3a7640000",
-                        "storage" : {
-                            "0x00" : "0x03"
-                        }
-                    },
-                    "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                        "balance" : "0x4563918244fa1a80",
-                        "code" : "",
-                        "nonce" : "0x00",
-                        "storage" : {
-                        }
-                    },
-                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "balance" : "0x0de0b6b3a75de580",
-                        "code" : "",
-                        "nonce" : "0x01",
-                        "storage" : {
-                        }
-                    }
-                }
-            },
-            {
-                "network" : "Homestead",
-                "result" : {
-                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                        "balance" : "0x0de0b6b3a7640000",
-                        "storage" : {
-                            "0x00" : "0x03"
-                        }
-                    },
-                    "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                        "balance" : "0x4563918244fa1a80",
-                        "code" : "",
-                        "nonce" : "0x00",
-                        "storage" : {
-                        }
-                    },
-                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "balance" : "0x0de0b6b3a75de580",
-                        "code" : "",
-                        "nonce" : "0x01",
-                        "storage" : {
-                        }
-                    }
-                }
-            },
-            {
-                "network" : "EIP150",
-                "result" : {
-                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                        "balance" : "0x0de0b6b3a7640000",
-                        "storage" : {
-                            "0x00" : "0x03"
-                        }
-                    },
-                    "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                        "balance" : "0x4563918244fa1a80",
-                        "code" : "",
-                        "nonce" : "0x00",
-                        "storage" : {
-                        }
-                    },
-                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "balance" : "0x0de0b6b3a75de580",
-                        "code" : "",
-                        "nonce" : "0x01",
-                        "storage" : {
-                        }
-                    }
-                }
-            },
-            {
-                "network" : "EIP158",
-                "result" : {
-                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                        "balance" : "0x0de0b6b3a7640000",
-                        "storage" : {
-                            "0x00" : "0x03"
-                        }
-                    },
-                    "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                        "balance" : "0x4563918244fa1a80",
-                        "code" : "",
-                        "nonce" : "0x00",
-                        "storage" : {
-                        }
-                    },
-                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "balance" : "0x0de0b6b3a75de580",
-                        "code" : "",
-                        "nonce" : "0x01",
-                        "storage" : {
-                        }
-                    }
-                }
-            },
             {
                 "network" : "Byzantium",
                 "result" : {
@@ -136,7 +36,7 @@
                         }
                     },
                     "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                        "balance" : "0x29a2241af6321a80",
+                        "balance" : "0x061a80",
                         "code" : "",
                         "nonce" : "0x00",
                         "storage" : {
@@ -156,8 +56,8 @@
                 "result" : {
                     "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "balance" : "0x0de0b6b3a76586a0",
+                        "code" : "0x60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1d600055",
                         "storage" : {
-                            "0x00" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
                         }
                     },
                     "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -195,7 +95,7 @@
         "pre" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60001d600055",
+                "code" : "0x60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1d600055",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x03"
diff --git a/src/GeneralStateTestsFiller/stShift/sar_2^256-1_0Filler.json b/src/GeneralStateTestsFiller/stShift/sar_2^256-1_0Filler.json
index f44c9bdae..d8359f69a 100644
--- a/src/GeneralStateTestsFiller/stShift/sar_2^256-1_0Filler.json
+++ b/src/GeneralStateTestsFiller/stShift/sar_2^256-1_0Filler.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["<=Byzantium"],
+                "network" : ["Byzantium"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "balance" : "1000000000000000000",
@@ -49,8 +49,9 @@
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "balance" : "1000000000000100000",
+			"code" : "0x60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1d600055",
                         "storage" : {
-                            "0x00" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+                            "0x00" : "0x00"
                         }
                     },
                     "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -72,7 +73,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "// code" : "PUSH32 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff; PUSH1 0x00; SAR; PUSH1 0; SSTORE",
-                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60001d600055",
+                "code" : "{ (SSTORE 0 (SAR 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0)) }",
                 "nonce" : "0",
                 "storage" : {
                     "0x00" : "0x03"
-- 
cgit v1.2.3