diff options
| author | Paweł Bylica <pawel.bylica@imapp.pl> | 2015-05-12 17:53:46 +0800 |
|---|---|---|
| committer | Paweł Bylica <pawel.bylica@imapp.pl> | 2015-05-12 17:53:46 +0800 |
| commit | d5841327a2f0d8a990082bf4c16597e2b1f85926 (patch) | |
| tree | 42349a63fea8cd2298d0e71b037375342c5d3a8b /TestHelper.cpp | |
| parent | 5c283ffeefa9c77877aa98a739aff88760a60e31 (diff) | |
| parent | fba1cc6e980beb61214b9320e5feee00d756cfc2 (diff) | |
| download | dexon-solidity-d5841327a2f0d8a990082bf4c16597e2b1f85926.tar dexon-solidity-d5841327a2f0d8a990082bf4c16597e2b1f85926.tar.gz dexon-solidity-d5841327a2f0d8a990082bf4c16597e2b1f85926.tar.bz2 dexon-solidity-d5841327a2f0d8a990082bf4c16597e2b1f85926.tar.lz dexon-solidity-d5841327a2f0d8a990082bf4c16597e2b1f85926.tar.xz dexon-solidity-d5841327a2f0d8a990082bf4c16597e2b1f85926.tar.zst dexon-solidity-d5841327a2f0d8a990082bf4c16597e2b1f85926.zip | |
Merge remote-tracking branch 'upstream/develop' into feature/vm_gas_counter_refactor
Conflicts:
evmjit/libevmjit-cpp/JitVM.cpp
libevm/VMFactory.cpp
libevm/VMFactory.h
Diffstat (limited to 'TestHelper.cpp')
| -rw-r--r-- | TestHelper.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/TestHelper.cpp b/TestHelper.cpp index 144a1a28..dede4703 100644 --- a/TestHelper.cpp +++ b/TestHelper.cpp @@ -288,7 +288,7 @@ void ImportTest::checkExpectedState(State const& _stateExpect, State const& _sta { addressOptions = _expectedStateOptions.at(a.first); } - catch(std::out_of_range) + catch(std::out_of_range const&) { BOOST_ERROR("expectedStateOptions map does not match expectedState in checkExpectedState!"); break; @@ -305,7 +305,7 @@ void ImportTest::checkExpectedState(State const& _stateExpect, State const& _sta if (addressOptions.m_bHasStorage) { - map<u256, u256> stateStorage = _statePost.storage(a.first); + unordered_map<u256, u256> stateStorage = _statePost.storage(a.first); for (auto const& s: _stateExpect.storage(a.first)) CHECK(stateStorage[s.first] == s.second, "Check State: " << a.first << ": incorrect storage [" << s.first << "] = " << toHex(stateStorage[s.first]) << ", expected [" << s.first << "] = " << toHex(s.second)); @@ -707,10 +707,9 @@ Options::Options() { auto arg = std::string{argv[i]}; if (arg == "--jit") - { - jit = true; eth::VMFactory::setKind(eth::VMKind::JIT); - } + else if (arg == "--vm=smart") + eth::VMFactory::setKind(eth::VMKind::Smart); else if (arg == "--vmtrace") vmtrace = true; else if (arg == "--filltests") |