diff options
| author | Marek Kotewicz <marek.kotewicz@gmail.com> | 2014-12-12 17:28:23 +0800 |
|---|---|---|
| committer | Marek Kotewicz <marek.kotewicz@gmail.com> | 2014-12-12 17:28:23 +0800 |
| commit | 4fbf9105c35c6e13c5b9e2fa44b3c8570a85e05b (patch) | |
| tree | dd2d26920ba3eda39395acf758191cd57fd4e560 | |
| parent | b95fbab7c2935c7ceee6908ed3f5a33afc354683 (diff) | |
| parent | 98722ae8e842f54ff1dd67756cfeae7177431665 (diff) | |
| download | dexon-solidity-4fbf9105c35c6e13c5b9e2fa44b3c8570a85e05b.tar.gz dexon-solidity-4fbf9105c35c6e13c5b9e2fa44b3c8570a85e05b.tar.zst dexon-solidity-4fbf9105c35c6e13c5b9e2fa44b3c8570a85e05b.zip | |
Merge branch 'develop' into build_enhancement
| -rw-r--r-- | genesis.cpp | 2 | ||||
| -rw-r--r-- | whisperTopic.cpp | 16 |
2 files changed, 11 insertions, 7 deletions
diff --git a/genesis.cpp b/genesis.cpp index 90974d1b..1b354dab 100644 --- a/genesis.cpp +++ b/genesis.cpp @@ -60,7 +60,7 @@ BOOST_AUTO_TEST_CASE(genesis_tests) BOOST_CHECK_EQUAL(BlockChain::genesis().stateRoot, h256(o["genesis_state_root"].get_str())); BOOST_CHECK_EQUAL(toHex(BlockChain::createGenesisBlock()), toHex(fromHex(o["genesis_rlp_hex"].get_str()))); - BOOST_CHECK_EQUAL(sha3(BlockChain::createGenesisBlock()), h256(o["genesis_hash"].get_str())); + BOOST_CHECK_EQUAL(BlockInfo::headerHash(BlockChain::createGenesisBlock()), h256(o["genesis_hash"].get_str())); } BOOST_AUTO_TEST_SUITE_END() diff --git a/whisperTopic.cpp b/whisperTopic.cpp index 493b37bc..941c790e 100644 --- a/whisperTopic.cpp +++ b/whisperTopic.cpp @@ -32,7 +32,7 @@ BOOST_AUTO_TEST_SUITE(whisper) BOOST_AUTO_TEST_CASE(topic) { - g_logVerbosity = 0; + g_logVerbosity = 20; bool started = false; unsigned result = 0; @@ -40,16 +40,16 @@ BOOST_AUTO_TEST_CASE(topic) { setThreadName("other"); - Host ph("Test", NetworkPreferences(30303, "", false, true)); + Host ph("Test", NetworkPreferences(50303, "", false, true)); auto wh = ph.registerCapability(new WhisperHost()); ph.start(); started = true; /// Only interested in odd packets - auto w = wh->installWatch(BuildTopicMask()("odd")); + auto w = wh->installWatch(BuildTopicMask("odd")); - for (int i = 0, last = 0; i < 100 && last < 81; ++i) + for (int i = 0, last = 0; i < 200 && last < 81; ++i) { for (auto i: wh->checkWatch(w)) { @@ -65,10 +65,12 @@ BOOST_AUTO_TEST_CASE(topic) while (!started) this_thread::sleep_for(chrono::milliseconds(50)); - Host ph("Test", NetworkPreferences(30300, "", false, true)); + Host ph("Test", NetworkPreferences(50300, "", false, true)); auto wh = ph.registerCapability(new WhisperHost()); + this_thread::sleep_for(chrono::milliseconds(500)); ph.start(); - ph.connect("127.0.0.1", 30303); + this_thread::sleep_for(chrono::milliseconds(500)); + ph.connect("127.0.0.1", 50303); KeyPair us = KeyPair::create(); for (int i = 0; i < 10; ++i) @@ -78,6 +80,8 @@ BOOST_AUTO_TEST_CASE(topic) } listener.join(); + g_logVerbosity = 0; + BOOST_REQUIRE_EQUAL(result, 1 + 9 + 25 + 49 + 81); } |