ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-01-04 12:14:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

hashtree.BadHashError: mention which leaf caused the problem

Browse Source
This commit is contained in:
Brian Warner 2007-06-07 12:38:22 -07:00
parent 2db17df833
commit a383c17444
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/allmydata/hashtree.py
View File

@ -304,6 +304,14 @@ class IncompleteHashTree(CompleteBinaryTreeMixin, list):
maybe_needed.add(self.first_leaf_num + leafnum) maybe_needed.add(self.first_leaf_num + leafnum)
return set([i for i in maybe_needed if self[i] is None]) return set([i for i in maybe_needed if self[i] is None])
def _name_hash(self, i):
name = "[%d of %d]" % (i, len(self))
if i >= self.first_leaf_num:
leafnum = i - self.first_leaf_num
numleaves = len(self) - self.first_leaf_num
name += " (leaf [%d] of %d)" % (leafnum, numleaves)
return name
def set_hashes(self, hashes={}, leaves={}): def set_hashes(self, hashes={}, leaves={}):
"""Add a bunch of hashes to the tree. """Add a bunch of hashes to the tree.
@ -376,7 +384,9 @@ class IncompleteHashTree(CompleteBinaryTreeMixin, list):
for i in new_hashes: for i in new_hashes:
if self[i]: if self[i]:
if self[i] != new_hashes[i]: if self[i] != new_hashes[i]:
raise BadHashError("new hash does not match existing hash at [%d]" % i) msg = "new hash does not match existing hash at "
msg += self._name_hash(i)
raise BadHashError(msg)
else: else:
self[i] = new_hashes[i] self[i] = new_hashes[i]
added.add(i) added.add(i)