diff --git a/test/tools/ossfuzz/protoToYul.cpp b/test/tools/ossfuzz/protoToYul.cpp index 03f0d2c39..36c779d9a 100644 --- a/test/tools/ossfuzz/protoToYul.cpp +++ b/test/tools/ossfuzz/protoToYul.cpp @@ -30,6 +30,7 @@ using namespace std; using namespace solidity::yul::test::yul_fuzzer; using namespace solidity::yul::test; +using namespace solidity::langutil; using namespace solidity::util; using namespace solidity; @@ -86,26 +87,26 @@ string ProtoConverter::createAlphaNum(string const& _strBytes) return tmp; } -langutil::EVMVersion ProtoConverter::evmVersionMapping(Program_Version const& _ver) +EVMVersion ProtoConverter::evmVersionMapping(Program_Version const& _ver) { switch (_ver) { case Program::HOMESTEAD: - return langutil::EVMVersion::homestead(); + return EVMVersion::homestead(); case Program::TANGERINE: - return langutil::EVMVersion::tangerineWhistle(); + return EVMVersion::tangerineWhistle(); case Program::SPURIOUS: - return langutil::EVMVersion::spuriousDragon(); + return EVMVersion::spuriousDragon(); case Program::BYZANTIUM: - return langutil::EVMVersion::byzantium(); + return EVMVersion::byzantium(); case Program::CONSTANTINOPLE: - return langutil::EVMVersion::constantinople(); + return EVMVersion::constantinople(); case Program::PETERSBURG: - return langutil::EVMVersion::petersburg(); + return EVMVersion::petersburg(); case Program::ISTANBUL: - return langutil::EVMVersion::istanbul(); + return EVMVersion::istanbul(); case Program::BERLIN: - return langutil::EVMVersion::berlin(); + return EVMVersion::berlin(); } } diff --git a/test/tools/ossfuzz/protoToYul.h b/test/tools/ossfuzz/protoToYul.h index 2814f9266..fa6455c90 100644 --- a/test/tools/ossfuzz/protoToYul.h +++ b/test/tools/ossfuzz/protoToYul.h @@ -60,7 +60,7 @@ public: std::string programToString(Program const& _input); /// Returns evm version - langutil::EVMVersion version() + solidity::langutil::EVMVersion version() { return m_evmVersion; } @@ -281,7 +281,7 @@ private: /// Returns an EVMVersion object corresponding to the protobuf /// enum of type Program_Version - langutil::EVMVersion evmVersionMapping(Program_Version const& _x); + solidity::langutil::EVMVersion evmVersionMapping(Program_Version const& _x); /// Returns a monotonically increasing counter that starts from zero. unsigned counter() @@ -382,6 +382,6 @@ private: /// block is enabled. bool m_forInitScopeExtEnabled; /// Object that holds the targeted evm version specified by protobuf input - langutil::EVMVersion m_evmVersion; + solidity::langutil::EVMVersion m_evmVersion; }; } diff --git a/test/tools/ossfuzz/yulProtoFuzzer.cpp b/test/tools/ossfuzz/yulProtoFuzzer.cpp index bca65e4c3..b834ddc92 100644 --- a/test/tools/ossfuzz/yulProtoFuzzer.cpp +++ b/test/tools/ossfuzz/yulProtoFuzzer.cpp @@ -29,6 +29,7 @@ using namespace solidity; using namespace solidity::yul; using namespace solidity::yul::test::yul_fuzzer; +using namespace solidity::langutil; using namespace std; DEFINE_PROTO_FUZZER(Program const& _input)