diff --git a/crates/coordinator/tests/create_and_get.rs b/crates/coordinator/tests/create_and_get.rs index aae7f4608..bf4bca87d 100644 --- a/crates/coordinator/tests/create_and_get.rs +++ b/crates/coordinator/tests/create_and_get.rs @@ -2,7 +2,6 @@ use std::collections::BTreeMap; use hc_zome_profiles_integrity::*; use hdk::prelude::*; -use holochain::test_utils::consistency_10s; use holochain::{conductor::config::ConductorConfig, sweettest::*}; #[tokio::test(flavor = "multi_thread")] @@ -41,7 +40,7 @@ async fn create_and_get() { .call(&alice_zome, "create_profile", profile) .await; - consistency_10s([&alice, &bobbo]).await; + await_consistency(30, [&alice, &bobbo]).await.unwrap(); let record_2: Option = conductors[0] .call(&alice_zome, "get_agent_profile", alice_pub_key) @@ -65,7 +64,7 @@ async fn create_and_get() { .call(&alice_zome, "update_profile", profile.clone()) .await; - consistency_10s([&alice, &bobbo]).await; + await_consistency(30, [&alice, &bobbo]).await.unwrap(); // ---> get it over the DHT though get_agent_profile() let alices_profile: Option = conductors[1] @@ -111,7 +110,7 @@ async fn create_and_get() { ) .await; - let all_agents: Vec = conductors[1] + let all_agents: Vec = conductors[1] .call(&bob_zome, "get_agents_with_profile", ()) .await; diff --git a/crates/coordinator/tests/search.rs b/crates/coordinator/tests/search.rs index 1a35bf704..f507ef9ad 100644 --- a/crates/coordinator/tests/search.rs +++ b/crates/coordinator/tests/search.rs @@ -2,7 +2,6 @@ use std::collections::BTreeMap; use hc_zome_profiles_integrity::*; use holochain::prelude::{AgentPubKey, Record}; -use holochain::test_utils::consistency_10s; use holochain::{conductor::config::ConductorConfig, sweettest::*}; #[tokio::test(flavor = "multi_thread")] @@ -42,7 +41,7 @@ async fn create_and_get() { ) .await; - consistency_10s([&alice, &bobbo]).await; + await_consistency(30, [&alice, &bobbo]).await.unwrap(); let agents_searched: Vec = conductors[1] .call(&bob_zome, "search_agents", String::from("ali")) diff --git a/flake.lock b/flake.lock index 0c2cea953..667786018 100644 --- a/flake.lock +++ b/flake.lock @@ -326,11 +326,11 @@ "versions": "versions" }, "locked": { - "lastModified": 1714322642, - "narHash": "sha256-eqF/LyWaAz3/S8cVRM6ZUdntcigANi5xgV24TbqUFzQ=", + "lastModified": 1714396487, + "narHash": "sha256-NhtToT3aNno1YXjczEIxVvGc9cXfB1amtYDchUnWL6Y=", "owner": "holochain-open-dev", "repo": "infrastructure", - "rev": "63eed85c5373f8567272bfad82845f163dc9d895", + "rev": "6c0acb8a777719a49458126023e324c319ebc119", "type": "github" }, "original": { @@ -379,11 +379,11 @@ ] }, "locked": { - "lastModified": 1714310834, - "narHash": "sha256-6K2NcwA7aVukqyV/1iIlNjuU8QnXfKAzwy1yfvZmZZY=", + "lastModified": 1714389570, + "narHash": "sha256-qnbAGp3hu1IlegoHtstS6UObUFR7SZQOnxyeZcCStXs=", "owner": "holochain", "repo": "holochain", - "rev": "f837d183f9d498c46b9d4f6b743e2265b5b976ee", + "rev": "b2c2de05036d4705cc29f639cabe33accb814039", "type": "github" }, "original": { @@ -444,11 +444,11 @@ ] }, "locked": { - "lastModified": 1714389570, - "narHash": "sha256-qnbAGp3hu1IlegoHtstS6UObUFR7SZQOnxyeZcCStXs=", + "lastModified": 1714408217, + "narHash": "sha256-lc93HR/e9Eth+KdQk0NCBeneK25AtQrUB4XB0/HoBNQ=", "owner": "holochain", "repo": "holochain", - "rev": "b2c2de05036d4705cc29f639cabe33accb814039", + "rev": "8a2c00958dabd1fb0a9dd109c67341f3526c1479", "type": "github" }, "original": { @@ -511,11 +511,11 @@ "launcher": { "flake": false, "locked": { - "lastModified": 1713340250, - "narHash": "sha256-J8dcl4TiUB93/08oO2Bh0qG6Qi+udbm6JrmPB92NZyU=", + "lastModified": 1714385528, + "narHash": "sha256-3ZGDC9zx/bqOgYOdImq6yWfZsbxx+B8yzzD8zsztG1U=", "owner": "holochain", "repo": "launcher", - "rev": "f7b7aabd3c3ef16edd391b0b94c4223a2de98d5b", + "rev": "afe234041e27c1d8486bfaa4af270a033e9a1c9f", "type": "github" }, "original": { @@ -626,11 +626,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1714076141, - "narHash": "sha256-Drmja/f5MRHZCskS6mvzFqxEaZMeciScCTFxWVLqWEY=", + "lastModified": 1714253743, + "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7bb2ccd8cdc44c91edba16c48d2c8f331fb3d856", + "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", "type": "github" }, "original": { @@ -731,11 +731,11 @@ ] }, "locked": { - "lastModified": 1714270637, - "narHash": "sha256-sq/0YEupY9yoRpg9ft8r2sjoRo84MQipionTuk4w1YI=", + "lastModified": 1714356894, + "narHash": "sha256-W6Mss7AG6bnFT1BqRApHXvLXBrFOu7V0+EUe9iML30s=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "44f8738f4b9805f7c60118c48f85da835839311a", + "rev": "d9b44509b4064f0a3fc9c7c92a603861f52fbedc", "type": "github" }, "original": { @@ -753,11 +753,11 @@ ] }, "locked": { - "lastModified": 1714270637, - "narHash": "sha256-sq/0YEupY9yoRpg9ft8r2sjoRo84MQipionTuk4w1YI=", + "lastModified": 1714356894, + "narHash": "sha256-W6Mss7AG6bnFT1BqRApHXvLXBrFOu7V0+EUe9iML30s=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "44f8738f4b9805f7c60118c48f85da835839311a", + "rev": "d9b44509b4064f0a3fc9c7c92a603861f52fbedc", "type": "github" }, "original": { @@ -876,11 +876,11 @@ }, "locked": { "dir": "versions/weekly", - "lastModified": 1714310834, - "narHash": "sha256-6K2NcwA7aVukqyV/1iIlNjuU8QnXfKAzwy1yfvZmZZY=", + "lastModified": 1714389570, + "narHash": "sha256-qnbAGp3hu1IlegoHtstS6UObUFR7SZQOnxyeZcCStXs=", "owner": "holochain", "repo": "holochain", - "rev": "f837d183f9d498c46b9d4f6b743e2265b5b976ee", + "rev": "b2c2de05036d4705cc29f639cabe33accb814039", "type": "github" }, "original": { @@ -899,11 +899,11 @@ }, "locked": { "dir": "versions/weekly", - "lastModified": 1714389570, - "narHash": "sha256-qnbAGp3hu1IlegoHtstS6UObUFR7SZQOnxyeZcCStXs=", + "lastModified": 1714408217, + "narHash": "sha256-lc93HR/e9Eth+KdQk0NCBeneK25AtQrUB4XB0/HoBNQ=", "owner": "holochain", "repo": "holochain", - "rev": "b2c2de05036d4705cc29f639cabe33accb814039", + "rev": "8a2c00958dabd1fb0a9dd109c67341f3526c1479", "type": "github" }, "original": { diff --git a/package-lock.json b/package-lock.json index 9392697dd..9cce5bd8e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3097,9 +3097,9 @@ "integrity": "sha512-DJx4V2KXHVLciyOGjOYKTM/JLBpBEZ3RsPIRCgf7qmwhQdxXvhi2p+oFFRD51yUT5uC1/MzIVeJCl/R60PwFbw==" }, "node_modules/@holochain/tryorama": { - "version": "0.16.0-dev.5", - "resolved": "https://registry.npmjs.org/@holochain/tryorama/-/tryorama-0.16.0-dev.5.tgz", - "integrity": "sha512-F1hEXKsbZ674BvAWHvz9KEbALrZg5hv7KyeMALWrV6i64WCL8gLSFI+i32ww21HNJ8v2MfUWgeGjz9IZbFYjrg==", + "version": "0.16.0-dev.6", + "resolved": "https://registry.npmjs.org/@holochain/tryorama/-/tryorama-0.16.0-dev.6.tgz", + "integrity": "sha512-5ltiUWqGze+530tlspIvoGBQ2TUp3pru7MX2ywY9XfCsuiPXrOANeOBe1Y9GnqtMX2GGqCiQ9NrAJUfIqg4N2w==", "dependencies": { "@holochain/client": "^0.17.0-dev.12", "get-port": "^6.1.2", @@ -21374,7 +21374,7 @@ "@holochain-open-dev/signals": "^0.300.0-dev.5", "@holochain-open-dev/utils": "^0.300.0-dev.2", "@holochain/client": "^0.17.0-dev.12", - "@holochain/tryorama": "^0.16.0-dev.5", + "@holochain/tryorama": "^0.16.0-dev.6", "@msgpack/msgpack": "^2.8.0", "typescript": "^4.9.4", "vitest": "^1.4.0" diff --git a/package.json b/package.json index e754b2e06..492cdf6ca 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "scripts": { "start": "AGENTS=2 npm run network", "network": "hc s clean && npm run build:happ && BOOTSTRAP_PORT=$(port) SIGNAL_PORT=$(port) UI_PORT=8888 concurrently \"npm start -w ui\" \"npm run local-services\" \"npm run launch\" \"holochain-playground\"", - "test": "npm run build:happ && nix flake check && npm test -w tests", + "test": "npm run build:happ && nix flake check -L && npm test -w tests", "launch": "echo pass | RUST_LOG=warn hc launch --piped -n $AGENTS workdir/profiles-test.happ --ui-port $UI_PORT network --bootstrap http://127.0.0.1:$BOOTSTRAP_PORT webrtc ws://127.0.0.1:$SIGNAL_PORT", "local-services": "hc run-local-services --bootstrap-port $BOOTSTRAP_PORT --signal-port $SIGNAL_PORT", "build:happ": "npm run build:zome && hc app pack workdir --recursive", diff --git a/tests/package.json b/tests/package.json index 9c517286f..f37931d7a 100644 --- a/tests/package.json +++ b/tests/package.json @@ -7,7 +7,7 @@ "dependencies": { "@msgpack/msgpack": "^2.8.0", "@holochain/client": "^0.17.0-dev.12", - "@holochain/tryorama": "^0.16.0-dev.5", + "@holochain/tryorama": "^0.16.0-dev.6", "@holochain-open-dev/signals": "^0.300.0-dev.5", "@holochain-open-dev/utils": "^0.300.0-dev.2", "typescript": "^4.9.4", diff --git a/tests/src/profile.test.ts b/tests/src/profile.test.ts index cb85d64e7..b4005e35f 100644 --- a/tests/src/profile.test.ts +++ b/tests/src/profile.test.ts @@ -32,7 +32,7 @@ test("create Profile", async () => { assert.equal(agentsWithProfile.length, 1); const profileStatus = alice.store.myProfile$.get(); - assert.equal(profileStatus.status, "complete"); + assert.equal(profileStatus.status, "completed"); assert.ok((profileStatus as any).value); }); });