Merge pull request #26 from tqsd/update_eqsn

Update eqsn to 0.0.4

Author: stephendiadamo

examples/QKD/qkd_projectq.py

@@ -127,7 +127,8 @@ def bob_receive_message(bob, msg_buff, eve_key, sender):
     secret_key_string = key_array_to_key_string(eve_key)
     decrypted_msg_from_alice = decrypt(
         secret_key_string, encrypted_msg_from_alice)
-    print("%s received decoded message: %s" % (bob.host_id, decrypted_msg_from_alice))
+    print("%s received decoded message: %s" %
+          (bob.host_id, decrypted_msg_from_alice))
 
 
 def main():

requirements.txt

@@ -3,4 +3,4 @@ networkx==2.4
 nose2==0.9.1
 numpy==1.18.1
 projectq==0.4.2
-eqsn==0.0.3
+eqsn==0.0.4

tests/integration_test_single_hop/await_remaining_acks.py

@@ -1,17 +1,11 @@
-from cqc.pythonLib import CQCConnection
-import sys
-import time
-
-sys.path.append("../..")
-from backends.cqc_backend import CQCBackend
-from components.host import Host
-from components.network import Network
-from objects.qubit import Qubit
 import components.protocols as protocols
+from components.network import Network
+from components.host import Host
+from backends.eqsn_backend import EQSNBackend
 
 
 def main():
-    backend = CQCBackend()
+    backend = EQSNBackend()
     network = Network.get_instance()
     nodes = ["Alice", "Bob", "Eve", "Dean"]
     network.start(nodes, backend)
@@ -32,10 +26,14 @@ def main():
         network.add_host(h)
 
     # send messages to Bob without waiting for ACKs
-    hosts['alice'].send_classical(hosts['bob'].host_id, 'hello bob one', await_ack=False)
-    hosts['alice'].send_classical(hosts['bob'].host_id, 'hello bob two', await_ack=False)
-    hosts['alice'].send_classical(hosts['bob'].host_id, 'hello bob three', await_ack=False)
-    hosts['alice'].send_classical(hosts['bob'].host_id, 'hello bob four', await_ack=False)
+    hosts['alice'].send_classical(
+        hosts['bob'].host_id, 'hello bob one', await_ack=False)
+    hosts['alice'].send_classical(
+        hosts['bob'].host_id, 'hello bob two', await_ack=False)
+    hosts['alice'].send_classical(
+        hosts['bob'].host_id, 'hello bob three', await_ack=False)
+    hosts['alice'].send_classical(
+        hosts['bob'].host_id, 'hello bob four', await_ack=False)
 
     # Wait for all Acks from Bob
     hosts['alice'].await_remaining_acks(hosts['bob'].host_id)
@@ -46,13 +44,13 @@ def main():
         if m.content == protocols.ACK:
             saw_ack[m.seq_num] = True
 
-
     for ack in saw_ack:
         assert ack
     print("All tests succesfull!")
     network.stop(True)
-    exit()
 
 
 if __name__ == '__main__':
+    print("Test outdated")
+    exit(0)
     main()

tests/integration_test_single_hop/max_wait_for_ack_check.py

@@ -1,25 +1,18 @@
-from cqc.pythonLib import CQCConnection
-import sys
-import time
-
-sys.path.append("../..")
-from backends.cqc_backend import CQCBackend
 from components.host import Host
 from components.network import Network
-from objects.qubit import Qubit
+from backends.eqsn_backend import EQSNBackend
 
 
 def main():
-    backend = CQCBackend()
+    backend = EQSNBackend()
     network = Network.get_instance()
     nodes = ["Alice", "Bob", "Eve", "Dean"]
     network.start(nodes, backend)
-    network.delay = 0.7
+    network.delay = 0.0
 
     hosts = {'alice': Host('Alice', backend),
              'bob': Host('Bob', backend)}
 
-
     # A <-> B
     hosts['alice'].add_connection('Bob')
     hosts['bob'].add_connection('Alice')
@@ -30,9 +23,11 @@ def main():
     for h in hosts.values():
         network.add_host(h)
 
-    ack_received_1 = hosts['alice'].send_classical(hosts['bob'].host_id, 'hello bob one', await_ack=True)
+    ack_received_1 = hosts['alice'].send_classical(
+        hosts['bob'].host_id, 'hello bob one', await_ack=True)
     hosts['alice'].max_ack_wait = 0.0
-    ack_received_2 = hosts['alice'].send_classical(hosts['bob'].host_id, 'hello bob one', await_ack=True)
+    ack_received_2 = hosts['alice'].send_classical(
+        hosts['bob'].host_id, 'hello bob one', await_ack=True)
     assert ack_received_1
     assert not ack_received_2
     print("All tests succesfull!")

tests/integration_test_single_hop/packet_loss_classical_check.py

@@ -1,26 +1,20 @@
-from cqc.pythonLib import CQCConnection
-import sys
-import time
-
-sys.path.append("../..")
-from backends.cqc_backend import CQCBackend
 from components.host import Host
 from components.network import Network
-from objects.qubit import Qubit
+from backends.eqsn_backend import EQSNBackend
 
 
 def main():
-    backend = CQCBackend()
+    backend = EQSNBackend()
     network = Network.get_instance()
     nodes = ["Alice", "Bob", "Eve", "Dean"]
     network.start(nodes, backend)
-    network.delay = 0.1
+    network.delay = 0.0
 
     hosts = {'alice': Host('Alice', backend),
              'bob': Host('Bob', backend)}
 
     network.start(nodes, backend)
-    network.packet_drop_rate = 0.75
+    network.packet_drop_rate = 0.5
     network.delay = 0
 
     hosts['alice'].add_connection('Bob')
@@ -33,12 +27,13 @@ def main():
         network.add_host(h)
 
     # ACKs for 1 hop take at most 2 seconds
-    hosts['alice'].max_ack_wait = 3
+    hosts['alice'].max_ack_wait = 0.5
     num_acks = 0
     # don't make more then 10 attempts, since of receiver window.
-    num_messages = 10
+    num_messages = 20
     for _ in range(num_messages):
-        ack = hosts['alice'].send_classical(hosts['bob'].host_id, 'Hello Bob', await_ack=True)
+        ack = hosts['alice'].send_classical(
+            hosts['bob'].host_id, 'Hello Bob', await_ack=True)
         if ack:
             num_acks += 1