Let Uploader retain History instead of passing it into upload(). Fixes #1079.

[tahoe-lafs/tahoe-lafs.git] / src / allmydata / client.py

diff --git a/src/allmydata/client.py b/src/allmydata/client.py
index b030867bc19ef6a293df02bd42c030a401cf4e30..ed0ff9a096d2a67ab0c2f5be184c67c59f027472 100644 (file)
--- a/src/allmydata/client.py
+++ b/src/allmydata/client.py
@@ -278,7 +278,8 @@ class Client(node.Node, pollmixin.PollMixin):
         self.history = History(self.stats_provider)
         self.terminator = Terminator()
         self.terminator.setServiceParent(self)
-        self.add_service(Uploader(helper_furl, self.stats_provider))
+        self.add_service(Uploader(helper_furl, self.stats_provider,
+                                  self.history))
         self.init_stub_client()
         self.init_blacklist()
         self.init_nodemaker()
@@ -513,4 +514,4 @@ class Client(node.Node, pollmixin.PollMixin):
 
     def upload(self, uploadable):
         uploader = self.getServiceNamed("uploader")
-        return uploader.upload(uploadable, history=self.get_history())
+        return uploader.upload(uploadable)