ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-03-23 12:15:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

hashtree.py: another micro-optimization, expand on a comment

Browse Source
This commit is contained in:
Brian Warner 2009-04-03 21:35:27 -07:00
parent de8475389b
commit 40c78297e8
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/allmydata/hashtree.py
View File

@ -417,8 +417,6 @@ class IncompleteHashTree(CompleteBinaryTreeMixin, list):
# first we provisionally add all hashes to the tree, comparing
# any duplicates
for i,h in new_hashes.iteritems():
level = depth_of(i)
if self[i]:
if self[i] != h:
raise BadHashError("new hash %s does not match "
@ -427,6 +425,7 @@ class IncompleteHashTree(CompleteBinaryTreeMixin, list):
base32.b2a(self[i]),
self._name_hash(i)))
else:
level = depth_of(i)
hashes_to_check[level].add(i)
self[i] = h
remove_upon_failure.add(i)
@ -440,7 +439,9 @@ class IncompleteHashTree(CompleteBinaryTreeMixin, list):
# really *check* the root; you either accept it
# because the caller told you what it is by including
# it in hashes, or you accept it because you
# calculated it from its two children.
# calculated it from its two children. You probably
# want to set the root (from a trusted source) before
# adding any children from an untrusted source.
continue
siblingnum = self.sibling(i)
if self[siblingnum] is None: