ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-02-22 18:22:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove some bare asserts in retrieve.py (there are still quite a few left). refs #2462

Browse Source 
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
This commit is contained in:
Daira Hopwood 2015-07-07 21:01:33 +01:00 committed by Brian Warner
parent 49b0c686f1
commit 9076db137a
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/allmydata/mutable/retrieve.py
View File

@ -7,8 +7,10 @@ from twisted.python import failure
from twisted.internet.interfaces import IPushProducer, IConsumer from twisted.internet.interfaces import IPushProducer, IConsumer
from foolscap.api import eventually, fireEventually, DeadReferenceError, \ from foolscap.api import eventually, fireEventually, DeadReferenceError, \
RemoteException RemoteException
from allmydata.interfaces import IRetrieveStatus, NotEnoughSharesError, \ from allmydata.interfaces import IRetrieveStatus, NotEnoughSharesError, \
DownloadStopped, MDMF_VERSION, SDMF_VERSION DownloadStopped, MDMF_VERSION, SDMF_VERSION
from allmydata.util.assertutil import _assert
from allmydata.util import hashutil, log, mathutil, deferredutil from allmydata.util import hashutil, log, mathutil, deferredutil
from allmydata.util.dictutil import DictOfSets from allmydata.util.dictutil import DictOfSets
from allmydata import hashtree, codec from allmydata import hashtree, codec
@ -408,7 +410,9 @@ class Retrieve:
# offset we were given. # offset we were given.
start = self._offset // self._segment_size start = self._offset // self._segment_size
assert start < self._num_segments _assert(start < self._num_segments,
start=start, num_segments=self._num_segments,
offset=self._offset, segment_size=self._segment_size)
self._start_segment = start self._start_segment = start
self.log("got start segment: %d" % self._start_segment) self.log("got start segment: %d" % self._start_segment)
else: else:
@ -429,7 +433,10 @@ class Retrieve:
# but the one before it. # but the one before it.
end = (end_data - 1) // self._segment_size end = (end_data - 1) // self._segment_size
assert end < self._num_segments _assert(end < self._num_segments,
end=end, num_segments=self._num_segments,
end_data=end_data, offset=self._offset, read_length=self._read_length,
segment_size=self._segment_size)
self._last_segment = end self._last_segment = end
else: else:
self._last_segment = self._start_segment self._last_segment = self._start_segment