From ce4ac86884e4860eb0ab654212c6e31207274e42 Mon Sep 17 00:00:00 2001
From: Mike Hearn <hearn@google.com>
Date: Tue, 10 Dec 2013 13:13:52 -0800
Subject: [PATCH] Move discovery package into net package.

---
 core/src/main/java/com/google/bitcoin/core/PeerGroup.java     | 4 ++--
 core/src/main/java/com/google/bitcoin/kits/WalletAppKit.java  | 2 +-
 .../com/google/bitcoin/{ => net}/discovery/DnsDiscovery.java  | 2 +-
 .../com/google/bitcoin/{ => net}/discovery/IrcDiscovery.java  | 2 +-
 .../com/google/bitcoin/{ => net}/discovery/PeerDiscovery.java | 2 +-
 .../bitcoin/{ => net}/discovery/PeerDiscoveryException.java   | 2 +-
 .../com/google/bitcoin/{ => net}/discovery/SeedPeers.java     | 2 +-
 core/src/test/java/com/google/bitcoin/core/PeerGroupTest.java | 4 ++--
 .../com/google/bitcoin/{ => net}/discovery/SeedPeersTest.java | 2 +-
 .../main/java/com/google/bitcoin/examples/PeerMonitor.java    | 2 +-
 .../src/main/java/com/google/bitcoin/examples/PrintPeers.java | 4 ++--
 tools/src/main/java/com/google/bitcoin/tools/WalletTool.java  | 4 ++--
 .../src/main/java/com/google/bitcoin/tools/WatchMempool.java  | 2 +-
 13 files changed, 17 insertions(+), 17 deletions(-)
 rename core/src/main/java/com/google/bitcoin/{ => net}/discovery/DnsDiscovery.java (99%)
 rename core/src/main/java/com/google/bitcoin/{ => net}/discovery/IrcDiscovery.java (99%)
 rename core/src/main/java/com/google/bitcoin/{ => net}/discovery/PeerDiscovery.java (96%)
 rename core/src/main/java/com/google/bitcoin/{ => net}/discovery/PeerDiscoveryException.java (96%)
 rename core/src/main/java/com/google/bitcoin/{ => net}/discovery/SeedPeers.java (99%)
 rename core/src/test/java/com/google/bitcoin/{ => net}/discovery/SeedPeersTest.java (97%)

diff --git a/core/src/main/java/com/google/bitcoin/core/PeerGroup.java b/core/src/main/java/com/google/bitcoin/core/PeerGroup.java
index 8b2d3e15..bfccffec 100644
--- a/core/src/main/java/com/google/bitcoin/core/PeerGroup.java
+++ b/core/src/main/java/com/google/bitcoin/core/PeerGroup.java
@@ -17,8 +17,8 @@
 
 package com.google.bitcoin.core;
 
-import com.google.bitcoin.discovery.PeerDiscovery;
-import com.google.bitcoin.discovery.PeerDiscoveryException;
+import com.google.bitcoin.net.discovery.PeerDiscovery;
+import com.google.bitcoin.net.discovery.PeerDiscoveryException;
 import com.google.bitcoin.script.Script;
 import com.google.bitcoin.net.ClientConnectionManager;
 import com.google.bitcoin.net.NioClientManager;
diff --git a/core/src/main/java/com/google/bitcoin/kits/WalletAppKit.java b/core/src/main/java/com/google/bitcoin/kits/WalletAppKit.java
index 8a6f74b2..e418de33 100644
--- a/core/src/main/java/com/google/bitcoin/kits/WalletAppKit.java
+++ b/core/src/main/java/com/google/bitcoin/kits/WalletAppKit.java
@@ -17,7 +17,7 @@
 package com.google.bitcoin.kits;
 
 import com.google.bitcoin.core.*;
-import com.google.bitcoin.discovery.DnsDiscovery;
+import com.google.bitcoin.net.discovery.DnsDiscovery;
 import com.google.bitcoin.store.BlockStoreException;
 import com.google.bitcoin.store.SPVBlockStore;
 import com.google.bitcoin.store.WalletProtobufSerializer;
diff --git a/core/src/main/java/com/google/bitcoin/discovery/DnsDiscovery.java b/core/src/main/java/com/google/bitcoin/net/discovery/DnsDiscovery.java
similarity index 99%
rename from core/src/main/java/com/google/bitcoin/discovery/DnsDiscovery.java
rename to core/src/main/java/com/google/bitcoin/net/discovery/DnsDiscovery.java
index 56636ad1..b95d3287 100644
--- a/core/src/main/java/com/google/bitcoin/discovery/DnsDiscovery.java
+++ b/core/src/main/java/com/google/bitcoin/net/discovery/DnsDiscovery.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.bitcoin.discovery;
+package com.google.bitcoin.net.discovery;
 
 import com.google.bitcoin.core.NetworkParameters;
 import com.google.common.collect.Lists;
diff --git a/core/src/main/java/com/google/bitcoin/discovery/IrcDiscovery.java b/core/src/main/java/com/google/bitcoin/net/discovery/IrcDiscovery.java
similarity index 99%
rename from core/src/main/java/com/google/bitcoin/discovery/IrcDiscovery.java
rename to core/src/main/java/com/google/bitcoin/net/discovery/IrcDiscovery.java
index bdddb639..05bf6e98 100644
--- a/core/src/main/java/com/google/bitcoin/discovery/IrcDiscovery.java
+++ b/core/src/main/java/com/google/bitcoin/net/discovery/IrcDiscovery.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.bitcoin.discovery;
+package com.google.bitcoin.net.discovery;
 
 import com.google.bitcoin.core.AddressFormatException;
 import com.google.bitcoin.core.Base58;
diff --git a/core/src/main/java/com/google/bitcoin/discovery/PeerDiscovery.java b/core/src/main/java/com/google/bitcoin/net/discovery/PeerDiscovery.java
similarity index 96%
rename from core/src/main/java/com/google/bitcoin/discovery/PeerDiscovery.java
rename to core/src/main/java/com/google/bitcoin/net/discovery/PeerDiscovery.java
index ee36b86a..670384e6 100644
--- a/core/src/main/java/com/google/bitcoin/discovery/PeerDiscovery.java
+++ b/core/src/main/java/com/google/bitcoin/net/discovery/PeerDiscovery.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.bitcoin.discovery;
+package com.google.bitcoin.net.discovery;
 
 import java.net.InetSocketAddress;
 import java.util.concurrent.TimeUnit;
diff --git a/core/src/main/java/com/google/bitcoin/discovery/PeerDiscoveryException.java b/core/src/main/java/com/google/bitcoin/net/discovery/PeerDiscoveryException.java
similarity index 96%
rename from core/src/main/java/com/google/bitcoin/discovery/PeerDiscoveryException.java
rename to core/src/main/java/com/google/bitcoin/net/discovery/PeerDiscoveryException.java
index e88e275c..fe45a1a4 100644
--- a/core/src/main/java/com/google/bitcoin/discovery/PeerDiscoveryException.java
+++ b/core/src/main/java/com/google/bitcoin/net/discovery/PeerDiscoveryException.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.bitcoin.discovery;
+package com.google.bitcoin.net.discovery;
 
 public class PeerDiscoveryException extends Exception {
     private static final long serialVersionUID = -2863411151549391392L;
diff --git a/core/src/main/java/com/google/bitcoin/discovery/SeedPeers.java b/core/src/main/java/com/google/bitcoin/net/discovery/SeedPeers.java
similarity index 99%
rename from core/src/main/java/com/google/bitcoin/discovery/SeedPeers.java
rename to core/src/main/java/com/google/bitcoin/net/discovery/SeedPeers.java
index c165f6ce..d52220a5 100644
--- a/core/src/main/java/com/google/bitcoin/discovery/SeedPeers.java
+++ b/core/src/main/java/com/google/bitcoin/net/discovery/SeedPeers.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.bitcoin.discovery;
+package com.google.bitcoin.net.discovery;
 
 import com.google.bitcoin.core.NetworkParameters;
 
diff --git a/core/src/test/java/com/google/bitcoin/core/PeerGroupTest.java b/core/src/test/java/com/google/bitcoin/core/PeerGroupTest.java
index d03f1eb5..3418ca28 100644
--- a/core/src/test/java/com/google/bitcoin/core/PeerGroupTest.java
+++ b/core/src/test/java/com/google/bitcoin/core/PeerGroupTest.java
@@ -16,8 +16,8 @@
 
 package com.google.bitcoin.core;
 
-import com.google.bitcoin.discovery.PeerDiscovery;
-import com.google.bitcoin.discovery.PeerDiscoveryException;
+import com.google.bitcoin.net.discovery.PeerDiscovery;
+import com.google.bitcoin.net.discovery.PeerDiscoveryException;
 import com.google.bitcoin.params.UnitTestParams;
 import com.google.bitcoin.store.MemoryBlockStore;
 import com.google.bitcoin.utils.TestUtils;
diff --git a/core/src/test/java/com/google/bitcoin/discovery/SeedPeersTest.java b/core/src/test/java/com/google/bitcoin/net/discovery/SeedPeersTest.java
similarity index 97%
rename from core/src/test/java/com/google/bitcoin/discovery/SeedPeersTest.java
rename to core/src/test/java/com/google/bitcoin/net/discovery/SeedPeersTest.java
index b929f6f3..6dc2f753 100644
--- a/core/src/test/java/com/google/bitcoin/discovery/SeedPeersTest.java
+++ b/core/src/test/java/com/google/bitcoin/net/discovery/SeedPeersTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.bitcoin.discovery;
+package com.google.bitcoin.net.discovery;
 
 import com.google.bitcoin.params.MainNetParams;
 import org.junit.Test;
diff --git a/examples/src/main/java/com/google/bitcoin/examples/PeerMonitor.java b/examples/src/main/java/com/google/bitcoin/examples/PeerMonitor.java
index 605cc18c..8c52ae75 100644
--- a/examples/src/main/java/com/google/bitcoin/examples/PeerMonitor.java
+++ b/examples/src/main/java/com/google/bitcoin/examples/PeerMonitor.java
@@ -20,7 +20,7 @@ import com.google.bitcoin.core.AbstractPeerEventListener;
 import com.google.bitcoin.core.NetworkParameters;
 import com.google.bitcoin.core.Peer;
 import com.google.bitcoin.core.PeerGroup;
-import com.google.bitcoin.discovery.DnsDiscovery;
+import com.google.bitcoin.net.discovery.DnsDiscovery;
 import com.google.bitcoin.params.MainNetParams;
 import com.google.bitcoin.utils.BriefLogFormatter;
 import com.google.common.collect.Lists;
diff --git a/examples/src/main/java/com/google/bitcoin/examples/PrintPeers.java b/examples/src/main/java/com/google/bitcoin/examples/PrintPeers.java
index 58ad17f7..e86ec7d1 100644
--- a/examples/src/main/java/com/google/bitcoin/examples/PrintPeers.java
+++ b/examples/src/main/java/com/google/bitcoin/examples/PrintPeers.java
@@ -20,8 +20,8 @@ import com.google.bitcoin.core.AbstractPeerEventListener;
 import com.google.bitcoin.core.NetworkParameters;
 import com.google.bitcoin.core.Peer;
 import com.google.bitcoin.core.VersionMessage;
-import com.google.bitcoin.discovery.DnsDiscovery;
-import com.google.bitcoin.discovery.PeerDiscoveryException;
+import com.google.bitcoin.net.discovery.DnsDiscovery;
+import com.google.bitcoin.net.discovery.PeerDiscoveryException;
 import com.google.bitcoin.net.NioClientManager;
 import com.google.bitcoin.params.MainNetParams;
 import com.google.bitcoin.utils.BriefLogFormatter;
diff --git a/tools/src/main/java/com/google/bitcoin/tools/WalletTool.java b/tools/src/main/java/com/google/bitcoin/tools/WalletTool.java
index 6871c159..3ab721d9 100644
--- a/tools/src/main/java/com/google/bitcoin/tools/WalletTool.java
+++ b/tools/src/main/java/com/google/bitcoin/tools/WalletTool.java
@@ -18,8 +18,8 @@ package com.google.bitcoin.tools;
 
 import com.google.bitcoin.core.*;
 import com.google.bitcoin.crypto.KeyCrypterException;
-import com.google.bitcoin.discovery.DnsDiscovery;
-import com.google.bitcoin.discovery.PeerDiscovery;
+import com.google.bitcoin.net.discovery.DnsDiscovery;
+import com.google.bitcoin.net.discovery.PeerDiscovery;
 import com.google.bitcoin.params.MainNetParams;
 import com.google.bitcoin.params.RegTestParams;
 import com.google.bitcoin.params.TestNet3Params;
diff --git a/tools/src/main/java/com/google/bitcoin/tools/WatchMempool.java b/tools/src/main/java/com/google/bitcoin/tools/WatchMempool.java
index 5926ceca..4d76df13 100644
--- a/tools/src/main/java/com/google/bitcoin/tools/WatchMempool.java
+++ b/tools/src/main/java/com/google/bitcoin/tools/WatchMempool.java
@@ -1,7 +1,7 @@
 package com.google.bitcoin.tools;
 
 import com.google.bitcoin.core.*;
-import com.google.bitcoin.discovery.DnsDiscovery;
+import com.google.bitcoin.net.discovery.DnsDiscovery;
 import com.google.bitcoin.params.MainNetParams;
 import com.google.bitcoin.utils.BriefLogFormatter;
 import org.slf4j.Logger;