From e2b0175fa35ff677e079ef5603829b953d2edaaa Mon Sep 17 00:00:00 2001 From: Karl Bonnici Date: Mon, 15 May 2023 11:45:29 -0700 Subject: [PATCH 1/4] fix bad url --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e9358c2..20ce62c 100644 --- a/README.md +++ b/README.md @@ -95,4 +95,4 @@ pub enum StateSignal { ## Bootstrap Networking Service -This library is currently by default pointed at the `https://bootstrap-staging.holo.host` node discovery service, but can be overridden. +This library is currently by default pointed at the `wss://signal.holotest.net` node discovery service, but can be overridden. From 0fd130aa7f2e89f2794b08298bcfd8671ed72a01 Mon Sep 17 00:00:00 2001 From: Karl Bonnici Date: Mon, 15 May 2023 12:23:43 -0700 Subject: [PATCH 2/4] bump dependancy versions --- Cargo.lock | 214 ++++++++++++++++++----------------------- Cargo.toml | 15 +-- src/embedded_runner.rs | 6 +- 3 files changed, 103 insertions(+), 132 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7790916..d0f3b12 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1538,9 +1538,9 @@ dependencies = [ [[package]] name = "fixt" -version = "0.2.0" +version = "0.2.1-beta-dev.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce0c5ad1ad54b1f4eecacf6b3982f482a8406460f8c5c0784e007c357f0924f" +checksum = "3e078693c0fee966feeffd56cc7c52a64bb97abcabf699f639a122f198a47114" dependencies = [ "holochain_serialized_bytes", "lazy_static", @@ -1821,7 +1821,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b0f758b0048e5f55f4d927932a32eb4ab8a850c4b9a7951b259ba6c8792d5c38" dependencies = [ "futures", - "mockall", "must_future", "paste", "thiserror", @@ -1967,9 +1966,9 @@ dependencies = [ [[package]] name = "hdi" -version = "0.3.0" +version = "0.3.1-beta-dev.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06292d997b21a2a57b47f2ac84fa67e6889b7cb9b34930748c2d98cf9547b04d" +checksum = "a886cc9e0c50374c32ae9ca88f84d9dd49976354ac2212dee72036cc6ff49ed8" dependencies = [ "hdk_derive", "holo_hash", @@ -1984,9 +1983,9 @@ dependencies = [ [[package]] name = "hdk" -version = "0.2.0" +version = "0.2.1-beta-dev.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cacd5c50628daef7ccea609a59e142e9e176a66c412ccfe181c09f8b335b8257" +checksum = "8fd3ff014eff9c6849bbe3e6350e28a0156b156afc4b12c51412b4307795c2f2" dependencies = [ "getrandom 0.2.8", "hdi", @@ -2004,9 +2003,9 @@ dependencies = [ [[package]] name = "hdk_derive" -version = "0.2.0" +version = "0.2.1-beta-dev.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d65bf8cf99d28f7cd6798f2c58c0687e16627f3acac270a1ed79b1d098215cd9" +checksum = "4ad315cca0c2b5c3b361b07d0d3ff6adf1a8c99501962b6f833dee1adacbea1a" dependencies = [ "darling 0.14.2", "heck 0.4.0", @@ -2090,9 +2089,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "holo_hash" -version = "0.2.0" +version = "0.2.1-beta-dev.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6226119f4b5e8a11903f7609db1a11c7348409cb29c2f750633fab8b7c89feaf" +checksum = "b45b6a6f1d7bfb0b1a73caa16b0f01ab103c93e748f273a0f479ecca6e5977ee" dependencies = [ "arbitrary", "base64 0.13.1", @@ -2113,9 +2112,9 @@ dependencies = [ [[package]] name = "holochain" -version = "0.2.0" +version = "0.2.1-beta-dev.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9929480c8e468566fc88365e1e798917857e9ecb4ea37d4d62b3d4689bbc16d3" +checksum = "86335e2dbe124b60983a462db42a8f9b706677ca4757d9253f4fe6b9bb76e152" dependencies = [ "anyhow", "async-recursion", @@ -2142,7 +2141,6 @@ dependencies = [ "holochain_serialized_bytes", "holochain_sqlite", "holochain_state", - "holochain_test_wasm_common", "holochain_trace", "holochain_types", "holochain_util", @@ -2158,7 +2156,6 @@ dependencies = [ "kitsune_p2p_bootstrap", "kitsune_p2p_types", "lazy_static", - "matches", "mockall", "mr_bundle", "must_future", @@ -2193,7 +2190,6 @@ dependencies = [ "tracing-subscriber 0.3.17", "tx5-go-pion-turn", "tx5-signal-srv", - "unwrap_to", "url 1.7.2", "url2", "url_serde", @@ -2207,6 +2203,7 @@ version = "0.7.1" dependencies = [ "base64 0.13.1", "ctrlc", + "either", "futures", "hdk", "holochain", @@ -2227,9 +2224,9 @@ dependencies = [ [[package]] name = "holochain_cascade" -version = "0.2.0" +version = "0.2.1-beta-dev.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfa60c0fa4a068ef1d54d98c39573c490efbbfd4b426f076287d507c4d48b0db" +checksum = "aed2bfdcf131f883a15c58d2018dca95aef8834414624aa99c5cd12764aa8c2c" dependencies = [ "async-trait", "derive_more", @@ -2260,9 +2257,9 @@ dependencies = [ [[package]] name = "holochain_conductor_api" -version = "0.2.0" +version = "0.2.1-beta-dev.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99242e8fcb431c7b321986bf47ad8a3a06d5f21ba35e7a132c17e2a91236c15c" +checksum = "511ac3cf61b9a8b4a40a97b590a4f7f118957ba2cd73c546bc59a8036d7da521" dependencies = [ "derive_more", "directories", @@ -2285,9 +2282,9 @@ dependencies = [ [[package]] name = "holochain_integrity_types" -version = "0.2.0" +version = "0.2.1-beta-dev.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6422c6712a8b566a8e2c831665110758eda3e81d7ee752a73b815e356437e2d7" +checksum = "968bfd750360632a12329304808cc594ee8d166bf4457c70a7788e725d4d2371" dependencies = [ "arbitrary", "holo_hash", @@ -2302,9 +2299,9 @@ dependencies = [ [[package]] name = "holochain_keystore" -version = "0.2.0" +version = "0.2.1-beta-dev.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "011ad1dfc14e30d9b33ea597bdd38b14ffee0648fd14276929f20cc3c27e903a" +checksum = "34150e351ecbc92516a9691038e144cf278d17ecdfd9f5fccbadf52672d2e703" dependencies = [ "base64 0.13.1", "futures", @@ -2327,9 +2324,9 @@ dependencies = [ [[package]] name = "holochain_p2p" -version = "0.2.0" +version = "0.2.1-beta-dev.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0dbf1487d71042e2682de8a264a0394b9a76696a63752ac7d3f2e456341b60" +checksum = "f161beb5220027bf6a28422212a7015d657c1a991d48c244f1e12775c72d4e75" dependencies = [ "async-trait", "derive_more", @@ -2383,9 +2380,9 @@ dependencies = [ [[package]] name = "holochain_sqlite" -version = "0.2.0" +version = "0.2.1-beta-dev.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2cc4aca4b50e3b5cf97e6f950ea5c1afe99a8ed80fce1a5cbad235d95917ff1" +checksum = "62b4a91e4957be8355f18ce77203c596148a2f0fe976416a817aba3c472c551a" dependencies = [ "anyhow", "async-trait", @@ -2434,9 +2431,9 @@ dependencies = [ [[package]] name = "holochain_state" -version = "0.2.0" +version = "0.2.1-beta-dev.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "471027dfbf8014e6fc8396b7fe844d1f36ad9452e08b46821b4679ddd0620e7d" +checksum = "fc11159806b9d9367d4438edd58f9a9435f580386b8875c871a032d2d02b55b4" dependencies = [ "async-recursion", "base64 0.13.1", @@ -2474,21 +2471,11 @@ dependencies = [ "tracing-futures", ] -[[package]] -name = "holochain_test_wasm_common" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d155d5dd677921ebe18ea55a9ce26464212e3c0e6fc65afb26245feeab760bdc" -dependencies = [ - "hdk", - "serde", -] - [[package]] name = "holochain_trace" -version = "0.2.0" +version = "0.2.1-beta-dev.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1130c4f0ae5932c3abefb24dc8c7c9f683f4140fe0b9e2f68b50b5c223fa60c1" +checksum = "0cb82cc37ea6b68078e7141591512d4c2e69a8ac8c6bfcc84a837d8e0a2dcf2f" dependencies = [ "chrono", "derive_more", @@ -2504,9 +2491,9 @@ dependencies = [ [[package]] name = "holochain_types" -version = "0.2.0" +version = "0.2.1-beta-dev.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "029b6e9af6392679c9e7c4567a3bb736f4d2e5141913011930b0c4e24ab192a2" +checksum = "3cbed84258f7f1493a25d2260371d6099760592177f230880214d40c0a9c992c" dependencies = [ "anyhow", "arbitrary", @@ -2561,9 +2548,9 @@ dependencies = [ [[package]] name = "holochain_util" -version = "0.2.0" +version = "0.2.1-beta-dev.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6adb6c2f8470016da35dba7f1b6d45ce9d2650f102a8913f7dae906001ff78d8" +checksum = "7bf981f28e2933856801ed799f192be3ebc40b8b5592197cbb909410621eb1ff" dependencies = [ "backtrace", "cfg-if 0.1.10", @@ -2579,9 +2566,9 @@ dependencies = [ [[package]] name = "holochain_wasm_test_utils" -version = "0.2.0" +version = "0.2.1-beta-dev.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aee4f1c9d40d6979bc7792de4f3d9e22cb5a655273fc0071ea6b382a2d0f6da" +checksum = "75640215cf728726a5505a6eaf0cd8681478a441a4c91d17934a99b3d4f18b0a" dependencies = [ "holochain_types", "holochain_util", @@ -2639,9 +2626,9 @@ dependencies = [ [[package]] name = "holochain_websocket" -version = "0.2.0" +version = "0.2.1-beta-dev.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26e49e8f9648b49f7ff79a267fa8a4f79df969788df712c243955cf7c6cc794a" +checksum = "74cbc99a0759379d2c631bf780f476dda8402f0da241ae669f1236dbf8b6196e" dependencies = [ "futures", "ghost_actor 0.4.0-alpha.5", @@ -2664,9 +2651,9 @@ dependencies = [ [[package]] name = "holochain_zome_types" -version = "0.2.0" +version = "0.2.1-beta-dev.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf78683a0f846670590fe90dd8a36cb31f8b659f5c8d84431c79b35e07e8bb6c" +checksum = "c534bd83fcb25cf61e2bb075228a848777b184a56ad4f23e1591fdb28d2e72fd" dependencies = [ "arbitrary", "contrafact", @@ -3059,14 +3046,13 @@ dependencies = [ [[package]] name = "kitsune_p2p" -version = "0.2.0" +version = "0.2.1-beta-dev.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "153b74e3e6a911317b98949c9a926323ea340896534c77d7197d7398072cab47" +checksum = "da20876756c95919cb63e23ca1d9f07432b4a418758f2706ba93f3dab0d38670" dependencies = [ "arbitrary", "arrayref", "base64 0.13.1", - "blake2b_simd 0.5.11", "bloomfilter", "bytes", "derive_more", @@ -3083,8 +3069,6 @@ dependencies = [ "kitsune_p2p_timestamp", "kitsune_p2p_transport_quic", "kitsune_p2p_types", - "maplit", - "mockall", "must_future", "nanoid 0.4.0", "num-traits", @@ -3106,11 +3090,10 @@ dependencies = [ [[package]] name = "kitsune_p2p_bin_data" -version = "0.2.0" +version = "0.2.1-beta-dev.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50646bf8a9663cebdfeca0db6ec0e4885982310f7736d67970e712861bac25ac" +checksum = "232e06b32338876fd8d0d15ab108d4300b694491e8956f228b10fcc4bbd2ead3" dependencies = [ - "arbitrary", "base64 0.13.1", "derive_more", "kitsune_p2p_dht_arc", @@ -3121,9 +3104,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_block" -version = "0.2.0" +version = "0.2.1-beta-dev.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "785507770229308b584b812c595bf629625c647ed30ba7a4fe39802878595556" +checksum = "6c7254bef2b43f10f5b15665d31bf42292c6981fe9d1eb23fbe4e83d1e593ce7" dependencies = [ "kitsune_p2p_bin_data", "kitsune_p2p_timestamp", @@ -3133,9 +3116,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_bootstrap" -version = "0.1.0" +version = "0.1.1-beta-dev.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6fed8640ccd5e560144045301fa73063bfb2236d73bc017bd0d87bdc16528b9" +checksum = "8b7a34953f38558c00add1b71f9ba22f5e9c0d9623416f21728ab8d79264c01f" dependencies = [ "clap 3.2.23", "futures", @@ -3153,9 +3136,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_dht" -version = "0.2.0" +version = "0.2.1-beta-dev.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1172cc1ee86e79d70721ad49d9a4eec4209aa4a19fe2e0ab0b2893b68be5eda2" +checksum = "7b2c416fc26e2d89e800177a9b3b9c46e81940f64aba515f1eb05c61de9cb064" dependencies = [ "colored", "derivative", @@ -3177,9 +3160,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_dht_arc" -version = "0.2.0" +version = "0.2.1-beta-dev.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7477f21f641ede028524a659723a20acd56b57992576db3c0c8d08dc5f18a0c1" +checksum = "426d6a7eaf785334ebe1051a038cec1e63b12efde1873e2c03f1faa4215cc286" dependencies = [ "derive_more", "gcollections", @@ -3191,9 +3174,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_fetch" -version = "0.2.0" +version = "0.2.1-beta-dev.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4897a6f6247f580eac56c2c531ce43fe68308858f88de9c26563a5b0fbb3c206" +checksum = "07001b6bc76408b7779ac04937763745e373b8d7b10967e29eb6c77740f616e0" dependencies = [ "derive_more", "futures", @@ -3212,9 +3195,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_mdns" -version = "0.2.0" +version = "0.2.1-beta-dev.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f27c2e4097c5463ee373260fc095d1c71cf68a7d0ba810a1a6a6a8b59aab83b" +checksum = "edbd907be0d520a66d17b0f375c26689e84ff80dc1d438858eb8b8aea86eaaab" dependencies = [ "async-stream", "base64 0.13.1", @@ -3229,9 +3212,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_proxy" -version = "0.2.0" +version = "0.2.1-beta-dev.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa6a480bbe685f17471d2bc76a17de75a0edee3514b93ce249860d048fafa1c9" +checksum = "d5fed8d67dbe6b0e5bd56316a5d61a74900cb6dff3368e1560126cc388908867" dependencies = [ "base64 0.13.1", "blake2b_simd 0.5.11", @@ -3254,9 +3237,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_timestamp" -version = "0.2.0" +version = "0.2.1-beta-dev.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be6483b304900c20fa104c50947cc1adf0e277fccdba8e26134d7b49dbdfd2a0" +checksum = "40905f4ba51df93beb142c2381ff3ee4666ea4d493e2464d929674a141fdc88f" dependencies = [ "arbitrary", "chrono", @@ -3267,9 +3250,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_transport_quic" -version = "0.2.0" +version = "0.2.1-beta-dev.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ad3838ee28b59b32d1b10b4370c520a98a9755f2dee2dac5df8ed8f8228b5ea" +checksum = "e3aea97f08d9fd769307343a4fee05292ccfbb9a65c8681229d24819d0f64204" dependencies = [ "blake2b_simd 1.0.0", "futures", @@ -3287,11 +3270,10 @@ dependencies = [ [[package]] name = "kitsune_p2p_types" -version = "0.2.0" +version = "0.2.1-beta-dev.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebc7addd567dfbe484df1e777a7bd1246a449613e3626ed2fe8043740b3f1e14" +checksum = "5cc2a0e243969eb5e4b02155e04dc8f0357db187df50d76f2248d23049a1f6c1" dependencies = [ - "arbitrary", "base64 0.13.1", "derive_more", "futures", @@ -3303,7 +3285,6 @@ dependencies = [ "kitsune_p2p_dht_arc", "lair_keystore_api", "lru 0.8.1", - "mockall", "nanoid 0.3.0", "once_cell", "parking_lot 0.11.2", @@ -3585,12 +3566,6 @@ dependencies = [ "libc", ] -[[package]] -name = "maplit" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" - [[package]] name = "match_cfg" version = "0.1.0" @@ -3769,9 +3744,9 @@ checksum = "7843ec2de400bcbc6a6328c958dc38e5359da6e93e72e37bc5246bf1ae776389" [[package]] name = "mr_bundle" -version = "0.2.0" +version = "0.2.1-beta-dev.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e726d84eb94b1e9407908b6181d377c02d3f3ac52be9632427d197b3c6075896" +checksum = "96a5391b8a27aecb977d36b16b6eed6a35d5dd98cd24a35d35b465302da54110" dependencies = [ "arbitrary", "bytes", @@ -5088,6 +5063,15 @@ dependencies = [ "bitflags 1.3.2", ] +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags 1.3.2", +] + [[package]] name = "redox_users" version = "0.4.3" @@ -5148,15 +5132,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "remove_dir_all" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi 0.3.9", -] - [[package]] name = "rend" version = "0.3.6" @@ -6097,16 +6072,15 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.3.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" dependencies = [ "cfg-if 1.0.0", "fastrand", - "libc", - "redox_syscall 0.2.16", - "remove_dir_all", - "winapi 0.3.9", + "redox_syscall 0.3.5", + "rustix", + "windows-sys 0.45.0", ] [[package]] @@ -6656,9 +6630,9 @@ dependencies = [ [[package]] name = "tx5" -version = "0.0.1-alpha.13" +version = "0.0.1-alpha.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d092c04f27e61d8d14ca32cb04d5f855c01f32cc03b7405d81f74201917bbfac" +checksum = "68877bfd419597a6aba9269a8890bad5fa0519af523252d529fa48afe52dd186" dependencies = [ "bytes", "futures", @@ -6678,15 +6652,19 @@ dependencies = [ [[package]] name = "tx5-core" -version = "0.0.1-alpha.5" +version = "0.0.1-alpha.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ceeeff809f86347164035661f475c0a9bbf4040c4a6755183d0b84c8c6491d25" +checksum = "6de3181cafaf2cd7d1cd60c3367db5daf53a818159afa596f420bc2da1d7243d" dependencies = [ "base64 0.13.1", + "dirs", "once_cell", "rand 0.8.5", "serde", "serde_json", + "sha2", + "tempfile", + "tracing", "url 2.3.1", ] @@ -6725,9 +6703,9 @@ dependencies = [ [[package]] name = "tx5-go-pion-turn" -version = "0.0.1-alpha.5" +version = "0.0.1-alpha.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71db717f9fe2e83925a4489f0a3f542546a8797e225f23afd125799214c44a8f" +checksum = "925f258966cedc265cb2e1ba5a19be3007b562b203068d0c33967458695a680a" dependencies = [ "base64 0.13.1", "dirs", @@ -6743,9 +6721,9 @@ dependencies = [ [[package]] name = "tx5-signal" -version = "0.0.1-alpha.7" +version = "0.0.1-alpha.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cb3165fabcb68fd23d5b7c3a2dce189d6af30c6ace9e1357fe55a22a937971b" +checksum = "5f3c853c5f4203d1d26d22cfac3b57980c7146c1f289dc7a26334ff7725b8e42" dependencies = [ "futures", "lair_keystore_api", @@ -6771,9 +6749,9 @@ dependencies = [ [[package]] name = "tx5-signal-srv" -version = "0.0.1-alpha.7" +version = "0.0.1-alpha.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9671d940802c9ff79974d96c2add464f8bf4e4d02e340d3d3a0ddb739fae6bfb" +checksum = "8359558d90ae7c4b2ff885619fcd75186cccdb62f575252c95c0c06484ce7de0" dependencies = [ "clap 4.2.7", "dirs", @@ -6868,12 +6846,6 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" -[[package]] -name = "unwrap_to" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cad414b2eed757c1b6f810f8abc814e298a9c89176b21fae092c7a87756fb839" - [[package]] name = "unzip-n" version = "0.1.2" diff --git a/Cargo.toml b/Cargo.toml index 6c75411..bceed6c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,13 +18,14 @@ one_err = "0.0.8" sodoken = "=0.0.9" tokio = { version = "1.28", features = ["full"] } observability = "0.1.3" -holochain_util = "0.2.0" -holochain_p2p = "0.2.0" -holochain_types = "0.2.0" -holochain_zome_types = "0.2.0" -holochain_keystore = "0.2.0" -holochain = "0.2.0" -hdk = "0.2.0" +either = "1.5.0" +holochain_util = "0.2.1-beta-dev.0" +holochain_p2p = "0.2.1-beta-dev.0" +holochain_types = "0.2.1-beta-dev.0" +holochain_zome_types = "0.2.1-beta-dev.0" +holochain_keystore = "0.2.1-beta-dev.0" +holochain = "0.2.1-beta-dev.0" +hdk = "0.2.1-beta-dev.0" # termination feature enables handling of SIGTERM events as well on unix ctrlc = { version = "3.2.0", features = ["termination"] } diff --git a/src/embedded_runner.rs b/src/embedded_runner.rs index 554195a..eb5481b 100644 --- a/src/embedded_runner.rs +++ b/src/embedded_runner.rs @@ -2,10 +2,8 @@ use crate::{ emit::{emit, StateSignal}, generate_key::find_or_generate_key, }; -use holochain::{ - conductor::{api::error::ConductorApiResult, Conductor, ConductorHandle}, - test_utils::itertools::Either, -}; +use either::*; +use holochain::conductor::{api::error::ConductorApiResult, Conductor, ConductorHandle}; use holochain_p2p::kitsune_p2p::dependencies::url2::Url2; use holochain_types::app::InstalledAppId; use holochain_zome_types::NetworkSeed; From 1c9354d612312f22292cd86e8d2b8b389f3675d9 Mon Sep 17 00:00:00 2001 From: Karl Bonnici Date: Mon, 15 May 2023 12:31:12 -0700 Subject: [PATCH 3/4] bump holochain-runner version --- Cargo.lock | 2 +- Cargo.toml | 2 +- README.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d0f3b12..8bec74d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2199,7 +2199,7 @@ dependencies = [ [[package]] name = "holochain-runner" -version = "0.7.1" +version = "0.7.2" dependencies = [ "base64 0.13.1", "ctrlc", diff --git a/Cargo.toml b/Cargo.toml index bceed6c..eedc59d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "holochain-runner" -version = "0.7.1" +version = "0.7.2" description = "a Holochain runtime binary with key management, good defaults, and Status Update events. Suitable for development and production environments" authors = ["Connor Turland ", "Wesley Finck "] license = "CAL-1.0" diff --git a/README.md b/README.md index 20ce62c..b0e4ac7 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ An alternative Holochain conductor binary useful for quick startup and including handling of key generation and hApp installation. ```bash -holochain-runner 0.7.1 +holochain-runner 0.7.2 wrapped Holochain Conductor with Status Update events, and a good SIGTERM kill switch USAGE: From dc211af1ff4eabdb63b250f2eefec54d8f4cfd32 Mon Sep 17 00:00:00 2001 From: Connor Turland Date: Mon, 15 May 2023 12:36:32 -0700 Subject: [PATCH 4/4] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b0e4ac7..389ebc9 100644 --- a/README.md +++ b/README.md @@ -95,4 +95,4 @@ pub enum StateSignal { ## Bootstrap Networking Service -This library is currently by default pointed at the `wss://signal.holotest.net` node discovery service, but can be overridden. +This library is currently by default pointed at the `https://bootstrap.holo.host` node discovery service, but can be overridden.