From 9511383c42fcd49f1537a10b3c2608c631a68737 Mon Sep 17 00:00:00 2001
From: Gav Wood <i@gavwood.com>
Date: Thu, 11 Sep 2014 13:27:15 +0200
Subject: [PATCH 1/3] Beginning of merge into AZ.

---
 peer.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/peer.cpp b/peer.cpp
index 821aab514..a99ce7201 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);

From ce3a2713f41d9d3a06c3d7aac0b06e538548af5d Mon Sep 17 00:00:00 2001
From: Gav Wood <i@gavwood.com>
Date: Mon, 15 Sep 2014 21:49:52 +0200
Subject: [PATCH 2/3] Remove old Client network code & API. Move over
 JsonRpcServer to WebThree.

---
 TestHelper.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/TestHelper.cpp b/TestHelper.cpp
index 02a883dbc..3b3be3fec 100644
--- a/TestHelper.cpp
+++ b/TestHelper.cpp
@@ -42,11 +42,13 @@ void mine(Client& c, int numBlocks)
 
 void connectClients(Client& c1, Client& c2)
 {
+#if 0
 	short c1Port = 20000;
 	short c2Port = 21000;
 	c1.startNetwork(c1Port);
 	c2.startNetwork(c2Port);
 	c2.connect("127.0.0.1", c1Port);
+#endif
 }
 
 }

From 583111ea6831cb97f83273f5758583f62345bb90 Mon Sep 17 00:00:00 2001
From: Gav Wood <i@gavwood.com>
Date: Tue, 16 Sep 2014 08:09:48 -0400
Subject: [PATCH 3/3] Moved miner over to new Worker class.

---
 TestHelper.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/TestHelper.cpp b/TestHelper.cpp
index 3b3be3fec..20c42a9b8 100644
--- a/TestHelper.cpp
+++ b/TestHelper.cpp
@@ -42,6 +42,7 @@ 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;