diff --git a/Cargo.lock b/Cargo.lock index fbe1a699..f1dee5d3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2006,9 +2006,9 @@ dependencies = [ [[package]] name = "holochain" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eefbd616e9d453069b1a480921e23e8f6ab506f6aed9d2d4d666e1b1212a22f" +checksum = "2ec4017d1b3d07503f7a17b2df428acd87c19c318b26c3f6560eabc3b45d6cc4" dependencies = [ "anyhow", "async-recursion", diff --git a/dnas/mewsfeed/coordinator_zomes/mews/Cargo.toml b/dnas/mewsfeed/coordinator_zomes/mews/Cargo.toml index 040c8c24..d5073046 100644 --- a/dnas/mewsfeed/coordinator_zomes/mews/Cargo.toml +++ b/dnas/mewsfeed/coordinator_zomes/mews/Cargo.toml @@ -19,7 +19,8 @@ hdk = {version = "=0.1.2", features = ["encoding"]} itertools = "0.10" [dev-dependencies] -holochain = { version = "=0.1.3", default-features = false, features = [ "test_utils" ] } +holochain = { version = "=0.1.4", default-features = false, features = [ "test_utils" ] } +# holochain = { git = "https://github.com/holochain/holochain.git", package = "holochain_wasm_test_utils", tag = "holochain-0.1.4" } tokio = { version = "1.3", features = ["full"] } futures = { version = "0.3.1", default-features = false } serial_test = "*" diff --git a/dnas/mewsfeed/coordinator_zomes/mews/tests/mews_tests.rs b/dnas/mewsfeed/coordinator_zomes/mews/tests/mews_tests.rs index 4d581e30..0b5f9585 100644 --- a/dnas/mewsfeed/coordinator_zomes/mews/tests/mews_tests.rs +++ b/dnas/mewsfeed/coordinator_zomes/mews/tests/mews_tests.rs @@ -9,7 +9,7 @@ use holochain::test_utils::consistency_10s; use mews_integrity::*; // for the types -const DNA_FILEPATH: &str = "../../workdir/clutter.dna"; +const DNA_FILEPATH: &str = "../../workdir/mewsfeed.dna"; const ZOME_NAME: &str = "mews"; #[tokio::test(flavor = "multi_thread")] diff --git a/flake.nix b/flake.nix index 4e1fb3d9..26a0779b 100644 --- a/flake.nix +++ b/flake.nix @@ -18,7 +18,8 @@ packages = with pkgs; [ # add further packages from nixpkgs cargo-watch - nodejs + nodejs-18_x + sqlite # temporary workaround, should be fixed in holochain-0.1.5 ]; }; }; diff --git a/package.json b/package.json index 6e19c168..5a5f4b94 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,8 @@ "cargo:clippy": "cargo clippy --all-targets --all-features -- -D warnings", "cargo:clippy:watch": "cargo watch --clear -- npm run cargo:clippy", "cargo:fmt": "cargo fmt", - "cargo:fmt:check": "cargo fmt --check" + "cargo:fmt:check": "cargo fmt --check", + "checks": "npm run cargo:fmt && npm run cargo:clippy && npm run lint" }, "devDependencies": { "@holochain-playground/cli": "^0.1.0", diff --git a/ui/src/components/TrustGraphWrapper.vue b/ui/src/components/TrustGraphWrapper.vue index 2ee7c341..dafc4812 100644 --- a/ui/src/components/TrustGraphWrapper.vue +++ b/ui/src/components/TrustGraphWrapper.vue @@ -1,26 +1,23 @@