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

cameel · cameel · commit 5d0bac676d70 · 2023-10-20T20:35:49.000+02:00
diff --git a/libevmasm/Assembly.cpp b/libevmasm/Assembly.cpp
@@ -548,6 +548,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(
@@ -575,7 +576,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
`@@ -548,6 +548,7 @@ std::pair<std::shared_ptr<Assembly>, std::vector<std::string>> Assembly::fromJSO`
`548`	`548`	`if (_json.isMember("sourceList"))`
`549`	`549`	`{`
`550`	`550`	`solAssert(_level == 0);`
	`551`	`+ solAssert(_sourceList.empty());`
`551`	`552`	`for (Json::Value const& sourceName: _json["sourceList"])`
`552`	`553`	`{`
`553`	`554`	`solRequire(`
`@@ -575,7 +576,7 @@ std::pair<std::shared_ptr<Assembly>, std::vector<std::string>> Assembly::fromJSO`
`575`	`576`	`Json::Value const& data = _json[".data"];`
`576`	`577`	`for (Json::ValueConstIterator dataIter = data.begin(); dataIter != data.end(); dataIter++)`
`577`	`578`	`{`
`578`		`- solRequire(dataIter.key().isString(), AssemblyImportException, "Key inside '.data' is not a string.");`
	`579`	`+ solAssert(dataIter.key().isString());`
`579`	`580`	`std::string dataItemID = dataIter.key().asString();`
`580`	`581`	`Json::Value const& dataItem = data[dataItemID];`
`581`	`582`	`if (dataItem.isString())`