fixup! [libevmasm] Add support to import evm assembly json.

cameel · cameel · commit 4359e334d4d0 · 2023-10-20T21:35:55.000+02:00
diff --git a/libevmasm/Assembly.cpp b/libevmasm/Assembly.cpp
@@ -545,6 +545,7 @@ std::pair<std::shared_ptr<Assembly>, std::vector<std::string>> Assembly::fromJSO
 	if (_json.isMember("sourceList"))
 	{
 		solAssert(_level == 0);
+		solAssert(_sourceList.empty());
 		for (Json::Value const& sourceName: _json["sourceList"])
 		{
 			solRequire(
@@ -572,7 +573,7 @@ std::pair<std::shared_ptr<Assembly>, std::vector<std::string>> Assembly::fromJSO
 		Json::Value const& data = _json[".data"];
 		for (Json::ValueConstIterator dataIter = data.begin(); dataIter != data.end(); dataIter++)
 		{
-			solRequire(dataIter.key().isString(), AssemblyImportException, "Key inside '.data' is not a string.");
+			solAssert(dataIter.key().isString());
 			std::string dataItemID = dataIter.key().asString();
 			Json::Value const& dataItem = data[dataItemID];
 			if (dataItem.isString())

Original file line number	Diff line number	Diff line change
`@@ -545,6 +545,7 @@ std::pair<std::shared_ptr<Assembly>, std::vector<std::string>> Assembly::fromJSO`
`545`	`545`	`if (_json.isMember("sourceList"))`
`546`	`546`	`{`
`547`	`547`	`solAssert(_level == 0);`
	`548`	`+ solAssert(_sourceList.empty());`
`548`	`549`	`for (Json::Value const& sourceName: _json["sourceList"])`
`549`	`550`	`{`
`550`	`551`	`solRequire(`
`@@ -572,7 +573,7 @@ std::pair<std::shared_ptr<Assembly>, std::vector<std::string>> Assembly::fromJSO`
`572`	`573`	`Json::Value const& data = _json[".data"];`
`573`	`574`	`for (Json::ValueConstIterator dataIter = data.begin(); dataIter != data.end(); dataIter++)`
`574`	`575`	`{`
`575`		`- solRequire(dataIter.key().isString(), AssemblyImportException, "Key inside '.data' is not a string.");`
	`576`	`+ solAssert(dataIter.key().isString());`
`576`	`577`	`std::string dataItemID = dataIter.key().asString();`
`577`	`578`	`Json::Value const& dataItem = data[dataItemID];`
`578`	`579`	`if (dataItem.isString())`