From d3910593a08bf1718b35136d2119462c36e12920 Mon Sep 17 00:00:00 2001 From: Christoph Jentzsch Date: Mon, 10 Nov 2014 22:26:07 +0100 Subject: [PATCH 1/2] All unintended VM exceptions work like OOG in tests --- createRandomTest.cpp | 9 ++++++++- vm.cpp | 16 ++++++++++++---- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/createRandomTest.cpp b/createRandomTest.cpp index f74be9304..60a2039c8 100644 --- a/createRandomTest.cpp +++ b/createRandomTest.cpp @@ -32,6 +32,7 @@ #include #include #include +#include #include "vm.h" using namespace std; @@ -142,10 +143,16 @@ void doMyTests(json_spirit::mValue& v) vm.reset(fev.gas); bytes output; + u256 gas; try { output = vm.go(fev).toBytes(); } + catch (eth::VMException const& _e) + { + cnote << "VM did throw an exception: " << diagnostic_information(_e); + gas = 0; + } catch (Exception const& _e) { cnote << "VM did throw an exception: " << diagnostic_information(_e); @@ -176,6 +183,6 @@ void doMyTests(json_spirit::mValue& v) o["post"] = mValue(fev.exportState()); o["callcreates"] = fev.exportCallCreates(); o["out"] = "0x" + toHex(output); - fev.push(o, "gas", vm.gas()); + fev.push(o, "gas", gas); } } diff --git a/vm.cpp b/vm.cpp index b36d3dc2b..cacbf94cc 100644 --- a/vm.cpp +++ b/vm.cpp @@ -298,19 +298,27 @@ void doVMTests(json_spirit::mValue& v, bool _fillin) bytes output; VM vm(fev.gas); + + u256 gas; try { output = vm.go(fev, fev.simpleTrace()).toVector(); + gas = vm.gas(); + } + catch (VMException const& _e) + { + cnote << "VM did throw an exception: " << diagnostic_information(_e); + gas = 0; } catch (Exception const& _e) { cnote << "VM did throw an exception: " << diagnostic_information(_e); - //BOOST_ERROR("Failed VM Test with Exception: " << e.what()); + BOOST_ERROR("Failed VM Test with Exception: " << _e.what()); } catch (std::exception const& _e) { cnote << "VM did throw an exception: " << _e.what(); - //BOOST_ERROR("Failed VM Test with Exception: " << e.what()); + BOOST_ERROR("Failed VM Test with Exception: " << _e.what()); } // delete null entries in storage for the sake of comparison @@ -337,7 +345,7 @@ void doVMTests(json_spirit::mValue& v, bool _fillin) o["post"] = mValue(fev.exportState()); o["callcreates"] = fev.exportCallCreates(); o["out"] = "0x" + toHex(output); - fev.push(o, "gas", vm.gas()); + fev.push(o, "gas", gas); } else { @@ -352,7 +360,7 @@ void doVMTests(json_spirit::mValue& v, bool _fillin) checkOutput(output, o); - BOOST_CHECK_EQUAL(toInt(o["gas"]), vm.gas()); + BOOST_CHECK_EQUAL(toInt(o["gas"]), gas); auto& expectedAddrs = test.addresses; auto& resultAddrs = fev.addresses; From a12aa613ca40ee62b1f12d91b8acd6d5ee4f5dfc Mon Sep 17 00:00:00 2001 From: Gav Wood Date: Tue, 11 Nov 2014 10:54:48 +0000 Subject: [PATCH 2/2] Make OOG on precompileds consistent. Warning fix. Use high-res clock for randoms. Whisper test. --- whisperTopic.cpp | 84 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 whisperTopic.cpp diff --git a/whisperTopic.cpp b/whisperTopic.cpp new file mode 100644 index 000000000..493b37bc2 --- /dev/null +++ b/whisperTopic.cpp @@ -0,0 +1,84 @@ +/* + This file is part of cpp-ethereum. + + cpp-ethereum is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + cpp-ethereum is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with cpp-ethereum. If not, see . +*/ +/** @file whisperTopic.cpp + * @author Gav Wood + * @date 2014 + */ +#include +#include +#include +#include +#include +using namespace std; +using namespace dev; +using namespace dev::p2p; +using namespace dev::shh; + +BOOST_AUTO_TEST_SUITE(whisper) + +BOOST_AUTO_TEST_CASE(topic) +{ + g_logVerbosity = 0; + + bool started = false; + unsigned result = 0; + std::thread listener([&]() + { + setThreadName("other"); + + Host ph("Test", NetworkPreferences(30303, "", false, true)); + auto wh = ph.registerCapability(new WhisperHost()); + ph.start(); + + started = true; + + /// Only interested in odd packets + auto w = wh->installWatch(BuildTopicMask()("odd")); + + for (int i = 0, last = 0; i < 100 && last < 81; ++i) + { + for (auto i: wh->checkWatch(w)) + { + Message msg = wh->envelope(i).open(); + last = RLP(msg.payload()).toInt(); + cnote << "New message from:" << msg.from().abridged() << RLP(msg.payload()).toInt(); + result += last; + } + this_thread::sleep_for(chrono::milliseconds(50)); + } + }); + + while (!started) + this_thread::sleep_for(chrono::milliseconds(50)); + + Host ph("Test", NetworkPreferences(30300, "", false, true)); + auto wh = ph.registerCapability(new WhisperHost()); + ph.start(); + ph.connect("127.0.0.1", 30303); + + KeyPair us = KeyPair::create(); + for (int i = 0; i < 10; ++i) + { + wh->post(us.sec(), RLPStream().append(i * i).out(), BuildTopic(i)(i % 2 ? "odd" : "even")); + this_thread::sleep_for(chrono::milliseconds(250)); + } + + listener.join(); + BOOST_REQUIRE_EQUAL(result, 1 + 9 + 25 + 49 + 81); +} + +BOOST_AUTO_TEST_SUITE_END()