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

cameel · r0qs · commit 74129b3776e1 · 2023-10-23T09:44:18.000+02:00
diff --git a/libevmasm/Assembly.cpp b/libevmasm/Assembly.cpp
@@ -542,6 +542,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(
@@ -569,7 +570,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
`@@ -542,6 +542,7 @@ std::pair<std::shared_ptr<Assembly>, std::vector<std::string>> Assembly::fromJSO`
`542`	`542`	`if (_json.isMember("sourceList"))`
`543`	`543`	`{`
`544`	`544`	`solAssert(_level == 0);`
	`545`	`+ solAssert(_sourceList.empty());`
`545`	`546`	`for (Json::Value const& sourceName: _json["sourceList"])`
`546`	`547`	`{`
`547`	`548`	`solRequire(`
`@@ -569,7 +570,7 @@ std::pair<std::shared_ptr<Assembly>, std::vector<std::string>> Assembly::fromJSO`
`569`	`570`	`Json::Value const& data = _json[".data"];`
`570`	`571`	`for (Json::ValueConstIterator dataIter = data.begin(); dataIter != data.end(); dataIter++)`
`571`	`572`	`{`
`572`		`- solRequire(dataIter.key().isString(), AssemblyImportException, "Key inside '.data' is not a string.");`
	`573`	`+ solAssert(dataIter.key().isString());`
`573`	`574`	`std::string dataItemID = dataIter.key().asString();`
`574`	`575`	`Json::Value const& dataItem = data[dataItemID];`
`575`	`576`	`if (dataItem.isString())`