diff options
| author | Gav Wood <i@gavwood.com> | 2014-12-12 22:31:34 +0800 |
|---|---|---|
| committer | Gav Wood <i@gavwood.com> | 2014-12-12 22:31:34 +0800 |
| commit | 80c125923943287db0c1d019e5745b7ec4521626 (patch) | |
| tree | a028802c552de90ae7c0108cc19de4faaebe8dd5 | |
| parent | 73a2647474251168cde3febc6708eaa4d751e19d (diff) | |
| parent | d420db911633b41dee0d3d564020b0778b61c358 (diff) | |
| download | dexon-solidity-80c125923943287db0c1d019e5745b7ec4521626.tar.gz dexon-solidity-80c125923943287db0c1d019e5745b7ec4521626.tar.zst dexon-solidity-80c125923943287db0c1d019e5745b7ec4521626.zip | |
Merge branch 'develop' of github.com:ethereum/cpp-ethereum into develop
| -rw-r--r-- | createRandomTest.cpp | 8 | ||||
| -rw-r--r-- | vm.cpp | 8 |
2 files changed, 9 insertions, 7 deletions
diff --git a/createRandomTest.cpp b/createRandomTest.cpp index caeeb6b6..a1168845 100644 --- a/createRandomTest.cpp +++ b/createRandomTest.cpp @@ -32,7 +32,7 @@ #include <libdevcore/CommonIO.h> #include <libdevcore/CommonData.h> #include <libevmcore/Instruction.h> -#include <libevm/VM.h> +#include <libevm/VMFactory.h> #include "vm.h" using namespace std; @@ -142,14 +142,14 @@ void doMyTests(json_spirit::mValue& v) } bytes output; - eth::VM vm(fev.gas); + auto vm = eth::VMFactory::create(fev.gas); u256 gas; bool vmExceptionOccured = false; try { - output = vm.go(fev, fev.simpleTrace()).toBytes(); - gas = vm.gas(); + output = vm->go(fev, fev.simpleTrace()).toBytes(); + gas = vm->gas(); } catch (eth::VMException const& _e) { @@ -21,6 +21,8 @@ */ #include <boost/filesystem.hpp> +#include <libethereum/Executive.h> +#include <libevm/VMFactory.h> #include "vm.h" using namespace std; @@ -298,14 +300,14 @@ void doVMTests(json_spirit::mValue& v, bool _fillin) } bytes output; - VM vm(fev.gas); + auto vm = eth::VMFactory::create(fev.gas); u256 gas; bool vmExceptionOccured = false; try { - output = vm.go(fev, fev.simpleTrace()).toBytes(); - gas = vm.gas(); + output = vm->go(fev, fev.simpleTrace()).toBytes(); + gas = vm->gas(); } catch (VMException const& _e) { |