diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bd1638a0..2102b8f1 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -3,7 +3,7 @@ name: Run tests on: pull_request: push: - branches: [main] + branches: [main, main-0.6] concurrency: group: ${{ github.ref_name }} diff --git a/Cargo.lock b/Cargo.lock index 8774fcd0..254c18c1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -154,9 +154,9 @@ dependencies = [ [[package]] name = "darling" -version = "0.14.4" +version = "0.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" +checksum = "9cdf337090841a411e2a7f3deb9187445851f91b309c0c0a29e05f74a00a48c0" dependencies = [ "darling_core", "darling_macro", @@ -164,27 +164,27 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.14.4" +version = "0.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" +checksum = "1247195ecd7e3c85f83c8d2a366e4210d588e802133e1e355180a9870b517ea4" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim", - "syn 1.0.109", + "syn 2.0.106", ] [[package]] name = "darling_macro" -version = "0.14.4" +version = "0.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" +checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81" dependencies = [ "darling_core", "quote", - "syn 1.0.109", + "syn 2.0.106", ] [[package]] @@ -361,9 +361,9 @@ checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" [[package]] name = "hdi" -version = "0.7.0-dev.13" +version = "0.7.1-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9df223f5416ed5c42b85ada29db09648dff226349aded9c83f6dd9bed88a2a39" +checksum = "f8e8fb12569a9c7a0a77b2017b5bd5bce4dbb724527de7baf6cc19f45c3677c9" dependencies = [ "getrandom", "hdk_derive", @@ -381,9 +381,9 @@ dependencies = [ [[package]] name = "hdk" -version = "0.6.0-dev.15" +version = "0.6.1-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6490bcc8956e77e993221f768195336942ca599f3f61e467d59f6a248c0153c9" +checksum = "031960f0fc740b38f7db5c6702928ffb11df005df183356baccdc16865d098bd" dependencies = [ "getrandom", "hdi", @@ -399,27 +399,18 @@ dependencies = [ [[package]] name = "hdk_derive" -version = "0.6.0-dev.12" +version = "0.6.1-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74e767641181e104f42bc11cb79e2f9d99f41f59f5842ea74c4859def462368f" +checksum = "cba24d896b6ce6aa7992728838328cf61e3bb49216969a647357494fd6727321" dependencies = [ "darling", - "heck 0.5.0", + "heck", "holochain_integrity_types", "paste", "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", -] - -[[package]] -name = "heck" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", + "syn 2.0.106", ] [[package]] @@ -430,9 +421,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "holo_hash" -version = "0.6.0-dev.11" +version = "0.6.1-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c52bdc4e0229479e7ffc9d62d611930f562c1bb86cab410c541902cb8e259d0" +checksum = "64a8727021bef4b64fdb110285d65fada5b2fa7ad652ac4ea4263065d930cbcc" dependencies = [ "base64", "blake2b_simd", @@ -450,9 +441,9 @@ dependencies = [ [[package]] name = "holochain_integrity_types" -version = "0.6.0-dev.12" +version = "0.6.1-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1eb5cf86660d1af781d80052edfacb98ddc4154a374d69081c9bf9517d9c7ae1" +checksum = "3102e15d1cbf97202fc0e32c51de63a35150beebd867e48cf02376b4c1012748" dependencies = [ "holo_hash", "holochain_secure_primitive", @@ -467,9 +458,9 @@ dependencies = [ [[package]] name = "holochain_nonce" -version = "0.6.0-dev.3" +version = "0.6.1-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c865e09029d90b37dca67bd4fec5bc8730699a829510c33b836058aa9279240" +checksum = "e8d641bc9d33ad91e38696511683e652d0577a5683c3ecc2bf588d8684268d61" dependencies = [ "getrandom", "holochain_secure_primitive", @@ -478,9 +469,9 @@ dependencies = [ [[package]] name = "holochain_secure_primitive" -version = "0.6.0-dev.1" +version = "0.6.1-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "576f73aaa9122a34731b069d1aac1b27fdba022f8d54f79ed9f03eb9b073fd05" +checksum = "b087fb6c567804e53f9f0baa59dea3b4ead384913b4cbb8f07c0476f7176589b" dependencies = [ "paste", "serde", @@ -514,9 +505,9 @@ dependencies = [ [[package]] name = "holochain_timestamp" -version = "0.6.0-dev.3" +version = "0.6.1-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e182a4199dfc83d6185a3016a1985d67c0ab24e9f13161f9152e255c9879323" +checksum = "744a1ef07045a17a0dcc2fed5ccf7fc6c17fa5c3b732c46f832cf729bfdae597" dependencies = [ "chrono", "serde", @@ -524,9 +515,9 @@ dependencies = [ [[package]] name = "holochain_util" -version = "0.6.0-dev.3" +version = "0.6.1-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aac12699a3edf6ccf00bb7e0b189b5b6d6fd22bf18cabca082695e667572427b" +checksum = "0b47bb9647fce71e41d7a934549a27786517fc84632e04f89d686c50592f96ae" dependencies = [ "cfg-if", "colored", @@ -562,9 +553,9 @@ dependencies = [ [[package]] name = "holochain_zome_types" -version = "0.6.0-dev.14" +version = "0.6.1-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc2e81606f26aa0a0a6ae71279e445b091722442d096ad60e4a02fe1399e3da1" +checksum = "9019d2cb40da37b0d1b44e6916dcadf5525da8f45cc2ffe8a493ea1b53eb1fce" dependencies = [ "derive_more", "holo_hash", @@ -868,26 +859,26 @@ checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589" [[package]] name = "strsim" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "strum" -version = "0.18.0" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bd81eb48f4c437cadc685403cad539345bf703d78e63707418431cecd4522b" +checksum = "af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf" [[package]] name = "strum_macros" -version = "0.18.0" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87c85aa3f8ea653bfd3ddf25f7ee357ee4d204731f6aa9ad04002306f6e2774c" +checksum = "7695ce3845ea4b33927c055a39dc438a45b059f7c1b3d91d38d10355fb8cbca7" dependencies = [ - "heck 0.3.3", + "heck", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.106", ] [[package]] @@ -903,7 +894,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ "proc-macro2", - "quote", "unicode-ident", ] @@ -982,12 +972,6 @@ version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" -[[package]] -name = "unicode-segmentation" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" - [[package]] name = "unicode-xid" version = "0.2.6" diff --git a/Cargo.toml b/Cargo.toml index b990a765..72944e82 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,8 +6,8 @@ members = [ resolver = "2" [workspace.dependencies] -hdi = "0.7.0-dev.13" -hdk = "0.6.0-dev.15" +hdi = "0.7.1-rc.1" +hdk = "0.6.1-rc.1" holochain_serialized_bytes = "0.0.56" serde = "1.0.192" diff --git a/package-lock.json b/package-lock.json index d760071b..79f8b812 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@holochain/tryorama", - "version": "0.19.0", + "version": "0.19.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@holochain/tryorama", - "version": "0.19.0", + "version": "0.19.1", "license": "MIT", "dependencies": { "@holochain/client": "^0.20.0", diff --git a/ts/src/conductor.ts b/ts/src/conductor.ts index 0fdd5d0e..7cc2f481 100644 --- a/ts/src/conductor.ts +++ b/ts/src/conductor.ts @@ -273,7 +273,10 @@ export class Conductor { }); } - setNetworkConfig(createConductorOptions: NetworkConfig, signalingServerUrl?: URL) { + setNetworkConfig( + createConductorOptions: NetworkConfig, + signalingServerUrl?: URL, + ) { const conductorConfig = readFileSync( `${this.conductorDir}/${CONDUCTOR_CONFIG}`, "utf-8", diff --git a/ts/test/conductor.test.ts b/ts/test/conductor.test.ts index 21a0db2d..f976d51e 100644 --- a/ts/test/conductor.test.ts +++ b/ts/test/conductor.test.ts @@ -50,7 +50,7 @@ test("Conductor with custom bootstrap server", async () => { }); test("Conductor with custom signaling server", async () => { - const signalingServerUrl = new URL("ws://some-signal.server:1234"); + const signalingServerUrl = new URL("http://some-signal.server:1234"); const conductor = await createConductor(signalingServerUrl, { startup: false, }); diff --git a/ts/test/scenario.test.ts b/ts/test/scenario.test.ts index 736df0c0..87df7851 100644 --- a/ts/test/scenario.test.ts +++ b/ts/test/scenario.test.ts @@ -120,7 +120,6 @@ test("Set custom network config", async () => { const minInitiateIntervalMs = 20_000; const initiateJitterMs = 5_000; const roundTimeoutMs = 20_000; - const transportTimeoutS = 1_000; const targetArcFactor = 0; const alice = await scenario.addPlayerWithApp({ @@ -134,7 +133,6 @@ test("Set custom network config", async () => { minInitiateIntervalMs, initiateJitterMs, roundTimeoutMs, - transportTimeoutS, targetArcFactor, }, }, @@ -158,15 +156,15 @@ test("Set custom network config", async () => { assert.strictEqual(network.target_arc_factor, targetArcFactor); assert.ok( - advanced && typeof advanced === "object" && "tx5Transport" in advanced, + advanced && typeof advanced === "object" && "irohTransport" in advanced, ); - const { tx5Transport } = advanced; + const { irohTransport } = advanced; assert.ok( - tx5Transport && - typeof tx5Transport === "object" && - "timeoutS" in tx5Transport, + irohTransport && + typeof irohTransport === "object" && + "relayAllowPlainText" in irohTransport, ); - assert.strictEqual(tx5Transport.timeoutS, transportTimeoutS); + assert.strictEqual(irohTransport.relayAllowPlainText, true); assert.ok(advanced && typeof advanced === "object" && "k2Gossip" in advanced); const { k2Gossip } = advanced; @@ -192,7 +190,6 @@ test("Default network config", async () => { const minInitiateIntervalMs = 3_000; const initiateJitterMs = 1_000; const roundTimeoutMs = 5_000; - const transportTimeoutS = 15; const targetArcFactor = 1; const alice = await scenario.addPlayerWithApp({ @@ -220,15 +217,15 @@ test("Default network config", async () => { assert.strictEqual(network.target_arc_factor, targetArcFactor); assert.ok( - advanced && typeof advanced === "object" && "tx5Transport" in advanced, + advanced && typeof advanced === "object" && "irohTransport" in advanced, ); - const { tx5Transport } = advanced; + const { irohTransport } = advanced; assert.ok( - tx5Transport && - typeof tx5Transport === "object" && - "timeoutS" in tx5Transport, + irohTransport && + typeof irohTransport === "object" && + "relayAllowPlainText" in irohTransport, ); - assert.strictEqual(tx5Transport.timeoutS, transportTimeoutS); + assert.strictEqual(irohTransport.relayAllowPlainText, true); assert.ok(advanced && typeof advanced === "object" && "k2Gossip" in advanced); const { k2Gossip } = advanced;