From 27e2f98278280a7c613252d3de557c4cf4096357 Mon Sep 17 00:00:00 2001 From: subtly Date: Wed, 4 Feb 2015 17:50:03 -0800 Subject: [PATCH] fix whispertopic test --- test/whisperTopic.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/test/whisperTopic.cpp b/test/whisperTopic.cpp index 9c88d1b24..1dcc6b9d6 100644 --- a/test/whisperTopic.cpp +++ b/test/whisperTopic.cpp @@ -40,15 +40,6 @@ BOOST_AUTO_TEST_CASE(topic) auto whOther = phOther.registerCapability(new WhisperHost()); phOther.start(); - Host ph("Test", NetworkPreferences(30300, "127.0.0.1", false, true)); - auto wh = ph.registerCapability(new WhisperHost()); - ph.start(); - - this_thread::sleep_for(chrono::milliseconds(100)); - ph.addNode(phOther.id(), "127.0.0.1", 30303, 30303); - - this_thread::sleep_for(chrono::milliseconds(500)); - bool started = false; unsigned result = 0; std::thread listener([&]() @@ -66,7 +57,7 @@ BOOST_AUTO_TEST_CASE(topic) { for (auto i: whOther->checkWatch(w)) { - Message msg = wh->envelope(i).open(wh->fullTopic(w)); + Message msg = whOther->envelope(i).open(whOther->fullTopic(w)); last = RLP(msg.payload()).toInt(); if (received.count(last)) continue; @@ -78,6 +69,15 @@ BOOST_AUTO_TEST_CASE(topic) } }); + + Host ph("Test", NetworkPreferences(30300, "127.0.0.1", false, true)); + auto wh = ph.registerCapability(new WhisperHost()); + ph.start(); + + this_thread::sleep_for(chrono::milliseconds(100)); + ph.addNode(phOther.id(), "127.0.0.1", 30303, 30303); + + this_thread::sleep_for(chrono::milliseconds(500)); while (!started) this_thread::sleep_for(chrono::milliseconds(2));