updated veilid tests and notebook with new vld_key

OpenMined · Mar 14, 2024 · 68f05d5 · 68f05d5
1 parent 37862bb
commit 68f05d5
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 27 deletions.
diff --git a/notebooks/Testing/Veilid/Veilid-Gateway-Testing.ipynb b/notebooks/Testing/Veilid/Veilid-Gateway-Testing.ipynb
@@ -38,7 +38,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "domain_client.api.services.veilid.generate_dht_key()"
+    "domain_client.api.services.veilid.generate_vld_key()"
    ]
   },
   {
@@ -48,7 +48,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "gateway_client.api.services.veilid.generate_dht_key()"
+    "gateway_client.api.services.veilid.generate_vld_key()"
    ]
   },
   {
@@ -69,7 +69,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "gateway_route.dht_key"
+    "gateway_route.vld_key"
    ]
   },
   {
@@ -79,7 +79,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "domain_route.dht_key"
+    "domain_route.vld_key"
    ]
   },
   {
@@ -99,7 +99,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "domain_client.peers[0].node_routes[0].dht_key"
+    "domain_client.peers[0].node_routes[0].vld_key"
    ]
   },
   {
@@ -109,7 +109,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "gateway_client.api.services.network.get_all_peers()[0].node_routes[0].dht_key"
+    "gateway_client.api.services.network.get_all_peers()[0].node_routes[0].vld_key"
    ]
   },
   {

diff --git a/packages/syft/src/syft/protocol/protocol_version.json b/packages/syft/src/syft/protocol/protocol_version.json
@@ -23,7 +23,7 @@
         },
         "3": {
           "version": 3,
-          "hash": "18785a4cce6f25f1900b82f30acb2298b4afeab92bd00d0be358cfbf5a93d97e",
+          "hash": "37bb8f0f87b1da2525da8f6873e6257dff4a732f2dba293b62931ad0b85ef9e2",
           "action": "add"
         }
       },
@@ -40,7 +40,7 @@
         },
         "3": {
           "version": 3,
-          "hash": "4fd4c5b29e395b7a1af3b820166e69af7f267b6e3234fb8329bd0d74adc6e828",
+          "hash": "7c55461e3c6ba36ff999c64eb1b97a65b5a1f27193a973b1355ee2675f14c313",
           "action": "add"
         }
       },
@@ -52,7 +52,7 @@
         },
         "2": {
           "version": 2,
-          "hash": "1b04f527fdabaf329786b6bb38209f6ca82d622fe691d33c47ed1addccaaac02",
+          "hash": "1ab941c7669572a41067a17e0e3f2d9c7056f7a4df8f899e87ae2358d9113b02",
           "action": "add"
         }
       },
@@ -148,7 +148,7 @@
         },
         "3": {
           "version": 3,
-          "hash": "5922c1253370861185c53161ad31e488319f46ea5faee2d1802ca94657c428dc",
+          "hash": "709dc84a946267444a3f9968acf4a5e9807d6aa5143626c3fb635c9282108cc1",
           "action": "add"
         }
       },
@@ -165,7 +165,7 @@
         },
         "3": {
           "version": 3,
-          "hash": "dbb72f43add3141d13a76e18a2a0903a6937966632f0def452ca264f3f70d81b",
+          "hash": "5e84c9905a1816d51c0dfb1eedbfb4d831095ca6c89956c6fe200c2a193cbb8f",
           "action": "add"
         }
       },
@@ -182,7 +182,7 @@
         },
         "3": {
           "version": 3,
-          "hash": "cf831130f66f9addf8f68a8c9df0b67775e53322c8a32e8babc7f21631845608",
+          "hash": "bf936c1923ceee4def4cded06d41766998ea472322b0738bade7b85298e469da",
           "action": "add"
         }
       },
@@ -199,7 +199,7 @@
         },
         "3": {
           "version": 3,
-          "hash": "78334b746e5230ac156e47960e91ce449543d1a77a62d9b8be141882e4b549aa",
+          "hash": "daf3629fb7d26f41f96cd7f9200d7327a4b74d800b3e02afa75454d11bd47d78",
           "action": "add"
         }
       },
@@ -216,7 +216,7 @@
         },
         "3": {
           "version": 3,
-          "hash": "0007e86c39ede0f5756ba348083f809c5b6e3bb3a0a9ed6b94570d808467041f",
+          "hash": "4747a220d1587e99e6ac076496a2aa7217e2700205ac80fc24fe4768a313da78",
           "action": "add"
         }
       },
@@ -300,7 +300,7 @@
         },
         "2": {
           "version": 2,
-          "hash": "9eaed0a784525dea0018d95de74d70ed212f20f6ead2b50c66e59467c42bbe68",
+          "hash": "b35897295822f061fbc70522ca8967cd2be53a5c01b19e24c587cd7b0c4aa3e8",
           "action": "add"
         }
       },
