aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaweł Bylica <pawel.bylica@imapp.pl>2015-05-06 19:18:52 +0800
committerPaweł Bylica <pawel.bylica@imapp.pl>2015-05-06 19:18:52 +0800
commitb9a722223ad7eee9195230a97481da0d17cfad79 (patch)
treeab4c7ba23b1687a1e49fad95c7331027664bce10
parentfce1a7f82e48ddf3d73e00a2998f003d77f3d5f9 (diff)
downloaddexon-solidity-b9a722223ad7eee9195230a97481da0d17cfad79.tar
dexon-solidity-b9a722223ad7eee9195230a97481da0d17cfad79.tar.gz
dexon-solidity-b9a722223ad7eee9195230a97481da0d17cfad79.tar.bz2
dexon-solidity-b9a722223ad7eee9195230a97481da0d17cfad79.tar.lz
dexon-solidity-b9a722223ad7eee9195230a97481da0d17cfad79.tar.xz
dexon-solidity-b9a722223ad7eee9195230a97481da0d17cfad79.tar.zst
dexon-solidity-b9a722223ad7eee9195230a97481da0d17cfad79.zip
SmartVM: initial implementation
-rw-r--r--TestHelper.cpp7
-rw-r--r--TestHelper.h1
2 files changed, 3 insertions, 5 deletions
diff --git a/TestHelper.cpp b/TestHelper.cpp
index eecf6f80..b14c3571 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;
@@ -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")
diff --git a/TestHelper.h b/TestHelper.h
index 10e76aa9..834dc056 100644
--- a/TestHelper.h
+++ b/TestHelper.h
@@ -179,7 +179,6 @@ void checkAddresses(mapType& _expectedAddrs, mapType& _resultAddrs)
class Options
{
public:
- bool jit = false; ///< Use JIT
bool vmtrace = false; ///< Create EVM execution tracer // TODO: Link with log verbosity?
bool fillTests = false; ///< Create JSON test files from execution results
bool stats = false; ///< Execution time stats