Changed lookups to go from one node to a random key, instead of just between two nodes

Author: cms5347

RunSimulation.py

@@ -18,7 +18,6 @@
 
 # The rate at which we will disable nodes 
 node_disable_n = int(sys.argv[4])
-print node_disable_n
 sim = Simulation(seed, network_size)
 
 

node.py

@@ -3,6 +3,16 @@
 import math
 import hashlib
 
+
+def make_hash(id_str):
+    """
+    Make a hash which is truncated to the correct bit length
+    based on kademliaConstants.bit_string_size.
+    """
+    hash_id = int(hashlib.sha1(id_str).hexdigest(), 16)
+    hash_id = hash_id % int(math.pow(2, kademliaConstants.bit_string_size))
+    return hash_id
+    
 class Node(object):
     """
     Implementation of a Kademlia node object.
@@ -28,8 +38,7 @@ def __init__(self, node_name, random):
                              # responsible for storing the RTT
 
         # Get the hash and truncate to the correct number of bits
-        self.id = int(hashlib.sha1(self.node_name).hexdigest(), 16)
-        self.id = self.id % int(math.pow(2, kademliaConstants.bit_string_size))
+        self.id = make_hash(node_name)
 
         self.kBuckets = list()
         self.disabled = False # Whether or not this node is accessible

simulation.py

@@ -3,9 +3,10 @@
 # can be used to run different simulations
 
 import random
-
+import hashlib
+import math
 import kademliaConstants
-from node import Node
+from node import Node, make_hash
 
 
 class Simulation:
@@ -32,12 +33,15 @@ def perform_node_lookup(self):
         Perform a node lookup between two random nodes, return the
         time that it took to complete the lookup.
         """
-        nodes = self.rand.sample(self.nodes, 2)
+        node = self.rand.choice(self.nodes)
 
-        target_node = nodes[1] 
-        start_node = nodes[0]
+        # Generate a random key to look for, use random_IP as a random
+        # string generator
+        target_key = hashlib.sha1(self.random_IP()).hexdigest()
+        target_key = int(target_key, 16)
+        target_key = target_key % (int(math.pow(2, kademliaConstants.bit_string_size)))
 
-        start_node.lookup_node(target_node.id)
+        node.lookup_node(target_key)