Morevna Changeset - 7d21dd70864a

Changeset - 7d21dd70864a

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Laman - 7 years ago 2017-10-19 12:34:57

minor enhancements

3 files changed with 6 insertions and 4 deletions:

src/client.py

src/config.py

src/hashtree.py

0 comments (0 inline, 0 general)

src/client.py

➞

Show inline comments

@@ @@ -56,25 +56,25 @@ class Client: @@
 		# initialize session
 		jsonData={"command":"init", "blockSize":localTree.BLOCK_SIZE, "blockCount":localTree.leafCount, "version":conf.version}
 		self._outcoming.writeMsg(jsonData)
 		jsonData,binData=self._incoming.readMsg()
 		assert jsonData["command"]=="ack"
 		# determine which blocks to send
 		print(datetime.now(), "negotiating:")
 		progress=Progress(localTree.leafCount)
 		while len(nodeStack)>0:
 			indices=[]
-			for i in range(256):
+			for i in range(conf.batchSize):
 				indices.append(nodeStack.pop())
 				if len(nodeStack)==0: break
 			self._outcoming.writeMsg({"command":"req", "index":indices, "dataType":"hash"})
 			jsonData,binData=self._incoming.readMsg()
 			assert jsonData["index"]==indices
 			assert jsonData["dataType"]=="hash"
 			stats.logExchangedNode(len(indices))
 			frontier=[]
 			for (j,i) in enumerate(indices):
 				(j1,j2)=[HashTree.HASH_LEN*ji for ji in (j,j+1)]

src/config.py

➞

Show inline comments

@@ @@ -11,12 +11,14 @@ handler.setFormatter(formatter) @@
 logger.addHandler(handler)
 version=0
 hosts=["127.0.0.1"]
 port=9901
 directory=os.path.join(os.path.dirname(__file__),"..")
 certfile=os.path.join(directory,"certs/cert.pem")
 keyfile=os.path.join(directory,"certs/key.pem")
 peers=os.path.join(directory,"certs/peers.pem")
 batchSize=256

src/hashtree.py

➞

Show inline comments

@@ @@ -19,25 +19,25 @@ class HashTree: @@
 	@classmethod
 	def fromFile(cls,filename):
 		with open(filename,"rb") as f:
 			stat=os.fstat(f.fileno())
 			size=stat.st_size # !! symlinks
 			leafCount=(size-1)//HashTree.BLOCK_SIZE+1 # number of leaf blocks
 			res=cls(leafCount)
 			print(datetime.now(), "hashing file:")
 			progress=Progress(leafCount)
 			for i in range(leafCount):
 				data=f.read(HashTree.BLOCK_SIZE)
 				res.insertLeaf(hashlib.sha256(data).digest()[HashTree.HASH_LEN:])
+				res.insertLeaf(hashlib.sha256(data).digest()[-HashTree.HASH_LEN:])
 				progress.p(i)
 			progress.done()
 		res.buildTree()
 		return res
 	@classmethod
 	def load(cls,filename):
 		with open(filename,"rb") as f:
 			stat=os.fstat(f.fileno())
 			size=stat.st_size
@@ @@ -61,31 +61,31 @@ class HashTree: @@
 		self._index+=1
 	## Updates a hash stored in the leaf.
 	def updateLeaf(self,index,h):
 		if index<self.leafStart: raise IndexError()
 		self.store[index]=h
 		self.updateNode((index-1)//2)
 	## Updates the node at index and all its ancestors.
 	def updateNode(self,index):
 		while index>=0:
 			self.store[index]=hashlib.sha256(self.store[index*2+1]+self.store[index*2+2]).digest()[HashTree.HASH_LEN:]
+			self.store[index]=hashlib.sha256(self.store[index*2+1]+self.store[index*2+2]).digest()[-HashTree.HASH_LEN:]
 			index=(index-1)//2
 	## Fast construction of the tree over the leaves. O(n).
 	def buildTree(self):
 		print(datetime.now(), "building tree:")
 		progress=Progress(-1, self.leafStart-1)
 		for i in range(self.leafStart-1,-1,-1):
 			self.store[i]=hashlib.sha256(self.store[i*2+1]+self.store[i*2+2]).digest()[HashTree.HASH_LEN:]
+			self.store[i]=hashlib.sha256(self.store[i*2+1]+self.store[i*2+2]).digest()[-HashTree.HASH_LEN:]
 			progress.p(i)
 		progress.done()
 if __name__=="__main__":
 	f1=HashTree.fromFile(open("serverFile.txt",mode='rb'))
 	f2=HashTree.fromFile(open("clientFile.txt",mode='rb'))
 	for i,(h1,h2) in enumerate(zip(f1.store,f2.store)):
 		print("{0:2}".format(i),h1.hex(),h2.hex(),h1==h2)

0 comments (0 inline, 0 general)