Merge pull request #12098 from ethereum/reformat-standard-optimizer-cmdline-tests

Reformat `standard_optimizer` command-line tests for readability

test/cmdlineTests/standard_optimizer_invalid_detail_type/args

@@ -0,0 +1 @@
+--pretty-json --json-indent 4

test/cmdlineTests/standard_optimizer_invalid_detail_type/in.sol

@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+
+contract C {
+    function f() public pure {}
+}

test/cmdlineTests/standard_optimizer_invalid_detail_type/input.json

@@ -1,16 +1,9 @@
 {
 	"language": "Solidity",
-	"sources":
+	"sources": {
-	{
+		"A": {"urls": ["standard_optimizer_invalid_detail_type/in.sol"]}
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0; contract C { function f() public pure {} }"
-		}
 	},
-	"settings":
+	"settings": {
-	{
+		"optimizer": {"details": {"peephole": 7}}
-		"optimizer": {
-			"details": { "peephole": 7 }
-		}
 	}
 }

test/cmdlineTests/standard_optimizer_invalid_detail_type/output.json

@@ -1 +1,12 @@
-{"errors":[{"component":"general","formattedMessage":"\"settings.optimizer.details.peephole\" must be Boolean","message":"\"settings.optimizer.details.peephole\" must be Boolean","severity":"error","type":"JSONError"}]}
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "\"settings.optimizer.details.peephole\" must be Boolean",
+            "message": "\"settings.optimizer.details.peephole\" must be Boolean",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}

test/cmdlineTests/standard_optimizer_invalid_details/args

@@ -0,0 +1 @@
+--pretty-json --json-indent 4

test/cmdlineTests/standard_optimizer_invalid_details/in.sol

@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+
+contract C {
+    function f() public pure {}
+}

test/cmdlineTests/standard_optimizer_invalid_details/input.json