@@ -574,7 +574,7 @@
         },
         "4": {
           "version": 4,
-          "hash": "077987cfc94d617f746f27fb468210330c328bad06eee09a89226759e5745a5f",
+          "hash": "c37bc1c6303c467050ce4f8faa088a2f66ef1781437ffe34f15aadf5477ac25b",
           "action": "add"
         }
       },
@@ -608,7 +608,7 @@
         },
         "3": {
           "version": 3,
-          "hash": "8a8e721a4ca8aa9107403368851acbe59f8d7bdc1eeff0ff101a44e325a058ff",
+          "hash": "4159d6ea45bc82577828bc19d668196422ff29bb8cc298b84623e6f4f476aaf3",
           "action": "add"
         }
       },
@@ -630,7 +630,7 @@
         },
         "4": {
           "version": 4,
-          "hash": "9b0dd1a64d64b1e824746e93aae0ca14863d2430aea2e2a758945edbfcb79bc9",
+          "hash": "dae431b87cadacfd30613519b5dd25d2e4ff59d2a971e21a31d56901103b9420",
           "action": "add"
         }
       },
@@ -1225,7 +1225,7 @@
         },
         "2": {
           "version": 2,
-          "hash": "747c87b947346fb0fc0466a912e2dc743ee082ef6254079176349d6b63748c32",
+          "hash": "93c75b45b9b74c69243cc2f2ef2d661e11eef5c23ecf71692ffdbd467d11efe6",
           "action": "add"
         }
       },
@@ -1513,7 +1513,7 @@
         },
         "2": {
           "version": 2,
-          "hash": "ac452023b98534eb13cb99a86fa7e379c08316353fc0837d1b788e0050e13ab9",
+          "hash": "24b7c302f9821afe073534d4ed02c377bd4f7cb691f66ca92b94c38c92dc78c2",
           "action": "add"
         }
       },
@@ -1525,7 +1525,7 @@
         },
         "2": {
           "version": 2,
-          "hash": "c9fdefdc622131c3676243aafadc30b7e67ee155793791bf1000bf742c1a251a",
+          "hash": "6d2e2f64c00dcda74a2545c77abbcf1630c56c26014987038feab174d15bd9d7",
           "action": "add"
         }
       },
@@ -1652,14 +1652,14 @@
       "VeilidConnection": {
         "1": {
           "version": 1,
-          "hash": "29f803cec69b9ca6118e7c004867e82de6297f138b267ebd3df9ed35d5c944e4",
+          "hash": "c5ed1cfa9b7b146dbce7f1057f6e81e89715b5addfd4d4c4d53c415e450373a5",
           "action": "add"
         }
       },
       "VeilidNodeRoute": {
         "1": {
           "version": 1,
-          "hash": "0ecd536def6b99475f4478acefb0226886336934206529647ee3e4667e211514",
+          "hash": "4797413e3144fce7bccc290db64f1750e8c09f75d5e1aba6e19d29f921a21074",
           "action": "add"
         }
       },

diff --git a/tests/integration/veilid/gateway_veilid_test.py b/tests/integration/veilid/gateway_veilid_test.py
@@ -35,9 +35,9 @@ def test_domain_connect_to_gateway_veilid(domain_1_port, gateway_port):
     remove_existing_peers(gateway_client)
 
     # Generate DHT Record
-    gateway_dht_res = gateway_client.api.services.veilid.generate_dht_key()
+    gateway_dht_res = gateway_client.api.services.veilid.generate_vld_key()
     assert isinstance(gateway_dht_res, SyftSuccess), gateway_dht_res
-    domain_dht_res = domain_client.api.services.veilid.generate_dht_key()
+    domain_dht_res = domain_client.api.services.veilid.generate_vld_key()
     assert isinstance(domain_dht_res, SyftSuccess), domain_dht_res
 
     # Retrieve DHT Record
@@ -62,14 +62,14 @@ def test_domain_connect_to_gateway_veilid(domain_1_port, gateway_port):
     assert domain_peer.node_type == NodeType.GATEWAY
     assert isinstance(domain_peer, NodePeer)
     assert isinstance(domain_peer.node_routes[0], VeilidNodeRoute)
-    assert domain_peer.node_routes[0].dht_key == gateway_veilid_route.dht_key
+    assert domain_peer.node_routes[0].vld_key == gateway_veilid_route.vld_key
     assert domain_client.name == proxy_domain_client.name
 
     # Gateway Asserts
     assert len(gateway_client.peers) == 1
     assert gateway_peer.node_type == NodeType.DOMAIN
     assert isinstance(gateway_peer.node_routes[0], VeilidNodeRoute)
-    assert gateway_peer.node_routes[0].dht_key == domain_veilid_route.dht_key
+    assert gateway_peer.node_routes[0].vld_key == domain_veilid_route.vld_key
     assert gateway_client.name == domain_peer.name
     assert len(gateway_client.domains) == 1
     assert len(gateway_client.enclaves) == 0