From 8275cfb3c251ac6c4c15e9c0674abfb15593636f Mon Sep 17 00:00:00 2001 From: zo-el Date: Thu, 15 Aug 2024 12:56:39 -0500 Subject: [PATCH 1/3] compatable with holochain v0.4.0-dev.18 --- Cargo.lock | 106 +++++++++++++++++++++-------------------- Cargo.toml | 8 ++-- flake.lock | 40 ++++++++-------- src/admin_websocket.rs | 11 ++++- 4 files changed, 87 insertions(+), 78 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3fefd38..79a235b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2295,9 +2295,9 @@ dependencies = [ [[package]] name = "hc_sleuth" -version = "0.4.0-dev.13" +version = "0.4.0-dev.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00ef290949d2a5a17ef9d6227404272ed3fbdbafcab11a095a20ed928b9914d2" +checksum = "bba0468ff7ec7eb0279df4a0d6214b7073cb34c5686dc94bb6f65d447c5b564e" dependencies = [ "aitia", "anyhow", @@ -2336,9 +2336,9 @@ dependencies = [ [[package]] name = "hdk" -version = "0.4.0-dev.11" +version = "0.4.0-dev.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b63439a2fa623ae819ad41037c00216f1d62dc78aa9e9e5458f987866c08254f" +checksum = "5d000c0be9deb5fa8bc111b42fd7085fccf7cc12bf67ae4c8ccf797dca1e866c" dependencies = [ "getrandom 0.2.15", "hdi", @@ -2485,9 +2485,9 @@ dependencies = [ [[package]] name = "holochain" -version = "0.4.0-dev.13" +version = "0.4.0-dev.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3622cf81e0423df04179ef946528a8ff9f00834623e138e136b3a5d9c8a7e70" +checksum = "3046ebc4fcf6b50e75885bd9a328496efe1c49ee2aad0ca9d7fd2b516d00e4be" dependencies = [ "aitia", "anyhow", @@ -2585,9 +2585,9 @@ dependencies = [ [[package]] name = "holochain_cascade" -version = "0.4.0-dev.13" +version = "0.4.0-dev.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a7efe7f5f3f920085f64b6e3c22e8bef3f3c59879af82d2cfd6b6c82c1cdc21" +checksum = "08d57472b0073c2ec06e64a29b5821ef3d4e2964acfc777d48f4b0c1371bfc35" dependencies = [ "async-trait", "fixt", @@ -2638,9 +2638,9 @@ dependencies = [ [[package]] name = "holochain_conductor_api" -version = "0.4.0-dev.13" +version = "0.4.0-dev.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "862753fc38da97948f85a4aae5e5d55bce0d50331645328deffe3c4db9a21018" +checksum = "ea9c7aaa2e3cd5e10192b35bd30aa9032b41349f56d6fb324828495596a3a627" dependencies = [ "derive_more", "holo_hash", @@ -2661,9 +2661,9 @@ dependencies = [ [[package]] name = "holochain_conductor_services" -version = "0.3.0-dev.13" +version = "0.3.0-dev.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5730ceaa32e3069d489fc6cd55d4ad0fbc5f8b1e40559fd3f8500b6fa33abd17" +checksum = "873ecbaae0efbe3a67a010e5bcc04dd466d7696a0a48e1609ea99f7d3235dc54" dependencies = [ "anyhow", "async-trait", @@ -2699,9 +2699,9 @@ dependencies = [ [[package]] name = "holochain_keystore" -version = "0.4.0-dev.13" +version = "0.4.0-dev.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0deca8e5e0712e0519c57428c9cf1b73687951720864379a407c5c14c8dc8d8" +checksum = "f303489615e9e501b354ffe42ee0a2097357e7606f685cd40cb778a8b01f6a61" dependencies = [ "base64 0.22.1", "derive_more", @@ -2750,9 +2750,9 @@ dependencies = [ [[package]] name = "holochain_p2p" -version = "0.4.0-dev.13" +version = "0.4.0-dev.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd6aae977133f0c9339965b9a3af0354490730809b3983d547f6da1d79b53e49" +checksum = "e9749e3a496af6ad8343d0547ee78363eb748a983d1637bd7a6b6ee8b98fb404" dependencies = [ "aitia", "async-trait", @@ -2821,9 +2821,9 @@ dependencies = [ [[package]] name = "holochain_sqlite" -version = "0.4.0-dev.13" +version = "0.4.0-dev.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e14756671481b574e0ad358a268e0c297b7c7996770e356556456f4d45b77b7" +checksum = "c16598bee58cfd58ae6d6e07d5f79f840f11db507b0e436bbd46ef19d2a4c72c" dependencies = [ "anyhow", "async-trait", @@ -2864,9 +2864,9 @@ dependencies = [ [[package]] name = "holochain_state" -version = "0.4.0-dev.13" +version = "0.4.0-dev.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e1227fde514a7d79c55b1e09c6335bbdf68b16b0eb67ffe020e748ab027d823" +checksum = "b15a8ea59d87828dd607f915d2f38e466e95d0cd6705356821658c6a1f49b9d7" dependencies = [ "aitia", "async-recursion", @@ -2874,6 +2874,7 @@ dependencies = [ "chrono", "contrafact", "cron", + "derive_more", "fallible-iterator 0.3.0", "hc_sleuth", "holo_hash", @@ -2911,9 +2912,9 @@ dependencies = [ [[package]] name = "holochain_test_wasm_common" -version = "0.4.0-dev.11" +version = "0.4.0-dev.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6afc51514da505c569e800fe1aed4891058e551a6b59ba53c2ff197a124af26" +checksum = "5edf2524d8270eb118fb8c1ba93edcb42674c7d529d62b1e87ade0b9b2307ea4" dependencies = [ "hdk", "serde", @@ -2939,9 +2940,9 @@ dependencies = [ [[package]] name = "holochain_types" -version = "0.4.0-dev.13" +version = "0.4.0-dev.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5a3a973a27759b0da60e40b2d17daa814f77b596cb7e40783ec73f9d68e047e" +checksum = "1ea58298b002ecbd20b5160b19516604e393734ecc1952594ac76162ffcfcf8d" dependencies = [ "anyhow", "arbitrary", @@ -3011,9 +3012,9 @@ dependencies = [ [[package]] name = "holochain_wasm_test_utils" -version = "0.4.0-dev.13" +version = "0.4.0-dev.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19d22c9d998958e5bb55df4f16ca8e4a55ecb0af5f6a5ba42352361a9330a954" +checksum = "4c8a5eb2ec5267590b5ab53bef7232c06c5397e1946000e3fa32f8bbd7352db0" dependencies = [ "holochain_types", "holochain_util", @@ -3072,9 +3073,9 @@ dependencies = [ [[package]] name = "holochain_websocket" -version = "0.4.0-dev.13" +version = "0.4.0-dev.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a653356ee984194bd74dc69ded4d3711632ecf46320adaa400d2d7bd9df35a88" +checksum = "269186f9ba9357be566b86d94bfc32b534fbe76bf42ae75ca991796ce70426b8" dependencies = [ "async-trait", "futures", @@ -3089,9 +3090,9 @@ dependencies = [ [[package]] name = "holochain_zome_types" -version = "0.4.0-dev.11" +version = "0.4.0-dev.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f62ed18d860b34574edcc76a467e456775142d3e5ca86fb31907f25680cee965" +checksum = "71794e55ee4a1d0315e0963c6b5f78a6f97b9ce28de211fed50d37efd284beb2" dependencies = [ "arbitrary", "contrafact", @@ -3713,9 +3714,9 @@ dependencies = [ [[package]] name = "kitsune_p2p" -version = "0.4.0-dev.12" +version = "0.4.0-dev.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39a0b3dcc8599fd80093636f30ff6fcdccab519e65aa4de351cc44c47e5f63a9" +checksum = "3e58e66a6449f845d48e94a7788f5296a1b5ffe895fac7ae38c116080bb52bfe" dependencies = [ "arrayref", "base64 0.22.1", @@ -6056,9 +6057,9 @@ dependencies = [ [[package]] name = "sbd-client" -version = "0.0.5-alpha" +version = "0.0.6-alpha" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bff8b5e22ff3d13f41b3b8318dcfb5303eb9903399ce82d25bcbf84742a0509" +checksum = "66f0b06ca514d8666ff371c63a5913e3f1740312c13768f301d0e5578a03c7e2" dependencies = [ "base64 0.22.1", "ed25519-dalek", @@ -6075,9 +6076,9 @@ dependencies = [ [[package]] name = "sbd-e2e-crypto-client" -version = "0.0.5-alpha" +version = "0.0.6-alpha" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7f9e9ed5e1e817c0b57cf9625b0a823109267d3bfb06d5feec69e626bde59e8" +checksum = "d257a338fa0fca74d013b69a9e49f3683a4766bcadd4fe583779783bec48dede" dependencies = [ "sbd-client", "sodoken 0.0.901-alpha", @@ -6087,9 +6088,9 @@ dependencies = [ [[package]] name = "sbd-server" -version = "0.0.5-alpha" +version = "0.0.6-alpha" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39c6ba716e669f658476cf3c0924b8970f23937601e8c5bb8d03f1a7a8b638ea" +checksum = "fb12c0cb502dd2998fb3560e3999f58ac819719fd6513763029608dcf77f4a88" dependencies = [ "anstyle", "base64 0.22.1", @@ -7406,9 +7407,9 @@ dependencies = [ [[package]] name = "tx5" -version = "0.0.13-alpha" +version = "0.1.3-beta" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f3fa6f0662915bdc6e50ead429b24c42b9aa8d3f8e4f2c3cfc5974203cd31b8" +checksum = "37f5c8ae702c58cd1a127fe5785db014ddba783e18c87ad936275bb6e4023a13" dependencies = [ "base64 0.22.1", "influxive-otel-atomic-obs", @@ -7422,11 +7423,12 @@ dependencies = [ [[package]] name = "tx5-connection" -version = "0.0.13-alpha" +version = "0.1.3-beta" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4af97cb5c4ef5c2c1c3a02a3b6025d7eacbfff0c7cc69c8ff49682668b7a1281" +checksum = "1f97d4960fe1d84c6cf6335df355841a43377feb57df4b4996e24d0f50e07774" dependencies = [ "bit_field", + "futures", "tokio", "tracing", "tx5-core", @@ -7436,9 +7438,9 @@ dependencies = [ [[package]] name = "tx5-core" -version = "0.0.13-alpha" +version = "0.1.3-beta" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dbcda1421f6ffc361133d90d3ad8b9df813c62b3a2b0bd205dfc33205162bdf" +checksum = "bc52d9b50b494b1d92b6a12ab9d3f98d420d549e85b128f671abfb67c1cf8cba" dependencies = [ "app_dirs2", "base64 0.22.1", @@ -7455,9 +7457,9 @@ dependencies = [ [[package]] name = "tx5-go-pion" -version = "0.0.13-alpha" +version = "0.1.3-beta" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d18eeb48190fe7f1e2ae7a58802ef3cc8f6a3c8164550bd7a0bb6d9015a537a" +checksum = "450fffbc9207428bd387e319aa88fe226cad0950937e773f9bbf0672c6d0104e" dependencies = [ "futures", "parking_lot 0.12.3", @@ -7469,9 +7471,9 @@ dependencies = [ [[package]] name = "tx5-go-pion-sys" -version = "0.0.13-alpha" +version = "0.1.3-beta" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "594e080a0c0883f526337ffeed768908a711e5eddddeeec7b65851faf0c3d211" +checksum = "23094d66b8570e86418520c9317fe8d16c0b45ed3156bb01b5e14ed674136da9" dependencies = [ "Inflector", "base64 0.22.1", @@ -7488,9 +7490,9 @@ dependencies = [ [[package]] name = "tx5-go-pion-turn" -version = "0.0.13-alpha" +version = "0.1.3-beta" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8a35d3a876ab999f2ba39246676061ca1b2c24f0e3f632535c3e68bdc65f666" +checksum = "3c2acad1aec5d8b8272e1e6c3ddcf4f154163a59429d9c58124b025b53d8c914" dependencies = [ "base64 0.22.1", "dirs", @@ -7506,9 +7508,9 @@ dependencies = [ [[package]] name = "tx5-signal" -version = "0.0.13-alpha" +version = "0.1.3-beta" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "509f9e2ab94e4513084a34c1f89d23a2935206ed65c5ea14afbb3b286f7af47b" +checksum = "7c67250845c61754644c82d76e5644cfdb21226f6c036ff7aa8d159db411e2b6" dependencies = [ "rand 0.8.5", "sbd-e2e-crypto-client", diff --git a/Cargo.toml b/Cargo.toml index fadd7d5..930391a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -28,10 +28,10 @@ async-trait = "0.1" parking_lot = "0.12.1" holo_hash = { version = "0.4.0-dev.8", features = ["encoding"] } -holochain_conductor_api = "0.4.0-dev.12" -holochain_websocket = "0.4.0-dev.12" +holochain_conductor_api = "0.4.0-dev.18" +holochain_websocket = "0.4.0-dev.16" holochain_serialized_bytes = "0.0.55" -holochain_types = "0.4.0-dev.12" +holochain_types = "0.4.0-dev.18" holochain_nonce = "0.4.0-dev.4" holochain_zome_types = { workspace = true } @@ -41,7 +41,7 @@ tokio = { version = "1.36", features = ["rt"] } [dev-dependencies] arbitrary = "1.2" -holochain = { version = "0.4.0-dev.12", features = ["test_utils"] } +holochain = { version = "0.4.0-dev.18", features = ["test_utils"] } rand = "0.8" kitsune_p2p_types = "0.4.0-dev.9" diff --git a/flake.lock b/flake.lock index f425d6e..9bf3919 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1720546058, - "narHash": "sha256-iU2yVaPIZm5vMGdlT0+57vdB/aPq/V5oZFBRwYw+HBM=", + "lastModified": 1721058578, + "narHash": "sha256-fs/PVa3H5dS1//4BjecWi3nitXm5fRObx0JxXIAo+JA=", "owner": "ipetkov", "repo": "crane", - "rev": "2d83156f23c43598cf44e152c33a59d3892f8b29", + "rev": "17e5109bb1d9fb393d70fba80988f7d70d1ded1a", "type": "github" }, "original": { @@ -59,11 +59,11 @@ "hc-scaffold": { "flake": false, "locked": { - "lastModified": 1720709716, - "narHash": "sha256-JrUNDbAiSPl11L8JxtgNfKXV13bWgCD+Xd0hNy8nK9A=", + "lastModified": 1723558677, + "narHash": "sha256-s5WjtXlu8d7U/zY2Kv4daaH0TlSiVc+D+UqR6B7+qj4=", "owner": "holochain", "repo": "scaffolding", - "rev": "3241aaaf52589ced9e29bf616407b867f6927c44", + "rev": "80edba8c2f5512ba0babcc8d84b78c1d79f0d1d8", "type": "github" }, "original": { @@ -76,16 +76,16 @@ "holochain": { "flake": false, "locked": { - "lastModified": 1721178546, - "narHash": "sha256-BSizIg/FSELpbxK4QMBrMC1iJzfDUk0D0BV3Zf73RtY=", + "lastModified": 1723718736, + "narHash": "sha256-f8Hi7HvANahU5lJjtWk+XpnCcIjfMiV0yFxGqzqEXqU=", "owner": "holochain", "repo": "holochain", - "rev": "d7ef2a0947908ba1f859a535ef9ea31f89c2d355", + "rev": "a3384305850735b1b71fa0ab6f36f2318ec56d28", "type": "github" }, "original": { "owner": "holochain", - "ref": "holochain-0.4.0-dev.13", + "ref": "holochain-0.4.0-dev.18", "repo": "holochain", "type": "github" } @@ -102,11 +102,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1721249726, - "narHash": "sha256-kwgTA8i9meztf3vLT9VdMLSAvbm/ym0p8Rssvine61I=", + "lastModified": 1723737493, + "narHash": "sha256-zP22A91tT/i+chslSATQvjKrZTXelwTcDqeNTLLTcyc=", "owner": "holochain", "repo": "holonix", - "rev": "0d47eac78a632699add6e03bfff9f69d729b1c76", + "rev": "6438098657b9441e65db1543f0200f22453238de", "type": "github" }, "original": { @@ -135,16 +135,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1720542800, - "narHash": "sha256-ZgnNHuKV6h2+fQ5LuqnUaqZey1Lqqt5dTUAiAnqH0QQ=", + "lastModified": 1717179513, + "narHash": "sha256-vboIEwIQojofItm2xGCdZCzW96U85l9nDW3ifMuAIdM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "feb2849fdeb70028c70d73b848214b00d324a497", + "rev": "63dacb46bf939521bdc93981b4cbb7ecb58427a0", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "24.05", "repo": "nixpkgs", "type": "github" } @@ -178,11 +178,11 @@ ] }, "locked": { - "lastModified": 1720664424, - "narHash": "sha256-+odiMNHRYdvzL1ewl41UVFxsjmdoXfH+maQ8xvUoR4g=", + "lastModified": 1721269159, + "narHash": "sha256-eHrGuKZKQb762qdCkrfoyyxXLKumYhiXJca1ig0RftE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "fec97e65fcbaab0decccba740ac8688f61dadd70", + "rev": "c3e217122ac55680606d69bc693bdf262f14f602", "type": "github" }, "original": { diff --git a/src/admin_websocket.rs b/src/admin_websocket.rs index 4a62ff8..0d6f033 100644 --- a/src/admin_websocket.rs +++ b/src/admin_websocket.rs @@ -168,8 +168,15 @@ impl AdminWebsocket { } } - pub async fn uninstall_app(&self, installed_app_id: String) -> ConductorApiResult<()> { - let msg = AdminRequest::UninstallApp { installed_app_id }; + pub async fn uninstall_app( + &self, + installed_app_id: String, + force: bool, + ) -> ConductorApiResult<()> { + let msg = AdminRequest::UninstallApp { + installed_app_id, + force, + }; let response = self.send(msg).await?; match response { From 716db1e068f46912ee7a64c9ab62b3c993f25c5d Mon Sep 17 00:00:00 2001 From: ThetaSinner Date: Thu, 15 Aug 2024 20:54:04 +0100 Subject: [PATCH 2/3] Fix tests --- tests/admin.rs | 12 ++++++++---- tests/app.rs | 14 +++++++++----- tests/clone_cell.rs | 6 ++++-- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/tests/admin.rs b/tests/admin.rs index 4660d20..6390f20 100644 --- a/tests/admin.rs +++ b/tests/admin.rs @@ -45,8 +45,9 @@ async fn signed_zome_call() { .install_app(InstallAppPayload { agent_key: agent_key.clone(), installed_app_id: Some(app_id.clone()), - membrane_proofs: HashMap::new(), + membrane_proofs: None, network_seed: None, + existing_cells: HashMap::new(), source: AppBundleSource::Path(PathBuf::from("./fixture/test.happ")), ignore_genesis_failure: false, }) @@ -120,8 +121,9 @@ async fn storage_info() { .install_app(InstallAppPayload { agent_key: agent_key.clone(), installed_app_id: Some(app_id.clone()), - membrane_proofs: HashMap::new(), + membrane_proofs: None, network_seed: None, + existing_cells: HashMap::new(), source: AppBundleSource::Path(PathBuf::from("./fixture/test.happ")), ignore_genesis_failure: false, }) @@ -154,8 +156,9 @@ async fn dump_network_stats() { .install_app(InstallAppPayload { agent_key: agent_key.clone(), installed_app_id: Some(app_id.clone()), - membrane_proofs: HashMap::new(), + membrane_proofs: None, network_seed: None, + existing_cells: HashMap::new(), source: AppBundleSource::Path(PathBuf::from("./fixture/test.happ")), ignore_genesis_failure: false, }) @@ -181,8 +184,9 @@ async fn get_compatible_cells() { .install_app(InstallAppPayload { agent_key: agent_key.clone(), installed_app_id: Some(app_id.clone()), - membrane_proofs: HashMap::new(), + membrane_proofs: None, network_seed: None, + existing_cells: HashMap::new(), source: AppBundleSource::Path(PathBuf::from("./fixture/test.happ")), ignore_genesis_failure: false, }) diff --git a/tests/app.rs b/tests/app.rs index 8af815d..35c5cfc 100644 --- a/tests/app.rs +++ b/tests/app.rs @@ -38,8 +38,9 @@ async fn network_info() { .install_app(InstallAppPayload { agent_key: agent_key.clone(), installed_app_id: Some(app_id.clone()), - membrane_proofs: HashMap::new(), + membrane_proofs: None, network_seed: None, + existing_cells: HashMap::new(), source: AppBundleSource::Path(PathBuf::from("./fixture/test.happ")), ignore_genesis_failure: false, }) @@ -112,8 +113,9 @@ async fn handle_signal() { .install_app(InstallAppPayload { agent_key: agent_key.clone(), installed_app_id: Some(app_id.clone()), - membrane_proofs: HashMap::new(), + membrane_proofs: None, network_seed: None, + existing_cells: HashMap::new(), source: AppBundleSource::Path(PathBuf::from("./fixture/test.happ")), ignore_genesis_failure: false, }) @@ -209,8 +211,9 @@ async fn close_on_drop_is_clone_safe() { .install_app(InstallAppPayload { agent_key: agent_key.clone(), installed_app_id: Some(app_id.clone()), - membrane_proofs: HashMap::new(), + membrane_proofs: None, network_seed: None, + existing_cells: HashMap::new(), source: AppBundleSource::Path(PathBuf::from("./fixture/test.happ")), ignore_genesis_failure: false, }) @@ -261,7 +264,7 @@ async fn deferred_memproof_installation() { let app_bundle_source = AppBundleSource::Path(PathBuf::from("./fixture/test.happ")); let original_bundle = app_bundle_source.resolve().await.unwrap(); let manifest = AppManifestV1 { - membrane_proofs_deferred: true, + allow_deferred_memproofs: true, description: None, name: "".to_string(), roles: original_bundle.manifest().app_roles(), @@ -277,8 +280,9 @@ async fn deferred_memproof_installation() { .install_app(InstallAppPayload { agent_key: agent_key.clone(), installed_app_id: Some(app_id.clone()), - membrane_proofs: HashMap::new(), + membrane_proofs: None, network_seed: None, + existing_cells: HashMap::new(), source: AppBundleSource::Bundle(app_bundle_deferred_memproofs), ignore_genesis_failure: false, }) diff --git a/tests/clone_cell.rs b/tests/clone_cell.rs index fba7beb..f029c34 100644 --- a/tests/clone_cell.rs +++ b/tests/clone_cell.rs @@ -33,8 +33,9 @@ async fn clone_cell_management() { .install_app(InstallAppPayload { agent_key: agent_key.clone(), installed_app_id: Some(app_id.clone()), - membrane_proofs: HashMap::new(), + membrane_proofs: None, network_seed: None, + existing_cells: HashMap::new(), source: AppBundleSource::Path(PathBuf::from("./fixture/test.happ")), ignore_genesis_failure: false, }) @@ -187,8 +188,9 @@ pub async fn app_info_refresh() { .install_app(InstallAppPayload { agent_key: agent_key.clone(), installed_app_id: Some(app_id.clone()), - membrane_proofs: HashMap::new(), + membrane_proofs: None, network_seed: None, + existing_cells: HashMap::new(), source: AppBundleSource::Path(PathBuf::from("./fixture/test.happ")), ignore_genesis_failure: false, }) From 2e9ca43a5f60423ed3fdd634e74d5ee084cc8bf2 Mon Sep 17 00:00:00 2001 From: ThetaSinner Date: Thu, 15 Aug 2024 20:55:29 +0100 Subject: [PATCH 3/3] Prepare release --- CHANGELOG.md | 4 ++++ Cargo.lock | 2 +- Cargo.toml | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1759f40..83e43c0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### Fixed ### Removed +## 2024-08-15: v0.6.0-dev.4 +### Changed +- Uninstall app now has a `force` parameter. Please check Holochain documentation before setting this field to `true`! + ## 2024-07-16: v0.6.0-dev.3 ### Added - New value `NotStartedAfterProvidingMemproofs` for type `DisabledAppReason` which effectively allows a new app status, corresponding to the specific state where a UI has just called AppRequest::ProvideMemproofs, but the app has not yet been enabled for the first time. diff --git a/Cargo.lock b/Cargo.lock index 79a235b..65d74b0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2612,7 +2612,7 @@ dependencies = [ [[package]] name = "holochain_client" -version = "0.6.0-dev.3" +version = "0.6.0-dev.4" dependencies = [ "again", "anyhow", diff --git a/Cargo.toml b/Cargo.toml index 930391a..b534858 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,7 +9,7 @@ name = "holochain_client" readme = "README.md" repository = "https://github.com/holochain/holochain-client-rust" resolver = "2" -version = "0.6.0-dev.3" +version = "0.6.0-dev.4" [workspace] members = ["fixture/zomes/foo"]