Merge remote-tracking branch 'upstream/develop' into evmjit

1 files changed, 7 insertions, 7 deletions

diff --git a/peer.cpp b/peer.cpp
index bfb4680d..48431504 100644
--- a/peer.cpp
+++ b/peer.cpp
@@ -35,8 +35,8 @@ BOOST_AUTO_TEST_CASE(host)
 	auto oldLogVerbosity = g_logVerbosity;
 	g_logVerbosity = 10;
 	
-	NetworkPreferences host1prefs(30301, "127.0.0.1", false, true);
-	NetworkPreferences host2prefs(30302, "127.0.0.1", false, true);
+	NetworkPreferences host1prefs("127.0.0.1", 30301, false);
+	NetworkPreferences host2prefs("127.0.0.1", 30302, false);
 	
 	Host host1("Test", host1prefs);
 	host1.start();
@@ -45,7 +45,7 @@ BOOST_AUTO_TEST_CASE(host)
 	auto node2 = host2.id();
 	host2.start();
 	
-	host1.addNode(node2, "127.0.0.1", host2prefs.listenPort, host2prefs.listenPort);
+	host1.addNode(node2, bi::address::from_string("127.0.0.1"), host2prefs.listenPort, host2prefs.listenPort);
 	
 	this_thread::sleep_for(chrono::seconds(3));
 	
@@ -62,7 +62,7 @@ BOOST_AUTO_TEST_CASE(save_nodes)
 	std::list<Host*> hosts;
 	for (auto i:{0,1,2,3,4,5})
 	{
-		Host* h = new Host("Test", NetworkPreferences(30300 + i, "127.0.0.1", false, true));
+		Host* h = new Host("Test", NetworkPreferences("127.0.0.1", 30300 + i, false));
 		h->setIdealPeerCount(10);
 		// starting host is required so listenport is available
 		h->start();
@@ -73,11 +73,11 @@ BOOST_AUTO_TEST_CASE(save_nodes)
 	
 	Host& host = *hosts.front();
 	for (auto const& h: hosts)
-		host.addNode(h->id(), "127.0.0.1", h->listenPort(), h->listenPort());
+		host.addNode(h->id(), bi::address::from_string("127.0.0.1"), h->listenPort(), h->listenPort());
 	
 	Host& host2 = *hosts.back();
 	for (auto const& h: hosts)
-		host2.addNode(h->id(), "127.0.0.1", h->listenPort(), h->listenPort());
+		host2.addNode(h->id(), bi::address::from_string("127.0.0.1"), h->listenPort(), h->listenPort());
 
 	this_thread::sleep_for(chrono::milliseconds(2000));
 	bytes firstHostNetwork(host.saveNetwork());
@@ -122,7 +122,7 @@ int peerTest(int argc, char** argv)
 	Host ph("Test", NetworkPreferences(listenPort));
 
 	if (!remoteHost.empty() && !remoteAlias)
-		ph.addNode(remoteAlias, remoteHost, remotePort, remotePort);
+		ph.addNode(remoteAlias, bi::address::from_string(remoteHost), remotePort, remotePort);
 
 	this_thread::sleep_for(chrono::milliseconds(200));