Fix and refill GeneralStateTest after fixing the nonce change for address collision

https://github.com/ethereum/cpp-ethereum/issues/4225

1 files changed, 1 insertions, 221 deletions

diff --git a/GeneralStateTests/stStaticCall/static_contractCreationOOGdontLeaveEmptyContractViaTransaction.json b/GeneralStateTests/stStaticCall/static_contractCreationOOGdontLeaveEmptyContractViaTransaction.json
index 0d85e9892..c5e6ffdc2 100644
--- a/GeneralStateTests/stStaticCall/static_contractCreationOOGdontLeaveEmptyContractViaTransaction.json
+++ b/GeneralStateTests/stStaticCall/static_contractCreationOOGdontLeaveEmptyContractViaTransaction.json
@@ -2,7 +2,7 @@
     "static_contractCreationOOGdontLeaveEmptyContractViaTransaction" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.9732e0ef.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.a710be6a.Linux.g++",
             "source" : "/src/GeneralStateTestsFiller/stStaticCall/static_contractCreationOOGdontLeaveEmptyContractViaTransactionFiller.json"
         },
         "env" : {
@@ -21,43 +21,6 @@
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
-                    },
-                    "stateDiff" : {
-                        "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                            "balance" : [
-                                [
-                                    "0x00",
-                                    "+=",
-                                    "0x017700"
-                                ],
-                                [
-                                    "0x00",
-                                    "->",
-                                    "0x017700"
-                                ]
-                            ],
-                            "newlyCreated" : "true"
-                        },
-                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                            "balance" : [
-                                [
-                                    "0x10c8e0",
-                                    "+=",
-                                    "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe8900"
-                                ],
-                                [
-                                    "0x10c8e0",
-                                    "->",
-                                    "0x0f51e0"
-                                ]
-                            ],
-                            "newlyCreated" : "true",
-                            "nonce" : [
-                                "0x00",
-                                "->",
-                                "0x01"
-                            ]
-                        }
                     }
                 }
             ],
@@ -68,43 +31,6 @@
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
-                    },
-                    "stateDiff" : {
-                        "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                            "balance" : [
-                                [
-                                    "0x00",
-                                    "+=",
-                                    "0x017700"
-                                ],
-                                [
-                                    "0x00",
-                                    "->",
-                                    "0x017700"
-                                ]
-                            ],
-                            "newlyCreated" : "true"
-                        },
-                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                            "balance" : [
-                                [
-                                    "0x10c8e0",
-                                    "+=",
-                                    "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe8900"
-                                ],
-                                [
-                                    "0x10c8e0",
-                                    "->",
-                                    "0x0f51e0"
-                                ]
-                            ],
-                            "newlyCreated" : "true",
-                            "nonce" : [
-                                "0x00",
-                                "->",
-                                "0x01"
-                            ]
-                        }
                     }
                 }
             ],
@@ -115,43 +41,6 @@
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
-                    },
-                    "stateDiff" : {
-                        "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                            "balance" : [
-                                [
-                                    "0x00",
-                                    "+=",
-                                    "0x017700"
-                                ],
-                                [
-                                    "0x00",
-                                    "->",
-                                    "0x017700"
-                                ]
-                            ],
-                            "newlyCreated" : "true"
-                        },
-                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                            "balance" : [
-                                [
-                                    "0x10c8e0",
-                                    "+=",
-                                    "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe8900"
-                                ],
-                                [
-                                    "0x10c8e0",
-                                    "->",
-                                    "0x0f51e0"
-                                ]
-                            ],
-                            "newlyCreated" : "true",
-                            "nonce" : [
-                                "0x00",
-                                "->",
-                                "0x01"
-                            ]
-                        }
                     }
                 }
             ],
@@ -162,43 +51,6 @@
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
-                    },
-                    "stateDiff" : {
-                        "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                            "balance" : [
-                                [
-                                    "0x00",
-                                    "+=",
-                                    "0x017700"
-                                ],
-                                [
-                                    "0x00",
-                                    "->",
-                                    "0x017700"
-                                ]
-                            ],
-                            "newlyCreated" : "true"
-                        },
-                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                            "balance" : [
-                                [
-                                    "0x10c8e0",
-                                    "+=",
-                                    "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe8900"
-                                ],
-                                [
-                                    "0x10c8e0",
-                                    "->",
-                                    "0x0f51e0"
-                                ]
-                            ],
-                            "newlyCreated" : "true",
-                            "nonce" : [
-                                "0x00",
-                                "->",
-                                "0x01"
-                            ]
-                        }
                     }
                 }
             ],
@@ -209,78 +61,6 @@
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
-                    },
-                    "stateDiff" : {
-                        "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                            "balance" : [
-                                [
-                                    "0x00",
-                                    "+=",
-                                    "0x01747b"
-                                ],
-                                [
-                                    "0x00",
-                                    "->",
-                                    "0x01747b"
-                                ]
-                            ],
-                            "newlyCreated" : "true"
-                        },
-                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                            "balance" : [
-                                [
-                                    "0x10c8e0",
-                                    "+=",
-                                    "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe8900"
-                                ],
-                                [
-                                    "0x0f51e0",
-                                    "+=",
-                                    "0x0285"
-                                ],
-                                [
-                                    "0x10c8e0",
-                                    "->",
-                                    "0x0f5465"
-                                ]
-                            ],
-                            "newlyCreated" : "true",
-                            "nonce" : [
-                                "0x00",
-                                "->",
-                                "0x01"
-                            ]
-                        },
-                        "0xe005e77ffd2953dd93c80b805101c03dac64291b" : {
-                            "balance" : [
-                                [
-                                    "0x10c8e0",
-                                    "+=",
-                                    "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe8900"
-                                ],
-                                [
-                                    "0x0f51e0",
-                                    "+=",
-                                    "0x0285"
-                                ],
-                                [
-                                    "0x10c8e0",
-                                    "->",
-                                    "0x0f5465"
-                                ]
-                            ],
-                            "code" : [
-                                "0x",
-                                "->",
-                                "0x"
-                            ],
-                            "newlyCreated" : "true",
-                            "nonce" : [
-                                "0x00",
-                                "->",
-                                "0x01"
-                            ]
-                        }
                     }
                 }
             ]