Library libdevcore renamed to libsolutil.

test/CMakeLists.txt

@@ -24,20 +24,20 @@ set(contracts_sources
 )
 detect_stray_source_files("${contracts_sources}" "contracts/")
 
-set(libdevcore_sources
-    libdevcore/Checksum.cpp
-    libdevcore/CommonData.cpp
-    libdevcore/IndentedWriter.cpp
-    libdevcore/IpfsHash.cpp
-    libdevcore/IterateReplacing.cpp
-    libdevcore/JSON.cpp
-    libdevcore/Keccak256.cpp
-    libdevcore/StringUtils.cpp
-    libdevcore/SwarmHash.cpp
-    libdevcore/UTF8.cpp
-    libdevcore/Whiskers.cpp
+set(libsolutil_sources
+    libsolutil/Checksum.cpp
+    libsolutil/CommonData.cpp
+    libsolutil/IndentedWriter.cpp
+    libsolutil/IpfsHash.cpp
+    libsolutil/IterateReplacing.cpp
+    libsolutil/JSON.cpp
+    libsolutil/Keccak256.cpp
+    libsolutil/StringUtils.cpp
+    libsolutil/SwarmHash.cpp
+    libsolutil/UTF8.cpp
+    libsolutil/Whiskers.cpp
 )
-detect_stray_source_files("${libdevcore_sources}" "libdevcore/")
+detect_stray_source_files("${libsolutil_sources}" "libsolutil/")
 
 set(libevmasm_sources
     libevmasm/Assembler.cpp
@@ -151,7 +151,7 @@ detect_stray_source_files("${libyul_sources}" "libyul/")
 
 add_executable(soltest ${sources}
     ${contracts_sources}
-    ${libdevcore_sources}
+    ${libsolutil_sources}
     ${liblangutil_sources}
     ${libevmasm_sources}
     ${libyul_sources}

test/Common.cpp

@@ -17,7 +17,7 @@
 
 #include <test/Common.h>
 
-#include <libdevcore/Assertions.h>
+#include <libsolutil/Assertions.h>
 #include <boost/filesystem.hpp>
 #include <boost/program_options.hpp>
 

test/Common.h

@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include <libdevcore/Exceptions.h>
+#include <libsolutil/Exceptions.h>
 #include <liblangutil/EVMVersion.h>
 
 #include <boost/filesystem/path.hpp>

test/EVMHost.cpp

@@ -25,10 +25,10 @@
 
 #include <libevmasm/GasMeter.h>
 
-#include <libdevcore/Exceptions.h>
-#include <libdevcore/Assertions.h>
-#include <libdevcore/Keccak256.h>
-#include <libdevcore/picosha2.h>
+#include <libsolutil/Exceptions.h>
+#include <libsolutil/Assertions.h>
+#include <libsolutil/Keccak256.h>
+#include <libsolutil/picosha2.h>
 
 using namespace std;
 using namespace solidity;

test/EVMHost.h

@@ -27,7 +27,7 @@
 
 #include <liblangutil/EVMVersion.h>
 
-#include <libdevcore/FixedHash.h>
+#include <libsolutil/FixedHash.h>
 
 namespace solidity::test
 {

test/ExecutionFramework.cpp

@@ -26,7 +26,7 @@
 
 #include <test/evmc/evmc.hpp>
 
-#include <libdevcore/CommonIO.h>
+#include <libsolutil/CommonIO.h>
 
 #include <boost/test/framework.hpp>
 #include <boost/algorithm/string/replace.hpp>

test/ExecutionFramework.h

@@ -29,8 +29,8 @@
 
 #include <liblangutil/EVMVersion.h>
 
-#include <libdevcore/FixedHash.h>
-#include <libdevcore/Keccak256.h>
+#include <libsolutil/FixedHash.h>
+#include <libsolutil/Keccak256.h>
 
 #include <functional>
 

test/Metadata.cpp

@@ -21,9 +21,9 @@
 
 #include <string>
 #include <iostream>
-#include <libdevcore/Assertions.h>
-#include <libdevcore/CommonData.h>
-#include <libdevcore/JSON.h>
+#include <libsolutil/Assertions.h>
+#include <libsolutil/CommonData.h>
+#include <libsolutil/JSON.h>
 #include <test/Metadata.h>
 
 using namespace std;

test/Metadata.h

@@ -19,7 +19,7 @@
  * Metadata processing helpers.
  */
 
-#include <libdevcore/CommonData.h>
+#include <libsolutil/CommonData.h>
 
 #include <map>
 #include <optional>

test/TestCase.cpp

@@ -17,7 +17,7 @@
 
 #include <test/TestCase.h>
 
-#include <libdevcore/StringUtils.h>
+#include <libsolutil/StringUtils.h>
 
 #include <boost/algorithm/cxx11/none_of.hpp>
 #include <boost/algorithm/string.hpp>

test/libevmasm/Assembler.cpp

@@ -20,7 +20,7 @@
  * Tests for the assembler.
  */
 
-#include <libdevcore/JSON.h>
+#include <libsolutil/JSON.h>
 #include <libevmasm/Assembly.h>
 
 #include <boost/test/unit_test.hpp>

test/liblll/Compiler.cpp

@@ -22,7 +22,7 @@
 
 #include <test/Options.h>
 
-#include <libdevcore/FixedHash.h>
+#include <libsolutil/FixedHash.h>
 
 #include <liblll/Compiler.h>
 

test/libsolidity/ABIJsonTest.cpp

@@ -23,8 +23,8 @@
 #include <test/Options.h>
 
 #include <libsolidity/interface/CompilerStack.h>
-#include <libdevcore/JSON.h>
-#include <libdevcore/AnsiColorized.h>
+#include <libsolutil/JSON.h>
+#include <libsolutil/AnsiColorized.h>
 
 #include <boost/algorithm/string.hpp>
 

test/libsolidity/ASTJSONTest.cpp

@@ -17,7 +17,7 @@
 
 #include <test/libsolidity/ASTJSONTest.h>
 #include <test/Options.h>
-#include <libdevcore/AnsiColorized.h>
+#include <libsolutil/AnsiColorized.h>
 #include <liblangutil/SourceReferenceFormatterHuman.h>
 #include <libsolidity/ast/ASTJsonConverter.h>
 #include <libsolidity/interface/CompilerStack.h>

test/libsolidity/ASTJSONTest.h

@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include <libdevcore/AnsiColorized.h>
+#include <libsolutil/AnsiColorized.h>
 #include <test/TestCase.h>
 
 #include <iosfwd>

test/libsolidity/AnalysisFramework.cpp

@@ -29,7 +29,7 @@
 
 #include <liblangutil/Scanner.h>
 
-#include <libdevcore/Keccak256.h>
+#include <libsolutil/Keccak256.h>
 
 #include <boost/test/unit_test.hpp>
 

test/libsolidity/ErrorCheck.cpp

@@ -20,7 +20,7 @@
  */
 
 #include <test/libsolidity/ErrorCheck.h>
-#include <libdevcore/Exceptions.h>
+#include <libsolutil/Exceptions.h>
 
 #include <string>
 #include <set>

test/libsolidity/GasCosts.cpp

@@ -20,7 +20,7 @@
 
 #include <test/libsolidity/SolidityExecutionFramework.h>
 #include <liblangutil/EVMVersion.h>
-#include <libdevcore/IpfsHash.h>
+#include <libsolutil/IpfsHash.h>
 #include <libevmasm/GasMeter.h>
 
 #include <cmath>

test/libsolidity/GasTest.cpp

@@ -17,8 +17,8 @@
 
 #include <test/libsolidity/GasTest.h>
 #include <test/Options.h>
-#include <libdevcore/CommonIO.h>
-#include <libdevcore/JSON.h>
+#include <libsolutil/CommonIO.h>
+#include <libsolutil/JSON.h>
 #include <liblangutil/SourceReferenceFormatterHuman.h>
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/predicate.hpp>

test/libsolidity/LibSolc.cpp

@@ -21,7 +21,7 @@
 
 #include <string>
 #include <boost/test/unit_test.hpp>
-#include <libdevcore/JSON.h>
+#include <libsolutil/JSON.h>
 #include <libsolidity/interface/ReadFile.h>
 #include <libsolidity/interface/Version.h>
 #include <libsolc/libsolc.h>

test/libsolidity/Metadata.cpp

@@ -23,9 +23,9 @@
 #include <test/Options.h>
 #include <libsolidity/interface/CompilerStack.h>
 #include <libsolidity/interface/Version.h>
-#include <libdevcore/SwarmHash.h>
-#include <libdevcore/IpfsHash.h>
-#include <libdevcore/JSON.h>
+#include <libsolutil/SwarmHash.h>
+#include <libsolutil/IpfsHash.h>
+#include <libsolutil/JSON.h>
 
 using namespace std;
 

test/libsolidity/SMTCheckerJSONTest.cpp

@@ -18,8 +18,8 @@
 #include <test/libsolidity/SMTCheckerJSONTest.h>
 #include <test/Options.h>
 #include <libsolidity/interface/StandardCompiler.h>
-#include <libdevcore/CommonIO.h>
-#include <libdevcore/JSON.h>
+#include <libsolutil/CommonIO.h>
+#include <libsolutil/JSON.h>
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/join.hpp>
 #include <boost/algorithm/string/predicate.hpp>

test/libsolidity/SMTCheckerJSONTest.h

@@ -19,7 +19,7 @@
 
 #include <test/libsolidity/SyntaxTest.h>
 
-#include <libdevcore/JSON.h>
+#include <libsolutil/JSON.h>
 
 #include <string>
 

test/libsolidity/SemanticTest.h

@@ -20,7 +20,7 @@
 #include <test/libsolidity/AnalysisFramework.h>
 #include <test/TestCase.h>
 #include <liblangutil/Exceptions.h>
-#include <libdevcore/AnsiColorized.h>
+#include <libsolutil/AnsiColorized.h>
 
 #include <iosfwd>
 #include <string>

test/libsolidity/SolidityEndToEndTest.cpp

@@ -31,7 +31,7 @@
 
 #include <libevmasm/Assembly.h>
 
-#include <libdevcore/Keccak256.h>
+#include <libsolutil/Keccak256.h>
 
 #include <boost/range/adaptor/transformed.hpp>
 #include <boost/test/unit_test.hpp>

test/libsolidity/SolidityNameAndTypeResolution.cpp

@@ -26,7 +26,7 @@
 
 #include <libsolidity/ast/AST.h>
 
-#include <libdevcore/Keccak256.h>
+#include <libsolutil/Keccak256.h>
 
 #include <boost/test/unit_test.hpp>
 

test/libsolidity/SolidityNatspecJSON.cpp

@@ -22,10 +22,10 @@
 
 #include <test/Options.h>
 #include <string>
-#include <libdevcore/JSON.h>
+#include <libsolutil/JSON.h>
 #include <libsolidity/interface/CompilerStack.h>
 #include <liblangutil/Exceptions.h>
-#include <libdevcore/Exceptions.h>
+#include <libsolutil/Exceptions.h>
 
 using namespace solidity::langutil;
 

test/libsolidity/SolidityTypes.cpp

@@ -23,7 +23,7 @@
 #include <libsolidity/ast/Types.h>
 #include <libsolidity/ast/TypeProvider.h>
 #include <libsolidity/ast/AST.h>
-#include <libdevcore/Keccak256.h>
+#include <libsolutil/Keccak256.h>
 #include <boost/test/unit_test.hpp>
 
 using namespace std;

test/libsolidity/StandardCompiler.cpp

@@ -23,7 +23,7 @@
 #include <boost/test/unit_test.hpp>
 #include <libsolidity/interface/StandardCompiler.h>
 #include <libsolidity/interface/Version.h>
-#include <libdevcore/JSON.h>
+#include <libsolutil/JSON.h>
 #include <test/Metadata.h>
 
 using namespace std;

test/libsolidity/SyntaxTest.h

@@ -20,7 +20,7 @@
 #include <test/libsolidity/AnalysisFramework.h>
 #include <test/TestCase.h>
 #include <liblangutil/Exceptions.h>
-#include <libdevcore/AnsiColorized.h>
+#include <libsolutil/AnsiColorized.h>
 
 #include <iosfwd>
 #include <string>

test/libsolidity/util/BytesUtils.cpp

@@ -22,7 +22,7 @@
 
 #include <liblangutil/Common.h>
 
-#include <libdevcore/StringUtils.h>
+#include <libsolutil/StringUtils.h>
 
 #include <boost/algorithm/string.hpp>
 

test/libsolidity/util/BytesUtils.h

@@ -16,7 +16,7 @@
 
 #include <test/libsolidity/util/SoltestTypes.h>
 
-#include <libdevcore/CommonData.h>
+#include <libsolutil/CommonData.h>
 
 namespace solidity::frontend::test
 {

test/libsolidity/util/ContractABIUtils.h

@@ -18,7 +18,7 @@
 
 #include <test/libsolidity/util/SoltestErrors.h>
 
-#include <libdevcore/CommonData.h>
+#include <libsolutil/CommonData.h>
 
 #include <json/json.h>
 

test/libsolidity/util/SoltestErrors.h

@@ -14,9 +14,9 @@
 
 #pragma once
 
-#include <libdevcore/AnsiColorized.h>
-#include <libdevcore/CommonData.h>
-#include <libdevcore/Exceptions.h>
+#include <libsolutil/AnsiColorized.h>
+#include <libsolutil/CommonData.h>
+#include <libsolutil/Exceptions.h>
 
 namespace solidity::frontend::test
 {

test/libsolidity/util/SoltestTypes.h

@@ -14,8 +14,8 @@
 
 #pragma once
 
-#include <libdevcore/AnsiColorized.h>
-#include <libdevcore/CommonData.h>
+#include <libsolutil/AnsiColorized.h>
+#include <libsolutil/CommonData.h>
 #include <libsolidity/ast/Types.h>
 
 namespace solidity::frontend::test

test/libsolidity/util/TestFileParser.h

@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <libdevcore/CommonData.h>
+#include <libsolutil/CommonData.h>
 #include <libsolidity/ast/Types.h>
 #include <liblangutil/Exceptions.h>
 #include <test/libsolidity/util/SoltestTypes.h>

test/libsolidity/util/TestFunctionCall.cpp

@@ -17,7 +17,7 @@
 #include <test/libsolidity/util/BytesUtils.h>
 #include <test/libsolidity/util/ContractABIUtils.h>
 
-#include <libdevcore/AnsiColorized.h>
+#include <libsolutil/AnsiColorized.h>
 
 #include <boost/algorithm/string/replace.hpp>
 

test/libsolidity/util/TestFunctionCall.h

@@ -19,8 +19,8 @@
 
 #include <libsolidity/ast/Types.h>
 #include <liblangutil/Exceptions.h>
-#include <libdevcore/AnsiColorized.h>
-#include <libdevcore/CommonData.h>
+#include <libsolutil/AnsiColorized.h>
+#include <libsolutil/CommonData.h>
 
 #include <json/json.h>
 

test/libsolutil/Checksum.cpp

@@ -18,8 +18,8 @@
  * Unit tests for the address checksum.
  */
 
-#include <libdevcore/CommonData.h>
-#include <libdevcore/Exceptions.h>
+#include <libsolutil/CommonData.h>
+#include <libsolutil/Exceptions.h>
 
 
 #include <test/Options.h>

test/libsolutil/CommonData.cpp

@@ -18,9 +18,9 @@
  * Unit tests for the StringUtils routines.
  */
 
-#include <libdevcore/Common.h>
-#include <libdevcore/CommonData.h>
-#include <libdevcore/FixedHash.h>
+#include <libsolutil/Common.h>
+#include <libsolutil/CommonData.h>
+#include <libsolutil/FixedHash.h>
 #include <libsolidity/ast/Types.h> // for IntegerType
 
 #include <test/Options.h>

test/libsolutil/IndentedWriter.cpp

@@ -18,7 +18,7 @@
  * Unit tests for IndentedWriter.
  */
 
-#include <libdevcore/IndentedWriter.h>
+#include <libsolutil/IndentedWriter.h>
 
 #include <test/Options.h>
 

test/libsolutil/IpfsHash.cpp

@@ -18,7 +18,7 @@
  * Unit tests for the ipfs hash computation routine.
  */
 
-#include <libdevcore/IpfsHash.h>
+#include <libsolutil/IpfsHash.h>
 
 #include <test/Options.h>
 

test/libsolutil/IterateReplacing.cpp

@@ -18,7 +18,7 @@
  * Unit tests for the iterateReplacing function
  */
 
-#include <libdevcore/CommonData.h>
+#include <libsolutil/CommonData.h>
 
 #include <test/Options.h>
 

test/libsolutil/JSON.cpp

@@ -19,7 +19,7 @@
  * Unit tests for JSON.h.
  */
 
-#include <libdevcore/JSON.h>
+#include <libsolutil/JSON.h>
 
 #include <test/Options.h>
 

test/libsolutil/Keccak256.cpp

@@ -17,7 +17,7 @@
 /**
  * Unit tests for keccak256.
  */
-#include <libdevcore/Keccak256.h>
+#include <libsolutil/Keccak256.h>
 
 #include <boost/test/unit_test.hpp>
 

test/libsolutil/StringUtils.cpp

@@ -18,9 +18,9 @@
  * Unit tests for the StringUtils routines.
  */
 
-#include <libdevcore/CommonData.h>
-#include <libdevcore/FixedHash.h>
-#include <libdevcore/StringUtils.h>
+#include <libsolutil/CommonData.h>
+#include <libsolutil/FixedHash.h>
+#include <libsolutil/StringUtils.h>
 
 #include <libsolidity/ast/Types.h>  // for IntegerType
 

test/libsolutil/SwarmHash.cpp

@@ -18,11 +18,11 @@
  * Unit tests for the swarm hash computation routine.
  */
 
-#include <libdevcore/SwarmHash.h>
+#include <libsolutil/SwarmHash.h>
 
 #include <test/Options.h>
 
-#include <libdevcore/Keccak256.h>
+#include <libsolutil/Keccak256.h>
 
 using namespace std;
 

test/libsolutil/UTF8.cpp

@@ -18,8 +18,8 @@
  * Unit tests for UTF-8 validation.
  */
 
-#include <libdevcore/CommonData.h>
-#include <libdevcore/UTF8.h>
+#include <libsolutil/CommonData.h>
+#include <libsolutil/UTF8.h>
 
 #include <test/Options.h>
 

test/libsolutil/Whiskers.cpp

@@ -18,7 +18,7 @@
  * Unit tests for the mini moustache class.
  */
 
-#include <libdevcore/Whiskers.h>
+#include <libsolutil/Whiskers.h>
 
 #include <test/Options.h>
 

test/libyul/EwasmTranslationTest.cpp

@@ -31,7 +31,7 @@
 #include <liblangutil/ErrorReporter.h>
 #include <liblangutil/SourceReferenceFormatter.h>
 
-#include <libdevcore/AnsiColorized.h>
+#include <libsolutil/AnsiColorized.h>
 
 #include <boost/test/unit_test.hpp>
 #include <boost/algorithm/string.hpp>

test/libyul/FunctionSideEffects.cpp

@@ -19,7 +19,7 @@
 #include <test/Options.h>
 #include <test/libyul/Common.h>
 
-#include <libdevcore/AnsiColorized.h>
+#include <libsolutil/AnsiColorized.h>
 
 #include <libyul/SideEffects.h>
 #include <libyul/optimiser/CallGraphGenerator.h>
@@ -27,7 +27,7 @@
 #include <libyul/Object.h>
 #include <libyul/backends/evm/EVMDialect.h>
 
-#include <libdevcore/StringUtils.h>
+#include <libsolutil/StringUtils.h>
 
 #include <boost/algorithm/string.hpp>
 

test/libyul/FunctionSideEffects.h

@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include <libdevcore/AnsiColorized.h>
+#include <libsolutil/AnsiColorized.h>
 #include <test/TestCase.h>
 
 #include <iosfwd>

test/libyul/ObjectCompilerTest.cpp

@@ -17,7 +17,7 @@
 
 #include <test/libyul/ObjectCompilerTest.h>
 
-#include <libdevcore/AnsiColorized.h>
+#include <libsolutil/AnsiColorized.h>
 
 #include <libyul/AssemblyStack.h>
 

test/libyul/YulInterpreterTest.cpp

@@ -29,7 +29,7 @@
 #include <liblangutil/ErrorReporter.h>
 #include <liblangutil/SourceReferenceFormatter.h>
 
-#include <libdevcore/AnsiColorized.h>
+#include <libsolutil/AnsiColorized.h>
 
 #include <boost/test/unit_test.hpp>
 #include <boost/algorithm/string.hpp>

test/libyul/YulOptimizerTest.cpp

@@ -70,7 +70,7 @@
 #include <liblangutil/ErrorReporter.h>
 #include <liblangutil/Scanner.h>
 
-#include <libdevcore/AnsiColorized.h>
+#include <libsolutil/AnsiColorized.h>
 
 #include <boost/test/unit_test.hpp>
 #include <boost/algorithm/string.hpp>

test/tools/IsolTestOptions.cpp

@@ -20,7 +20,7 @@
 
 #include <test/tools/IsolTestOptions.h>
 
-#include <libdevcore/Assertions.h>
+#include <libsolutil/Assertions.h>
 
 #include <boost/filesystem.hpp>
 

test/tools/afl_fuzzer.cpp

@@ -20,7 +20,7 @@
 
 #include <test/tools/fuzzer_common.h>
 
-#include <libdevcore/CommonIO.h>
+#include <libsolutil/CommonIO.h>
 
 #include <boost/program_options.hpp>
 

test/tools/fuzzer_common.cpp

@@ -17,7 +17,7 @@
 
 #include <test/tools/fuzzer_common.h>
 
-#include <libdevcore/JSON.h>
+#include <libsolutil/JSON.h>
 #include <libevmasm/Assembly.h>
 #include <libevmasm/ConstantOptimiser.h>
 #include <libsolc/libsolc.h>

test/tools/isoltest.cpp

@@ -15,8 +15,8 @@
 	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <libdevcore/CommonIO.h>
-#include <libdevcore/AnsiColorized.h>
+#include <libsolutil/CommonIO.h>
+#include <libsolutil/AnsiColorized.h>
 
 #include <test/Common.h>
 #include <test/tools/IsolTestOptions.h>

test/tools/ossfuzz/abiV2FuzzerCommon.h

@@ -7,7 +7,7 @@
 #include <liblangutil/Exceptions.h>
 #include <liblangutil/SourceReferenceFormatter.h>
 
-#include <libdevcore/Keccak256.h>
+#include <libsolutil/Keccak256.h>
 
 namespace solidity::test::abiv2fuzzer
 {

test/tools/ossfuzz/protoToAbiV2.h

@@ -2,10 +2,10 @@
 
 #include <test/tools/ossfuzz/abiV2Proto.pb.h>
 
-#include <libdevcore/FixedHash.h>
-#include <libdevcore/Keccak256.h>
-#include <libdevcore/StringUtils.h>
-#include <libdevcore/Whiskers.h>
+#include <libsolutil/FixedHash.h>
+#include <libsolutil/Keccak256.h>
+#include <libsolutil/StringUtils.h>
+#include <libsolutil/Whiskers.h>
 
 #include <liblangutil/Exceptions.h>
 

test/tools/ossfuzz/protoToYul.cpp

@@ -20,7 +20,7 @@
 
 #include <libyul/Exceptions.h>
 
-#include <libdevcore/StringUtils.h>
+#include <libsolutil/StringUtils.h>
 
 #include <boost/algorithm/cxx11/all_of.hpp>
 #include <boost/algorithm/string/classification.hpp>

test/tools/ossfuzz/protoToYul.h

@@ -27,9 +27,9 @@
 
 #include <test/tools/ossfuzz/yulProto.pb.h>
 
-#include <libdevcore/Common.h>
-#include <libdevcore/FixedHash.h>
-#include <libdevcore/Whiskers.h>
+#include <libsolutil/Common.h>
+#include <libsolutil/FixedHash.h>
+#include <libsolutil/Whiskers.h>
 
 namespace solidity::yul::test::yul_fuzzer
 {

test/tools/ossfuzz/strictasm_diff_ossfuzz.cpp

@@ -27,8 +27,8 @@
 #include <liblangutil/EVMVersion.h>
 #include <liblangutil/SourceReferenceFormatter.h>
 
-#include <libdevcore/CommonIO.h>
-#include <libdevcore/CommonData.h>
+#include <libsolutil/CommonIO.h>
+#include <libsolutil/CommonData.h>
 
 #include <test/tools/ossfuzz/yulFuzzerCommon.h>
 

test/tools/yulInterpreter/EVMInstructionInterpreter.cpp

@@ -27,7 +27,7 @@
 
 #include <libevmasm/Instruction.h>
 
-#include <libdevcore/Keccak256.h>
+#include <libsolutil/Keccak256.h>
 
 using namespace std;
 using namespace solidity;

test/tools/yulInterpreter/EVMInstructionInterpreter.h

@@ -22,7 +22,7 @@
 
 #include <libyul/AsmDataForward.h>
 
-#include <libdevcore/CommonData.h>
+#include <libsolutil/CommonData.h>
 
 #include <vector>
 

test/tools/yulInterpreter/EwasmBuiltinInterpreter.cpp

@@ -27,7 +27,7 @@
 
 #include <libevmasm/Instruction.h>
 
-#include <libdevcore/Keccak256.h>
+#include <libsolutil/Keccak256.h>
 
 using namespace std;
 using namespace solidity;

test/tools/yulInterpreter/EwasmBuiltinInterpreter.h

@@ -22,7 +22,7 @@
 
 #include <libyul/AsmDataForward.h>
 
-#include <libdevcore/CommonData.h>
+#include <libsolutil/CommonData.h>
 
 #include <vector>
 

test/tools/yulInterpreter/Interpreter.cpp

@@ -31,7 +31,7 @@
 
 #include <liblangutil/Exceptions.h>
 
-#include <libdevcore/FixedHash.h>
+#include <libsolutil/FixedHash.h>
 
 #include <boost/range/adaptor/reversed.hpp>
 #include <boost/algorithm/cxx11/all_of.hpp>

test/tools/yulInterpreter/Interpreter.h

@@ -23,10 +23,10 @@
 #include <libyul/AsmDataForward.h>
 #include <libyul/optimiser/ASTWalker.h>
 
-#include <libdevcore/FixedHash.h>
-#include <libdevcore/CommonData.h>
+#include <libsolutil/FixedHash.h>
+#include <libsolutil/CommonData.h>
 
-#include <libdevcore/Exceptions.h>
+#include <libsolutil/Exceptions.h>
 
 #include <map>
 

test/tools/yulopti.cpp

@@ -18,7 +18,7 @@
  * Interactive yul optimizer
  */
 
-#include <libdevcore/CommonIO.h>
+#include <libsolutil/CommonIO.h>
 #include <liblangutil/ErrorReporter.h>
 #include <liblangutil/Scanner.h>
 #include <libyul/AsmAnalysis.h>
@@ -66,7 +66,7 @@
 
 #include <libyul/backends/evm/EVMDialect.h>
 
-#include <libdevcore/JSON.h>
+#include <libsolutil/JSON.h>
 
 #include <boost/program_options.hpp>
 

test/tools/yulrun.cpp

@@ -32,8 +32,8 @@
 #include <liblangutil/EVMVersion.h>
 #include <liblangutil/SourceReferenceFormatter.h>
 
-#include <libdevcore/CommonIO.h>
-#include <libdevcore/CommonData.h>
+#include <libsolutil/CommonIO.h>
+#include <libsolutil/CommonData.h>
 
 #include <boost/program_options.hpp>