Move standard-json "modelCheckerSettings" key to "settings.modelChecker".

test/cmdlineTests/standard_model_checker_engine_all/input.json

@@ -7,8 +7,11 @@
 			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\npragma experimental SMTChecker;\ncontract C { function f(uint x) public pure { assert(x > 0); } }"
 		}
 	},
-	"modelCheckerSettings":
+	"settings":
 	{
-		"engine": "all"
+		"modelChecker":
+		{
+			"engine": "all"
+		}
 	}
 }

test/cmdlineTests/standard_model_checker_engine_bmc/input.json

@@ -7,8 +7,11 @@
 			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\npragma experimental SMTChecker;\ncontract C { function f(uint x) public pure { assert(x > 0); } }"
 		}
 	},
-	"modelCheckerSettings":
+	"settings":
 	{
-		"engine": "bmc"
+		"modelChecker":
+		{
+			"engine": "bmc"
+		}
 	}
 }

test/cmdlineTests/standard_model_checker_engine_chc/input.json

@@ -7,8 +7,11 @@
 			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\npragma experimental SMTChecker;\ncontract C { function f(uint x) public pure { assert(x > 0); } }"
 		}
 	},
-	"modelCheckerSettings":
+	"settings":
 	{
-		"engine": "chc"
+		"modelChecker":
+		{
+			"engine": "chc"
+		}
 	}
 }

test/cmdlineTests/standard_model_checker_engine_none/input.json

@@ -7,8 +7,11 @@
 			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\npragma experimental SMTChecker;\ncontract C { function f(uint x) public pure { assert(x > 0); } }"
 		}
 	},
-	"modelCheckerSettings":
+	"settings":
 	{
-		"engine": "none"
+		"modelChecker":
+		{
+			"engine": "none"
+		}
 	}
 }

test/cmdlineTests/standard_model_checker_timeout_all/input.json

@@ -7,8 +7,11 @@
 			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\npragma experimental SMTChecker;\ncontract test {\nfunction f(uint x, uint y, uint k) public pure {\nrequire(k > 0); require(x % k == 0); require(y % k == 0); uint r = mulmod(x, y, k); assert(r % k == 0);}}"
 		}
 	},
-	"modelCheckerSettings":
+	"settings":
 	{
-		"timeout": 1000
+		"modelChecker":
+		{
+			"timeout": 1000
+		}
 	}
 }

test/cmdlineTests/standard_model_checker_timeout_bmc/input.json

@@ -7,9 +7,12 @@
 			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\npragma experimental SMTChecker;\ncontract test {\nfunction f(uint x, uint y, uint k) public pure {\nrequire(k > 0); require(x % k == 0); require(y % k == 0); uint r = mulmod(x, y, k); assert(r % k == 0);}}"
 		}
 	},
-	"modelCheckerSettings":
+	"settings":
 	{
-		"engine": "bmc",
-		"timeout": 1000
+		"modelChecker":
+		{
+			"engine": "bmc",
+			"timeout": 1000
+		}
 	}
 }

test/cmdlineTests/standard_model_checker_timeout_chc/input.json

@@ -7,9 +7,12 @@
 			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\npragma experimental SMTChecker;\ncontract test {\nfunction f(uint x, uint y, uint k) public pure {\nrequire(k > 0); require(x % k == 0); require(y % k == 0); uint r = mulmod(x, y, k); assert(r % k == 0);}}"
 		}
 	},
-	"modelCheckerSettings":
+	"settings":
 	{
-		"engine": "chc",
-		"timeout": 1000
+		"modelChecker":
+		{
+			"engine": "chc",
+			"timeout": 1000
+		}
 	}
 }

test/cmdlineTests/standard_model_checker_timeout_wrong_key/input.json

@@ -7,9 +7,12 @@
 			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\npragma experimental SMTChecker;\ncontract C { function f(uint x) public pure { assert(x > 0); } }"
 		}
 	},
-	"modelCheckerSettings":
+	"settings":
 	{
-		"engine": "chc",
-		"atimeout": 1
+		"modelChecker":
+		{
+			"engine": "chc",
+			"atimeout": 1
+		}
 	}
 }

test/cmdlineTests/standard_model_checker_timeout_wrong_value/input.json

@@ -7,8 +7,11 @@
 			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\npragma experimental SMTChecker;\ncontract C { function f(uint x) public pure { assert(x > 0); } }"
 		}
 	},
-	"modelCheckerSettings":
+	"settings":
 	{
-		"timeout": "asd"
+		"modelChecker":
+		{
+			"timeout": "asd"
+		}
 	}
 }

test/cmdlineTests/standard_model_checker_timeout_wrong_value/output.json

@@ -1 +1 @@
-{"errors":[{"component":"general","formattedMessage":"modelCheckerSettings.timeout must be an unsigned integer.","message":"modelCheckerSettings.timeout must be an unsigned integer.","severity":"error","type":"JSONError"}]}
+{"errors":[{"component":"general","formattedMessage":"settings.modelChecker.timeout must be an unsigned integer.","message":"settings.modelChecker.timeout must be an unsigned integer.","severity":"error","type":"JSONError"}]}