Browse Source

style fix

cl-refactor
CJentzsch 10 years ago
parent
commit
38a8a25322
  1. 12
      test/checkRandomStateTest.cpp
  2. 6
      test/checkRandomVMTest.cpp
  3. 6
      test/createRandomVMTest.cpp

12
test/checkRandomStateTest.cpp

@ -14,7 +14,7 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with cpp-ethereum. If not, see <http://www.gnu.org/licenses/>. along with cpp-ethereum. If not, see <http://www.gnu.org/licenses/>.
*/ */
/** @file checkRandomTest.cpp /** @file checkRandomStateTest.cpp
* @author Christoph Jentzsch <jentzsch.simulationsoftware@gmail.com> * @author Christoph Jentzsch <jentzsch.simulationsoftware@gmail.com>
* @date 2015 * @date 2015
* Check a random test and return 0/1 for success or failure. To be used for efficiency in the random test simulation. * Check a random test and return 0/1 for success or failure. To be used for efficiency in the random test simulation.
@ -33,7 +33,7 @@ using namespace json_spirit;
using namespace dev::test; using namespace dev::test;
using namespace dev; using namespace dev;
bool doStateTest(mValue& v); bool doStateTest(mValue& _v);
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
@ -67,11 +67,11 @@ int main(int argc, char *argv[])
return ret; return ret;
} }
bool doStateTest(mValue& v) bool doStateTest(mValue& _v)
{ {
eth::VMFactory::setKind(eth::VMKind::JIT); eth::VMFactory::setKind(eth::VMKind::JIT);
for (auto& i: v.get_obj()) for (auto& i: _v.get_obj())
{ {
mObject& o = i.second.get_obj(); mObject& o = i.second.get_obj();
@ -152,7 +152,9 @@ bool doStateTest(mValue& v)
auto& expectedAddr = expectedPair.first; auto& expectedAddr = expectedPair.first;
auto resultAddrIt = resultAddrs.find(expectedAddr); auto resultAddrIt = resultAddrs.find(expectedAddr);
if (resultAddrIt == resultAddrs.end()) if (resultAddrIt == resultAddrs.end())
BOOST_ERROR("Missing expected address " << expectedAddr); {
cout << "Missing expected address " << expectedAddr;
return 1;
else else
{ {
if (importer.m_statePost.balance(expectedAddr) != theState.balance(expectedAddr)) if (importer.m_statePost.balance(expectedAddr) != theState.balance(expectedAddr))

6
test/checkRandomVMTest.cpp

@ -32,7 +32,7 @@ using namespace json_spirit;
using namespace dev::test; using namespace dev::test;
using namespace dev; using namespace dev;
bool doVMTest(mValue& v); bool doVMTest(mValue& _v);
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
@ -66,11 +66,11 @@ int main(int argc, char *argv[])
return ret; return ret;
} }
bool doVMTest(mValue& v) bool doVMTest(mValue& _v)
{ {
eth::VMFactory::setKind(eth::VMKind::JIT); eth::VMFactory::setKind(eth::VMKind::JIT);
for (auto& i: v.get_obj()) for (auto& i: _v.get_obj())
{ {
cnote << i.first; cnote << i.first;
mObject& o = i.second.get_obj(); mObject& o = i.second.get_obj();

6
test/createRandomVMTest.cpp

@ -41,7 +41,7 @@ using namespace std;
using namespace json_spirit; using namespace json_spirit;
using namespace dev; using namespace dev;
void doMyTests(json_spirit::mValue& v); void doMyTests(json_spirit::mValue& _v);
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
@ -127,11 +127,11 @@ int main(int argc, char *argv[])
return 0; return 0;
} }
void doMyTests(json_spirit::mValue& v) void doMyTests(json_spirit::mValue& _v)
{ {
eth::VMFactory::setKind(eth::VMKind::Interpreter); eth::VMFactory::setKind(eth::VMKind::Interpreter);
for (auto& i: v.get_obj()) for (auto& i: _v.get_obj())
{ {
cnote << i.first; cnote << i.first;
mObject& o = i.second.get_obj(); mObject& o = i.second.get_obj();

Loading…
Cancel
Save