Morevna Changeset - ee936b917440

Changeset - ee936b917440

Parent rev.

Child rev.

[Not reviewed]

Merge default

0 1 0

Laman - 7 years ago 2017-10-19 12:13:58

merged bugfix

1 file changed with 3 insertions and 2 deletions:

src/client.py

3

2

0 comments (0 inline, 0 general)

src/client.py

➞

Show inline comments

-import collections
 import collections
 import socket
 import ssl
 import logging as log
 from datetime import datetime
 import config as conf
@@ @@ -76,13 +76,14 @@ class Client: @@
 			stats.logExchangedNode(len(indices))
 			frontier=[]
 			for (j,i) in enumerate(indices):
 				(j1,j2)=[HashTree.HASH_LEN*ji for ji in (j,j+1)]
 				if localTree.store[i]!=binData[j1:j2]:
 					if 2*i+3<len(localTree.store): # inner node
 					# ie. 0-6 nodes, 7-14 leaves. 2*6+2<15
 					if 2*i+2<len(localTree.store): # inner node
 						frontier.append(2*i+1)
 						frontier.append(2*i+2)
 					else:
 						blocksToTransfer.append(i-localTree.leafStart) # leaf
 						progress.p(i-localTree.leafStart)
 			nodeStack.extend(reversed(frontier))

0 comments (0 inline, 0 general)