Merge branch 'master' into chore_update_snark_to_official_0_35

RingsNetwork · Mar 29, 2024 · 854fd07 · 854fd07
2 parents a5d23ae + 7500ff5
commit 854fd07
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 20 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -3,7 +3,7 @@ resolver = "2"
 members = ["crates/*", "examples/native", "examples/snark"]
 
 [workspace.package]
-version = "0.6.0"
+version = "0.6.1"
 edition = "2021"
 license = "GPL-3.0"
 authors = ["RND <[email protected]>"]

diff --git a/crates/core/src/dht/stabilization.rs b/crates/core/src/dht/stabilization.rs
@@ -96,12 +96,8 @@ impl Stabilizer {
         if self.dht.did != successor_min {
             for s in successor_list {
                 tracing::debug!("STABILIZATION notify_predecessor: {:?}", s);
-                let payload = MessagePayload::new_send(
-                    msg.clone(),
-                    self.transport.session_sk(),
-                    s,
-                    self.dht.did,
-                )?;
+                let payload =
+                    MessagePayload::new_send(msg.clone(), self.transport.session_sk(), s, s)?;
                 self.transport.send_payload(payload).await?;
             }
             Ok(())

diff --git a/crates/core/src/tests/default/test_stabilization.rs b/crates/core/src/tests/default/test_stabilization.rs
@@ -102,9 +102,12 @@ async fn test_stabilization_final_dht() -> Result<()> {
     let mut nodes = vec![];
 
     let keys = vec![
-        "af3543cde0c40fd217c536a358fb5f3c609eb1135f68daf7e2f2fbd51f164221", // 0xfe81c75f0ef75d7436b84089c5be31b692518d73
-        "d842f7143beac06ab8d81589c3c53cffd7eb8e07dadae8fdcb3ed1e1319ab477", // 0x8d4300b4df3c85ee107009e354c1b95717ab1c17
-        "57e3ff36ab767056baba3ea9d09c6a178721bd686b8c5d98f66147865de6a288", // 0x78b3fdea83a3db371cfc79c45f0527b7f216e6c9
+        "9c83fcb684af3dc71018b5a303245d2f2fed8a579096589f3234a67a52a7ac66", // 0xcc13321381c4be4d3264588d4573c9529c0167a0
+        "fd674cb6089663935cb061254602e343da8a2fa3908980ae4f7a27adb8b7ac8a", // 0xdbf2d77c3a8bb59379009ec2ec423b8b58d60dbe
+        "b9ce7159a2ad3b9fe885a7744d32afeec233e7ddeaed0759cbab2c00a1bd548b", // 0xd9863aad3267eaadca60adf51464e16d6f79465b
+        "4efb629f54a3f3dd91f5efffc4f9b51ab27eb082b2393067757681ed6439480d", // 0x8a5f987d1c2cc0fd6e0083df22ba9bd802706348
+        "f2cbca82fb82745c1f9d94c1c9d2b0606daaf6f15ac8a215fc72c8bc0478ecf5", // 0x2b5d1f769f346a08cee37f7382495b01126d480a
+        "e1d7f24e2b725df077627fc0337b9c53b37ce594ca84fccd0f36dc58423a0ed2", // 0xca82ac762999ef4438d09223b01f9bf194cea94e
     ];
 
     for s in keys {
@@ -113,7 +116,7 @@ async fn test_stabilization_final_dht() -> Result<()> {
         swarms.push(node.swarm.clone());
         let stabilizer = Arc::new(node.swarm.stabilizer());
         nodes.push(node);
-        tokio::spawn(stabilizer.wait(Duration::from_secs(3)));
+        tokio::spawn(stabilizer.wait(Duration::from_secs(1)));
     }
 
     let swarm1 = Arc::clone(&swarms[0]);

diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
     "RND <[email protected]>"
   ],
   "description": "Rings is a structured peer-to-peer network implementation using WebRTC, Chord algorithm, and full WebAssembly (WASM) support.\n",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "license": "GPL-3.0",
   "repository": {
     "type": "git",