From 2a4802f56fc17fd17e1a64a2e76e3805a745ff6b Mon Sep 17 00:00:00 2001
From: Brian Muller <bamuller@gmail.com>
Date: Fri, 3 Jan 2014 17:58:09 -0500
Subject: [PATCH] added more tests

---
 kademlia/__init__.py        |  2 +-
 kademlia/network.py         |  6 ++++--
 kademlia/tests/__init__.py  |  3 +++
 kademlia/tests/test_node.py | 17 +++++++++++++++++
 kademlia/utils.py           |  1 +
 5 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/kademlia/__init__.py b/kademlia/__init__.py
index e39e3a7..580832c 100644
--- a/kademlia/__init__.py
+++ b/kademlia/__init__.py
@@ -3,5 +3,5 @@ Kademlia is a Python implementation of the Kademlia protocol for U{Twisted <http
 
 @author: Brian Muller U{bamuller@gmail.com}
 """
-version_info = (0, 0)
+version_info = (0, 1)
 version = '.'.join(map(str, version_info))
diff --git a/kademlia/network.py b/kademlia/network.py
index e96db52..b21951e 100644
--- a/kademlia/network.py
+++ b/kademlia/network.py
@@ -33,7 +33,7 @@ class SpiderCrawl(object):
         self.nearest = NodeHeap(self.ksize)
         self.node = node
         self.lastIDsCrawled = []
-        self.log = Logger(system=self)        
+        self.log = Logger(system=self)
         self.log.info("creating spider with peers: %s" % peers)
         for peer in peers:
             self.nearest.push(self.node.distanceTo(peer), peer)
@@ -179,11 +179,13 @@ class Server(object):
         TODO - if no one responds, freak out
         """
         self.log.debug("setting '%s' = '%s' on network" % (key, value))
-        dkey = digest(key)        
+        dkey = digest(key)
+
         def store(nodes):
             self.log.info("setting '%s' on %s" % (key, map(str, nodes)))
             ds = [self.protocol.callStore(node, dkey, value) for node in nodes]
             return defer.gatherResults(ds)
+
         node = Node(None, None, dkey)
         nearest = self.protocol.router.findNeighbors(node)
         spider = SpiderCrawl(self.protocol, node, nearest, self.ksize, self.alpha)
diff --git a/kademlia/tests/__init__.py b/kademlia/tests/__init__.py
index e69de29..673ec34 100644
--- a/kademlia/tests/__init__.py
+++ b/kademlia/tests/__init__.py
@@ -0,0 +1,3 @@
+"""
+Tests live here.
+"""
diff --git a/kademlia/tests/test_node.py b/kademlia/tests/test_node.py
index eabeb68..90cb3d2 100644
--- a/kademlia/tests/test_node.py
+++ b/kademlia/tests/test_node.py
@@ -1,11 +1,28 @@
 import random
 import hashlib
+
 from twisted.trial import unittest
 
 from kademlia.node import Node, NodeHeap
 
+
 class NodeTest(unittest.TestCase):
     def test_longID(self):
         rid = hashlib.sha1(str(random.getrandbits(255))).digest()
         n = Node(None, None, rid)
         self.assertEqual(n.long_id, long(rid.encode('hex'), 16))
+
+    def test_distanceCalculation(self):
+        ridone = hashlib.sha1(str(random.getrandbits(255)))
+        ridtwo = hashlib.sha1(str(random.getrandbits(255)))
+
+        shouldbe = long(ridone.hexdigest(), 16) ^ long(ridtwo.hexdigest(), 16)
+        none = Node(None, None, ridone.digest())
+        ntwo = Node(None, None, ridtwo.digest())
+        self.assertEqual(none.distanceTo(ntwo), shouldbe)
+
+
+class NodeHeapTest(unittest.TestCase):
+    def test_maxSize(self):
+        n = NodeHeap(3)
+        self.assertEqual(0, len(n))
diff --git a/kademlia/utils.py b/kademlia/utils.py
index 2ceb1fa..8b55bff 100644
--- a/kademlia/utils.py
+++ b/kademlia/utils.py
@@ -10,6 +10,7 @@ def digest(s):
         s = str(s)
     return hashlib.sha1(s).digest()
 
+
 def deferredDict(d):
     """
     Just like a C{defer.DeferredList} but instead accepts and returns a C{dict}.