diff options
| -rw-r--r-- | jsonrpc.cpp | 2 | ||||
| -rw-r--r-- | solidityOptimizerTest.cpp | 2 | ||||
| -rw-r--r-- | trie.cpp | 7 | ||||
| -rw-r--r-- | whisperTopic.cpp | 5 |
4 files changed, 8 insertions, 8 deletions
diff --git a/jsonrpc.cpp b/jsonrpc.cpp index d17c5a59..20ffc6d5 100644 --- a/jsonrpc.cpp +++ b/jsonrpc.cpp @@ -19,7 +19,7 @@ * @date 2014 */ -#if ETH_JSONRPC +#if ETH_JSONRPC && 0 #include <boost/test/unit_test.hpp> #include <boost/lexical_cast.hpp> diff --git a/solidityOptimizerTest.cpp b/solidityOptimizerTest.cpp index f8d3b552..b689fe54 100644 --- a/solidityOptimizerTest.cpp +++ b/solidityOptimizerTest.cpp @@ -48,7 +48,7 @@ public: m_optimize = true; bytes optimizedBytecode = compileAndRun(_sourceCode, _value, _contractName); int sizeDiff = nonOptimizedBytecode.size() - optimizedBytecode.size(); - BOOST_CHECK_MESSAGE(sizeDiff >= _expectedSizeDecrease, "Bytecode did only shrink by " + BOOST_CHECK_MESSAGE(sizeDiff >= (int)_expectedSizeDecrease, "Bytecode did only shrink by " + boost::lexical_cast<string>(sizeDiff) + " bytes, expected: " + boost::lexical_cast<string>(_expectedSizeDecrease)); m_optimizedContract = m_contractAddress; @@ -59,8 +59,8 @@ BOOST_AUTO_TEST_CASE(trie_tests) cnote << "Testing Trie..."; js::mValue v; - string s = asString(contents(testPath + "/trietest.json")); - BOOST_REQUIRE_MESSAGE(s.length() > 0, "Contents of 'trietest.json' is empty. Have you cloned the 'tests' repo branch develop?"); + string s = asString(contents(testPath + "/trieanyorder.json")); + BOOST_REQUIRE_MESSAGE(s.length() > 0, "Contents of 'trieanyorder.json' is empty. Have you cloned the 'tests' repo branch develop?"); js::read_string(s, v); for (auto& i: v.get_obj()) { @@ -88,12 +88,11 @@ BOOST_AUTO_TEST_CASE(trie_tests) BOOST_REQUIRE(t.check(true)); } BOOST_REQUIRE(!o["root"].is_null()); - BOOST_CHECK_EQUAL(o["root"].get_str(), toHex(t.root().asArray())); + BOOST_CHECK_EQUAL(o["root"].get_str(), "0x" + toHex(t.root().asArray())); } } } - inline h256 stringMapHash256(StringMap const& _s) { return hash256(_s); diff --git a/whisperTopic.cpp b/whisperTopic.cpp index 941c790e..c5e59332 100644 --- a/whisperTopic.cpp +++ b/whisperTopic.cpp @@ -32,7 +32,8 @@ BOOST_AUTO_TEST_SUITE(whisper) BOOST_AUTO_TEST_CASE(topic) { - g_logVerbosity = 20; + cnote << "Testing Whisper..."; +// g_logVerbosity = 0; bool started = false; unsigned result = 0; @@ -80,7 +81,7 @@ BOOST_AUTO_TEST_CASE(topic) } listener.join(); - g_logVerbosity = 0; +// g_logVerbosity = 0; BOOST_REQUIRE_EQUAL(result, 1 + 9 + 25 + 49 + 81); } |