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

2 files changed, 4 insertions, 1 deletions

diff --git a/TestHelper.cpp b/TestHelper.cpp
index 02a883db..20c42a9b 100644
--- a/TestHelper.cpp
+++ b/TestHelper.cpp
@@ -42,11 +42,14 @@ void mine(Client& c, int numBlocks)
 
 void connectClients(Client& c1, Client& c2)
 {
+	// TODO: Move to WebThree. eth::Client no longer handles networking.
+#if 0
 	short c1Port = 20000;
 	short c2Port = 21000;
 	c1.startNetwork(c1Port);
 	c2.startNetwork(c2Port);
 	c2.connect("127.0.0.1", c1Port);
+#endif
 }
 
 }
diff --git a/peer.cpp b/peer.cpp
index 821aab51..a99ce720 100644
--- a/peer.cpp
+++ b/peer.cpp
@@ -46,7 +46,7 @@ int peerTest(int argc, char** argv)
 			remoteHost = argv[i];
 	}
 
-	Host ph("Test", listenPort);
+	Host ph("Test", NetworkPreferences(listenPort));
 
 	if (!remoteHost.empty())
 		ph.connect(remoteHost, remotePort);