Skip to content

Commit a260000

Browse files
committed
EVMHost: Make it clear which MockedHost helpers are used
And also remove unused helpers.
1 parent e3c7369 commit a260000

File tree

2 files changed

+19
-19
lines changed

2 files changed

+19
-19
lines changed

test/EVMHost.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@ void EVMHost::transfer(evmc::MockedAccount& _sender, evmc::MockedAccount& _recip
190190
void EVMHost::selfdestruct(const evmc::address& _addr, const evmc::address& _beneficiary) noexcept
191191
{
192192
// TODO actual selfdestruct is even more complicated.
193+
// TODO reuse MockedHost::selfdestruct.
193194

194195
transfer(accounts[_addr], accounts[_beneficiary], convertFromEVMC(accounts[_addr].balance));
195196
accounts.erase(_addr);

test/EVMHost.h

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,25 @@ using StorageMap = std::map<evmc::bytes32, evmc::storage_value>;
4040
class EVMHost: public evmc::MockedHost
4141
{
4242
public:
43-
using MockedHost::get_code_size;
43+
// Verbatim features of MockedHost.
44+
using MockedHost::account_exists;
45+
using MockedHost::get_storage;
46+
using MockedHost::set_storage;
4447
using MockedHost::get_balance;
48+
using MockedHost::get_code_size;
49+
using MockedHost::get_code_hash;
50+
using MockedHost::copy_code;
51+
using MockedHost::get_tx_context;
52+
using MockedHost::emit_log;
53+
using MockedHost::access_account;
54+
using MockedHost::access_storage;
55+
56+
// Modified features of MockedHost.
57+
void selfdestruct(evmc::address const& _addr, evmc::address const& _beneficiary) noexcept final;
58+
evmc::result call(evmc_message const& _message) noexcept final;
59+
evmc::bytes32 get_block_hash(int64_t number) const noexcept final;
60+
61+
// Solidity testing specific features.
4562

4663
/// Tries to dynamically load an evmc vm supporting evm1 or ewasm and caches the loaded VM.
4764
/// @returns vmc::VM(nullptr) on failure.
@@ -71,28 +88,10 @@ class EVMHost: public evmc::MockedHost
7188
/// @returns contents of storage at @param _addr.
7289
StorageMap const& get_address_storage(evmc::address const& _addr);
7390

74-
bool account_exists(evmc::address const& _addr) const noexcept final
75-
{
76-
return evmc::MockedHost::account_exists(_addr);
77-
}
78-
79-
void selfdestruct(evmc::address const& _addr, evmc::address const& _beneficiary) noexcept final;
80-
81-
evmc::result call(evmc_message const& _message) noexcept final;
82-
83-
evmc::bytes32 get_block_hash(int64_t number) const noexcept final;
84-
8591
static Address convertFromEVMC(evmc::address const& _addr);
8692
static evmc::address convertToEVMC(Address const& _addr);
8793
static util::h256 convertFromEVMC(evmc::bytes32 const& _data);
8894
static evmc::bytes32 convertToEVMC(util::h256 const& _data);
89-
90-
/// @returns true, if the evmc VM has the given capability.
91-
bool hasCapability(evmc_capabilities capability) const noexcept
92-
{
93-
return m_vm.has_capability(capability);
94-
}
95-
9695
private:
9796
evmc::address m_currentAddress = {};
9897

0 commit comments

Comments
 (0)