@@ -1,16 +1,9 @@
 {
 	"language": "Solidity",
-	"sources":
+	"sources": {
-	{
+		"A": {"urls": ["standard_optimizer_invalid_details/in.sol"]}
-		"A":
-		{
-			"content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0; contract C { function f() public pure {} }"
-		}
 	},
-	"settings":
+	"settings": {
-	{
+		"optimizer": {"details": {"notThere": true}}
-		"optimizer": {
-			"details": { "notThere": true }
-		}
 	}
 }

test/cmdlineTests/standard_optimizer_invalid_details/output.json

@@ -1 +1,12 @@
-{"errors":[{"component":"general","formattedMessage":"Unknown key \"notThere\"","message":"Unknown key \"notThere\"","severity":"error","type":"JSONError"}]}
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "Unknown key \"notThere\"",
+            "message": "Unknown key \"notThere\"",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}

test/cmdlineTests/standard_optimizer_no_yul/args

@@ -0,0 +1 @@
+--pretty-json --json-indent 4

test/cmdlineTests/standard_optimizer_no_yul/in.sol

@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+
+contract C {
+    function f() public pure {}
+}

test/cmdlineTests/standard_optimizer_no_yul/input.json

@@ -1,17 +1,12 @@
 {
 	"language": "Solidity",
-	"sources":
+	"sources": {
-	{
+		"A": {"urls": ["standard_optimizer_no_yul/in.sol"]}
-		"A":
-		{
-			"content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0; contract C { function f() public pure {} }"
-		}
 	},
-	"settings":
+	"settings": {
-	{
 		"optimizer": {
 			"enabled": true,
-			"details": { "yul": false }
+			"details": {"yul": false}
 		}
 	}
 }

test/cmdlineTests/standard_optimizer_no_yul/output.json

@@ -1 +1,9 @@
-{"sources":{"A":{"id":0}}}
+{
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}

test/cmdlineTests/standard_optimizer_yul/args

@@ -0,0 +1 @@
+--pretty-json --json-indent 4

test/cmdlineTests/standard_optimizer_yul/in.sol

@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+
+contract C {
+    function f() public pure {}
+}

test/cmdlineTests/standard_optimizer_yul/input.json

@@ -1,14 +1,9 @@
 {
 	"language": "Solidity",
-	"sources":
+	"sources": {
-	{
+		"A": {"urls": ["standard_optimizer_yul/in.sol"]}
-		"A":
-		{
-			"content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0; contract C { function f() public pure {} }"
-		}
 	},
-	"settings":
+	"settings": {
-	{
 		"optimizer": {
 			"enabled": true
 		}

test/cmdlineTests/standard_optimizer_yul/output.json

@@ -1 +1,9 @@
-{"sources":{"A":{"id":0}}}
+{
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}

test/cmdlineTests/standard_optimizer_yulDetails/args

@@ -0,0 +1 @@
+--pretty-json --json-indent 4

test/cmdlineTests/standard_optimizer_yulDetails/in.sol

@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+
+contract C {
+    function f() public pure {}
+}

test/cmdlineTests/standard_optimizer_yulDetails/input.json

@@ -1,16 +1,14 @@
 {
 	"language": "Solidity",
-	"sources":
+	"sources": {
-	{
+		"A": {"urls": ["standard_optimizer_yulDetails/in.sol"]}
-		"A":
-		{
-			"content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0; contract C { function f() public pure {} }"
-		}
 	},
-	"settings":
+	"settings": {
-	{
 		"optimizer": {
-			"details": { "yul": true, "yulDetails": {} }
+			"details": {
+				"yul": true,
+				"yulDetails": {}
+			}
 		}
 	}
 }

test/cmdlineTests/standard_optimizer_yulDetails/output.json

@@ -1 +1,9 @@
-{"sources":{"A":{"id":0}}}
+{
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}

test/cmdlineTests/standard_optimizer_yulDetails_no_object/args

@@ -0,0 +1 @@
+--pretty-json --json-indent 4

test/cmdlineTests/standard_optimizer_yulDetails_no_object/in.sol

@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+
+contract C {
+    function f() public pure {}
+}

test/cmdlineTests/standard_optimizer_yulDetails_no_object/input.json

@@ -1,16 +1,14 @@
 {
 	"language": "Solidity",
-	"sources":
+	"sources": {
-	{
+		"A": {"urls": ["standard_optimizer_yulDetails_no_object/in.sol"]}
-		"A":
-		{
-			"content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0; contract C { function f() public pure {} }"
-		}
 	},
-	"settings":
+	"settings": {
-	{
 		"optimizer": {
-			"details": { "yul": true, "yulDetails": 7 }
+			"details": {
+				"yul": true,
+				"yulDetails": 7
+			}
 		}
 	}
 }

test/cmdlineTests/standard_optimizer_yulDetails_no_object/output.json

@@ -1 +1,12 @@
-{"errors":[{"component":"general","formattedMessage":"\"settings.optimizer.details.yulDetails\" must be an object","message":"\"settings.optimizer.details.yulDetails\" must be an object","severity":"error","type":"JSONError"}]}
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "\"settings.optimizer.details.yulDetails\" must be an object",
+            "message": "\"settings.optimizer.details.yulDetails\" must be an object",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}

test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps/args

@@ -0,0 +1 @@
+--pretty-json --json-indent 4

test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps/in.sol

@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+
+contract C {
+    function f() public pure {}
+}

test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps/input.json

@@ -1,14 +1,9 @@
 {
 	"language": "Solidity",
-	"sources":
+	"sources": {
-	{
+		"A": {"urls": ["standard_optimizer_yulDetails_optimiserSteps/in.sol"]}
-		"A":
-		{
-			"content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0; contract C { function f() public pure {} }"
-		}
 	},
-	"settings":
+	"settings": {
-	{
 		"optimizer": {
 			"details": {
 				"yul": true,

test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps/output.json

@@ -1 +1,9 @@
-{"sources":{"A":{"id":0}}}
+{
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}

test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_invalid_abbreviation/args

@@ -0,0 +1 @@
+--pretty-json --json-indent 4

test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_invalid_abbreviation/in.sol

@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+
+contract C {
+    function f() public pure {}
+}

test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_invalid_abbreviation/input.json

@@ -1,14 +1,9 @@
 {
 	"language": "Solidity",
-	"sources":
+	"sources": {
-	{
+		"A": {"urls": ["standard_optimizer_yulDetails_optimiserSteps_invalid_abbreviation/in.sol"]}
-		"A":
-		{
-			"content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0; contract C { function f() public pure {} }"
-		}
 	},
-	"settings":
+	"settings": {
-	{
 		"optimizer": {
 			"details": {
 				"yul": true,

test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_invalid_abbreviation/output.json

@@ -1 +1,12 @@
-{"errors":[{"component":"general","formattedMessage":"Invalid optimizer step sequence in \"settings.optimizer.details.optimizerSteps\": 'b' is not a valid step abbreviation","message":"Invalid optimizer step sequence in \"settings.optimizer.details.optimizerSteps\": 'b' is not a valid step abbreviation","severity":"error","type":"JSONError"}]}
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "Invalid optimizer step sequence in \"settings.optimizer.details.optimizerSteps\": 'b' is not a valid step abbreviation",
+            "message": "Invalid optimizer step sequence in \"settings.optimizer.details.optimizerSteps\": 'b' is not a valid step abbreviation",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}

test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_invalid_nesting/args

@@ -0,0 +1 @@
+--pretty-json --json-indent 4

test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_invalid_nesting/in.sol

@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+
+contract C {
+    function f() public pure {}
+}

test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_invalid_nesting/input.json

@@ -1,14 +1,9 @@
 {
 	"language": "Solidity",
-	"sources":
+	"sources": {
-	{
+		"A": {"urls": ["standard_optimizer_yulDetails_optimiserSteps_invalid_nesting/in.sol"]}
-		"A":
-		{
-			"content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0; contract C { function f() public pure {} }"
-		}
 	},
-	"settings":
+	"settings": {
-	{
 		"optimizer": {
 			"details": {
 				"yul": true,

test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_invalid_nesting/output.json

@@ -1 +1,12 @@
-{"errors":[{"component":"general","formattedMessage":"Invalid optimizer step sequence in \"settings.optimizer.details.optimizerSteps\": Nested brackets are not supported","message":"Invalid optimizer step sequence in \"settings.optimizer.details.optimizerSteps\": Nested brackets are not supported","severity":"error","type":"JSONError"}]}
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "Invalid optimizer step sequence in \"settings.optimizer.details.optimizerSteps\": Nested brackets are not supported",
+            "message": "Invalid optimizer step sequence in \"settings.optimizer.details.optimizerSteps\": Nested brackets are not supported",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}

test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_type/args

@@ -0,0 +1 @@
+--pretty-json --json-indent 4

test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_type/in.sol

@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+
+contract C {
+    function f() public pure {}
+}

test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_type/input.json

@@ -1,14 +1,9 @@
 {
 	"language": "Solidity",
-	"sources":
+	"sources": {
-	{
+		"A": {"urls": ["standard_optimizer_yulDetails_optimiserSteps_type/in.sol"]}
-		"A":
-		{
-			"content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0; contract C { function f() public pure {} }"
-		}
 	},
-	"settings":
+	"settings": {
-	{
 		"optimizer": {
 			"details": {
 				"yul": true,

test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_type/output.json

@@ -1 +1,12 @@
-{"errors":[{"component":"general","formattedMessage":"\"settings.optimizer.details.optimizerSteps\" must be a string","message":"\"settings.optimizer.details.optimizerSteps\" must be a string","severity":"error","type":"JSONError"}]}
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "\"settings.optimizer.details.optimizerSteps\" must be a string",
+            "message": "\"settings.optimizer.details.optimizerSteps\" must be a string",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}

test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_unbalanced_bracket/args

@@ -0,0 +1 @@
+--pretty-json --json-indent 4

test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_unbalanced_bracket/in.sol

@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+
+contract C {
+    function f() public pure {}
+}

test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_unbalanced_bracket/input.json

@@ -1,14 +1,9 @@
 {
 	"language": "Solidity",
-	"sources":
+	"sources": {
-	{
+		"A": {"urls": ["standard_optimizer_yulDetails_optimiserSteps_unbalanced_bracket/in.sol"]}
-		"A":
-		{
-			"content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0; contract C { function f() public pure {} }"
-		}
 	},
-	"settings":
+	"settings": {
-	{
 		"optimizer": {
 			"details": {
 				"yul": true,

test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_unbalanced_bracket/output.json

@@ -1 +1,12 @@
-{"errors":[{"component":"general","formattedMessage":"Invalid optimizer step sequence in \"settings.optimizer.details.optimizerSteps\": Unbalanced brackets","message":"Invalid optimizer step sequence in \"settings.optimizer.details.optimizerSteps\": Unbalanced brackets","severity":"error","type":"JSONError"}]}
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "Invalid optimizer step sequence in \"settings.optimizer.details.optimizerSteps\": Unbalanced brackets",
+            "message": "Invalid optimizer step sequence in \"settings.optimizer.details.optimizerSteps\": Unbalanced brackets",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}

test/cmdlineTests/standard_optimizer_yulDetails_without_yul/args

@@ -0,0 +1 @@
+--pretty-json --json-indent 4

test/cmdlineTests/standard_optimizer_yulDetails_without_yul/in.sol

@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+
+contract C {
+    function f() public pure {}
+}

test/cmdlineTests/standard_optimizer_yulDetails_without_yul/input.json

@@ -1,16 +1,10 @@
 {
 	"language": "Solidity",
-	"sources":
+	"sources": {
-	{
+		"A": {"urls": ["standard_optimizer_yulDetails_optimiserSteps_without_yul/in.sol"]}
-		"A":
-		{
-			"content": "//SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0; contract C { function f() public pure {} }"
-		}
 	},
-	"settings":
+	"settings": {
-	{
+		"optimizer": {"details": {"yulDetails": 7}
-		"optimizer": {
-			"details": { "yulDetails": 7 }
 		}
 	}
 }

test/cmdlineTests/standard_optimizer_yulDetails_without_yul/output.json

@@ -1 +1,12 @@
-{"errors":[{"component":"general","formattedMessage":"\"Providing yulDetails requires Yul optimizer to be enabled.","message":"\"Providing yulDetails requires Yul optimizer to be enabled.","severity":"error","type":"JSONError"}]}
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "\"Providing yulDetails requires Yul optimizer to be enabled.",
+            "message": "\"Providing yulDetails requires Yul optimizer to be enabled.",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}