From: Brian Warner Date: Thu, 10 Jan 2008 04:25:18 +0000 (-0700) Subject: upload.py: start removing wait_for_numpeers code X-Git-Url: https://git.rkrishnan.org/simplejson/-?a=commitdiff_plain;h=d2f4aff9c265605fb4ca34033fa88c85f1313b8e;p=tahoe-lafs%2Ftahoe-lafs.git upload.py: start removing wait_for_numpeers code --- diff --git a/src/allmydata/upload.py b/src/allmydata/upload.py index 56c79ba8..35fc6552 100644 --- a/src/allmydata/upload.py +++ b/src/allmydata/upload.py @@ -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())