diff --git a/test/EVMHost.cpp b/test/EVMHost.cpp index b7755f28f..d23e2c548 100644 --- a/test/EVMHost.cpp +++ b/test/EVMHost.cpp @@ -35,17 +35,17 @@ using namespace dev; using namespace dev::test; -evmc::vm* EVMHost::getVM(string const& _path) +evmc::VM* EVMHost::getVM(string const& _path) { - static unique_ptr theVM; + static unique_ptr theVM; if (!theVM && !_path.empty()) { evmc_loader_error_code errorCode = {}; - evmc_instance* vm = evmc_load_and_configure(_path.c_str(), &errorCode); + evmc_vm* vm = evmc_load_and_configure(_path.c_str(), &errorCode); if (vm && errorCode == EVMC_LOADER_SUCCESS) { if (evmc_vm_has_capability(vm, EVMC_CAPABILITY_EVM1)) - theVM = make_unique(vm); + theVM = make_unique(vm); else { evmc_destroy(vm); @@ -63,7 +63,7 @@ evmc::vm* EVMHost::getVM(string const& _path) return theVM.get(); } -EVMHost::EVMHost(langutil::EVMVersion _evmVersion, evmc::vm* _vm): +EVMHost::EVMHost(langutil::EVMVersion _evmVersion, evmc::VM* _vm): m_vm(_vm) { if (!m_vm) diff --git a/test/EVMHost.h b/test/EVMHost.h index c01d27ad0..2ffcabcfa 100644 --- a/test/EVMHost.h +++ b/test/EVMHost.h @@ -40,9 +40,9 @@ public: /// Tries to dynamically load libevmone. @returns nullptr on failure. /// The path has to be provided for the first successful run and will be ignored /// afterwards. - static evmc::vm* getVM(std::string const& _path = {}); + static evmc::VM* getVM(std::string const& _path = {}); - explicit EVMHost(langutil::EVMVersion _evmVersion, evmc::vm* _vm = getVM()); + explicit EVMHost(langutil::EVMVersion _evmVersion, evmc::VM* _vm = getVM()); struct Account { @@ -179,7 +179,7 @@ private: /// @note The return value is only valid as long as @a _data is alive! static evmc::result resultWithGas(evmc_message const& _message, bytes const& _data) noexcept; - evmc::vm* m_vm = nullptr; + evmc::VM* m_vm = nullptr; evmc_revision m_evmVersion; }; diff --git a/test/tools/ossfuzz/abiV2ProtoFuzzer.cpp b/test/tools/ossfuzz/abiV2ProtoFuzzer.cpp index 91bd4b8e2..9d7308299 100644 --- a/test/tools/ossfuzz/abiV2ProtoFuzzer.cpp +++ b/test/tools/ossfuzz/abiV2ProtoFuzzer.cpp @@ -24,7 +24,7 @@ #include -static evmc::vm evmone = evmc::vm{evmc_create_evmone()}; +static evmc::VM evmone = evmc::VM{evmc_create_evmone()}; using namespace dev::test::abiv2fuzzer; using namespace dev::test;