upload.py: start removing wait_for_numpeers code
authorBrian Warner <warner@allmydata.com>
Thu, 10 Jan 2008 04:25:18 +0000 (21:25 -0700)
committerBrian Warner <warner@allmydata.com>
Thu, 10 Jan 2008 04:25:18 +0000 (21:25 -0700)
src/allmydata/upload.py

index 56c79ba865bef448e0eee0fe9f91d880d518529e..35fc655289737b7a3aefee4ba5a6a60557c869d5 100644 (file)
@@ -458,16 +458,6 @@ class CHKUploader:
         e = encode.Encoder(self._options, self)
         e.set_params(self._encoding_parameters)
         d = e.set_encrypted_uploadable(eu)
-        def _wait_for_peers(res):
-            wait_for_numpeers = self._wait_for_numpeers
-            if wait_for_numpeers is None:
-                # wait_for_numpeers = e.get_param("share_counts")[0] # XXX
-                wait_for_numpeers = 1
-
-            d1 = self._client.introducer_client.when_enough_peers(wait_for_numpeers)
-            d1.addCallback(lambda dummy: res)
-            return d1
-        d.addCallback(_wait_for_peers)
         d.addCallback(self.locate_all_shareholders)
         d.addCallback(self.set_shareholders, e)
         d.addCallback(lambda res: e.start())