From: Daira Hopwood <daira@jacaranda.org>
Date: Thu, 5 Sep 2013 16:38:31 +0000 (+0100)
Subject: Wed Apr  4 19:13:59 BST 2012  Brian Warner <warner@lothar.com>
X-Git-Url: https://git.rkrishnan.org/pf/content/en/seg/class-simplejson.JSONDecoder.html?a=commitdiff_plain;h=a88b242385ac26e75bd0e963894eed48352d38dc;p=tahoe-lafs%2Ftahoe-lafs.git

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 a8b11802..facfc922 100644
--- 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 b282dedd..425d2e48 100644
--- 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