stop making History be a Service, it wasn't necessary

diff --git a/src/allmydata/client.py b/src/allmydata/client.py
index 51f96d1d8b43e91c5bcc45f8fe80d2da6c880c27..a664660ae314225dc6d42ceb460aa1e7ed714c1a 100644 (file)
--- a/src/allmydata/client.py
+++ b/src/allmydata/client.py
@@ -258,7 +258,7 @@ class Client(node.Node, pollmixin.PollMixin):
         self.convergence = base32.a2b(convergence_s)
 
         self.init_client_storage_broker()
-        self.history = self.add_service(History(self.stats_provider))
+        self.history = History(self.stats_provider)
         self.add_service(Uploader(helper_furl, self.stats_provider))
         download_cachedir = os.path.join(self.basedir,
                                          "private", "cache", "download")
@@ -329,7 +329,7 @@ class Client(node.Node, pollmixin.PollMixin):
                                    self._key_generator)
 
     def get_history(self):
-        return self.getServiceNamed("history")
+        return self.history
 
     def init_control(self):
         d = self.when_tub_ready()

diff --git a/src/allmydata/history.py b/src/allmydata/history.py
index d561699fe6b56a3ff5fe8290ae4046a8599b8fa2..f46eb6d4b5c80ed8a470be4fce44bbe967b09f2b 100644 (file)
--- a/src/allmydata/history.py
+++ b/src/allmydata/history.py
@@ -1,8 +1,7 @@
 
 import weakref
-from twisted.application import service
 
-class History(service.Service):
+class History:
     """Keep track of recent operations, for a status display."""
 
     name = "history"