update general tests

1 files changed, 127 insertions, 49 deletions

diff --git a/GeneralStateTests/stQuadraticComplexityTest/QuadraticComplexitySolidity_CallDataCopy.json b/GeneralStateTests/stQuadraticComplexityTest/QuadraticComplexitySolidity_CallDataCopy.json
index cb5eaa29f..fbf056767 100644
--- a/GeneralStateTests/stQuadraticComplexityTest/QuadraticComplexitySolidity_CallDataCopy.json
+++ b/GeneralStateTests/stQuadraticComplexityTest/QuadraticComplexitySolidity_CallDataCopy.json
@@ -6,59 +6,137 @@
             "source" : "/src/GeneralStateTestsFiller/stQuadraticComplexityTest/QuadraticComplexitySolidity_CallDataCopyFiller.json"
         },
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
-            "currentGasLimit" : "350000000",
-            "currentNumber" : "1",
-            "currentTimestamp" : "1000",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "currentGasLimit" : "0x14dc9380",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : [
-            {
-                "indexes" : {
-                    "data" : -1,
-                    "gas" : 1,
-                    "value" : -1
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "0x9069b0bca48fb987771da925e2ae4d322e47221ad504f37ab27837ff6412d398",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
                 },
-                "network" : [
-                    "ALL"
-                ],
-                "result" : {
-                    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                        "balance" : "250000000",
-                        "code" : "0x",
-                        "nonce" : "0x00",
-                        "storage" : {
-                        }
+                {
+                    "hash" : "0x9c6475c75795cc63ed4d4f646b7d3efbeddb48b9c0e56383a05b9098ad265f37",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "0x9069b0bca48fb987771da925e2ae4d322e47221ad504f37ab27837ff6412d398",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
                     },
-                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "code" : "0x60003560e060020a9004806361a4770614601557005b601e6004356024565b60006000f35b60008160008190555073b94f5374fce5edbc8e2a8697c15331677e6ebf0b90505b600082131560bf5780600160a060020a03166000600060007f6a7573740000000000000000000000000000000000000000000000000000000081526004017f63616c6c000000000000000000000000000000000000000000000000000000008152602001600060008560155a03f150506001820391506045565b505056",
-                        "nonce" : "0x01",
-                        "storage" : {
-                        }
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x9c6475c75795cc63ed4d4f646b7d3efbeddb48b9c0e56383a05b9098ad265f37",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
                     },
-                    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "code" : "0x61c3506000600037",
-                        "nonce" : "0x00",
-                        "storage" : {
-                        }
-                    }
+                    "logs" : [
+                    ]
                 }
-            }
-        ],
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "0x9069b0bca48fb987771da925e2ae4d322e47221ad504f37ab27837ff6412d398",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x9c6475c75795cc63ed4d4f646b7d3efbeddb48b9c0e56383a05b9098ad265f37",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "0x9069b0bca48fb987771da925e2ae4d322e47221ad504f37ab27837ff6412d398",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x9c6475c75795cc63ed4d4f646b7d3efbeddb48b9c0e56383a05b9098ad265f37",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0x9069b0bca48fb987771da925e2ae4d322e47221ad504f37ab27837ff6412d398",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                },
+                {
+                    "hash" : "0x9c6475c75795cc63ed4d4f646b7d3efbeddb48b9c0e56383a05b9098ad265f37",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : [
+                    ]
+                }
+            ]
+        },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "//" : "}\t\t\t\t\t\t\t\t\t",
-                "balance" : "500000000",
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x1dcd6500",
                 "code" : "0x60003560e060020a9004806361a4770614601557005b601e6004356024565b60006000f35b60008160008190555073b94f5374fce5edbc8e2a8697c15331677e6ebf0b90505b600082131560bf5780600160a060020a03166000600060007f6a7573740000000000000000000000000000000000000000000000000000000081526004017f63616c6c000000000000000000000000000000000000000000000000000000008152602001600060008560155a03f150506001820391506045565b505056",
-                "nonce" : "0",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "5000000",
-                "code" : "{ (CALLDATACOPY 0 0 50000) }",
-                "nonce" : "0",
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x4c4b40",
+                "code" : "0x61c3506000600037",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             }
@@ -68,15 +146,15 @@
                 "0x61a47706000000000000000000000000000000000000000000000000000000000000c350"
             ],
             "gasLimit" : [
-                "150000",
-                "250000000"
+                "0x0249f0",
+                "0x0ee6b280"
             ],
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "a94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }