Wed Apr 4 19:13:59 BST 2012 Brian Warner <warner@lothar.com>

  * move IServer from storage_client.py to interfaces.py

diff --git a/src/allmydata/interfaces.py b/src/allmydata/interfaces.py
index a8b118025f4b88cb94ac60e801f06ee8cd130c12..facfc9221d4d287e82f24a192a26ac3b029cba6e 100644 (file)
--- a/src/allmydata/interfaces.py
+++ b/src/allmydata/interfaces.py
@@ -428,6 +428,15 @@ class IStorageBroker(Interface):
         repeatable way, to distribute load over many peers.
         """
 
+class IServer(Interface):
+    """I live in the client, and represent a single server."""
+    def start_connecting(tub, trigger_cb):
+        pass
+    def get_nickname():
+        pass
+    def get_rref():
+        pass
+
 
 class IMutableSlotWriter(Interface):
     """

diff --git a/src/allmydata/storage_client.py b/src/allmydata/storage_client.py
index b282dedda58d159b1539668aeac30b0335d89ece..425d2e48e7ddbb3d85d2228a03f904f648690f51 100644 (file)
--- a/src/allmydata/storage_client.py
+++ b/src/allmydata/storage_client.py
@@ -30,9 +30,9 @@ the foolscap-based server implemented in src/allmydata/storage/*.py .
 
 
 import time
-from zope.interface import implements, Interface
+from zope.interface import implements
 from foolscap.api import eventually
-from allmydata.interfaces import IStorageBroker
+from allmydata.interfaces import IStorageBroker, IServer
 from allmydata.util import idlib, log
 from allmydata.util.assertutil import precondition
 from allmydata.util.rrefutil import add_version_to_remote_reference
@@ -137,15 +137,6 @@ class StorageFarmBroker:
             return self.servers[serverid].get_nickname()
         return None
 
-class IServer(Interface):
-    """I live in the client, and represent a single server."""
-    def start_connecting(tub, trigger_cb):
-        pass
-    def get_nickname():
-        pass
-    def get_rref():
-        pass
-
 class NativeStorageServer:
     """I hold information about a storage server that we want to connect to.
     If we are connected, I hold the RemoteReference, their host address, and