updates and fixes for code review

2 files changed, 20 insertions, 24 deletions

diff --git a/peer.cpp b/peer.cpp
index 51e777a5..5c3e677f 100644
--- a/peer.cpp
+++ b/peer.cpp
@@ -51,10 +51,11 @@ BOOST_AUTO_TEST_SUITE_END()
 
 int peerTest(int argc, char** argv)
 {
+	Public remoteAlias;
 	short listenPort = 30303;
 	string remoteHost;
 	short remotePort = 30303;
-
+	
 	for (int i = 1; i < argc; ++i)
 	{
 		string arg = argv[i];
@@ -64,21 +65,18 @@ int peerTest(int argc, char** argv)
 			remoteHost = argv[++i];
 		else if (arg == "-p" && i + 1 < argc)
 			remotePort = (short)atoi(argv[++i]);
+		else if (arg == "-ra" && i + 1 < argc)
+			remoteAlias = Public(dev::fromHex(argv[++i]));
 		else
 			remoteHost = argv[i];
 	}
 
 	Host ph("Test", NetworkPreferences(listenPort));
 
-	if (!remoteHost.empty())
-		ph.addNode(NodeId(), remoteHost, remotePort, remotePort);
+	if (!remoteHost.empty() && !remoteAlias)
+		ph.addNode(remoteAlias, remoteHost, remotePort, remotePort);
 
-//	for (int i = 0; ; ++i)
-//	{
-//		this_thread::sleep_for(chrono::milliseconds(100));
-//		if (!(i % 10))
-//			ph.keepAlivePeers();
-//	}
+	this_thread::sleep_for(chrono::milliseconds(200));
 
 	return 0;
 }
diff --git a/whisperTopic.cpp b/whisperTopic.cpp
index 9f0f3463..02fccbc9 100644
--- a/whisperTopic.cpp
+++ b/whisperTopic.cpp
@@ -34,29 +34,27 @@ BOOST_AUTO_TEST_CASE(topic)
 {
 	cnote << "Testing Whisper...";
 	auto oldLogVerbosity = g_logVerbosity;
-	g_logVerbosity = 0;
+	g_logVerbosity = 5;
 
-	Host ph1("Test", NetworkPreferences(30303, "127.0.0.1", true, true));
+	Host phOther("Test", NetworkPreferences(30303, "127.0.0.1", true, true));
+	auto whOther = phOther.registerCapability(new WhisperHost());
+	phOther.start();
 	
 	bool started = false;
 	unsigned result = 0;
 	std::thread listener([&]()
 	{
 		setThreadName("other");
-
-		auto wh = ph1.registerCapability(new WhisperHost());
-		ph1.start();
-
 		started = true;
 
 		/// Only interested in odd packets
-		auto w = wh->installWatch(BuildTopicMask("odd"));
+		auto w = whOther->installWatch(BuildTopicMask("odd"));
 
 		for (int i = 0, last = 0; i < 200 && last < 81; ++i)
 		{
-			for (auto i: wh->checkWatch(w))
+			for (auto i: whOther->checkWatch(w))
 			{
-				Message msg = wh->envelope(i).open();
+				Message msg = whOther->envelope(i).open();
 				last = RLP(msg.payload()).toInt<unsigned>();
 				cnote << "New message from:" << msg.from().abridged() << RLP(msg.payload()).toInt<unsigned>();
 				result += last;
@@ -65,16 +63,16 @@ BOOST_AUTO_TEST_CASE(topic)
 		}
 	});
 
-	while (!started)
-		this_thread::sleep_for(chrono::milliseconds(50));
-
 	Host ph("Test", NetworkPreferences(30300, "127.0.0.1", true, true));
 	auto wh = ph.registerCapability(new WhisperHost());
-	this_thread::sleep_for(chrono::milliseconds(500));
 	ph.start();
-	this_thread::sleep_for(chrono::milliseconds(500));
-	ph.addNode(ph1.id(), "127.0.0.1", 30303, 30303);
+	ph.addNode(phOther.id(), "127.0.0.1", 30303, 30303);
 
+	this_thread::sleep_for(chrono::milliseconds(300));
+	while (!started)
+		this_thread::sleep_for(chrono::milliseconds(25));
+
+	
 	KeyPair us = KeyPair::create();
 	for (int i = 0; i < 10; ++i)
 	{