From 7ff49e87bf94f37bd360a17f8ba31e033752e461 Mon Sep 17 00:00:00 2001 From: Dimitry Date: Thu, 4 Jun 2015 18:14:41 +0300 Subject: [PATCH 1/2] Issues: VMTest filler fix --- test/libevm/vm.cpp | 3 ++- test/libevm/vm.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/test/libevm/vm.cpp b/test/libevm/vm.cpp index cb63e993c..2c56b7ada 100644 --- a/test/libevm/vm.cpp +++ b/test/libevm/vm.cpp @@ -160,7 +160,7 @@ mObject FakeExtVM::exportExec() ret["origin"] = toString(origin); ret["value"] = toCompactHex(value, HexPrefix::Add, 1); ret["gasPrice"] = toCompactHex(gasPrice, HexPrefix::Add, 1); - ret["gas"] = toCompactHex(gas, HexPrefix::Add, 1); + ret["gas"] = toCompactHex(execGas, HexPrefix::Add, 1); ret["data"] = toHex(data, 2, HexPrefix::Add); ret["code"] = toHex(code, 2, HexPrefix::Add); return ret; @@ -183,6 +183,7 @@ void FakeExtVM::importExec(mObject& _o) value = toInt(_o["value"]); gasPrice = toInt(_o["gasPrice"]); gas = toInt(_o["gas"]); + execGas = gas; thisTxCode.clear(); code = thisTxCode; diff --git a/test/libevm/vm.h b/test/libevm/vm.h index 18fa1ca25..a156b9408 100644 --- a/test/libevm/vm.h +++ b/test/libevm/vm.h @@ -80,7 +80,7 @@ public: eth::Transactions callcreates; bytes thisTxData; bytes thisTxCode; - u256 gas; + u256 gas, execGas; }; From 1cc8ac8bd599936c018573cd99258dab5af5ff2d Mon Sep 17 00:00:00 2001 From: Dimitry Date: Fri, 5 Jun 2015 15:36:47 +0300 Subject: [PATCH 2/2] VM Filler: Style --- test/libevm/vm.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/libevm/vm.h b/test/libevm/vm.h index a156b9408..6f86a57d6 100644 --- a/test/libevm/vm.h +++ b/test/libevm/vm.h @@ -80,7 +80,8 @@ public: eth::Transactions callcreates; bytes thisTxData; bytes thisTxCode; - u256 gas, execGas; + u256 gas; + u256 execGas; };