Merge pull request #38 from lightningrodlabs/hc-123

Update to hc 0.0.123

Author: ddd-mtl

Cargo.lock

@@ -1,14 +1,14 @@
-{
-  holonixPath ?  builtins.fetchTarball { url = "https://github.com/holochain/holonix/archive/ccbed64b383ba57cc716797669ce92df3905117c.tar.gz"; }
-}:
-
 let
-  holonix = import (holonixPath) { };
+  holonixRev = "c72cfede8d1e673fdbd5f1b6e908fa3086f56e8d";
+  holonixPath = builtins.fetchTarball "https://github.com/holochain/holonix/archive/${holonixRev}.tar.gz";
+  holonix = import (holonixPath) {
+    holochainVersionId = "v0_0_123";
+  };
   nixpkgs = holonix.pkgs;
 in nixpkgs.mkShell {
   inputsFrom = [ holonix.main ];
-  buildInputs = with nixpkgs; [
-    binaryen
+  packages = with nixpkgs; [
+    # Additional packages go here
     nodejs-16_x
   ];
 }

default.nix

@@ -9,7 +9,7 @@ crate-type = ["cdylib", "rlib"]
 name = "profiles"
 
 [dependencies]
-hc_zome_profiles = {git = "https://github.com/holochain-open-dev/profiles", tag = "for-hc-v0.0.115", package = "hc_zome_profiles"}
+hc_zome_profiles = {git = "https://github.com/holochain-open-dev/profiles", tag = "for-hc-v0.0.123", package = "hc_zome_profiles"}
 
-hdk = "0.0.115"
-holo_hash = "0.0.12"
+hdk = "0.0.119"
+holo_hash = "0.0.16"

dna/zomes/profiles/Cargo.toml

@@ -13,10 +13,10 @@ chrono = {version = "0.4", features = ['alloc', 'std']}
 derive_more = "0.99"
 serde = "1.0.123"
 thiserror = "1.0.20"
-hc_utils = {git = "https://github.com/holochain/hc-utils", branch = "v0.0.115", package = "hc_utils"}
+hc_utils = {git = "https://github.com/holochain/hc-utils", branch = "v0.0.123", package = "hc_utils"}
 #hc_utils = {git = "https://github.com/ddd-mtl/hc-utils", branch = "develop", package = "hc_utils"}
-hdk = "0.0.115"
-holo_hash = {version = "0.0.12", features = ["encoding"]}
+hdk = "0.0.119"
+holo_hash = {version = "0.0.16", features = ["encoding"]}
 
 [dev-dependencies]
 #holochain = { git = "https://github.com/holochain/holochain.git", branch = "develop", features = ["test_utils"] }

dna/zomes/where/Cargo.toml

@@ -1,4 +1,4 @@
-use hc_utils::*;
+use hc_utils::get_links_and_load_type;
 use holo_hash::EntryHashB64;
 pub use hdk::prelude::*;
 
@@ -30,7 +30,7 @@ fn create_emoji_group(input: EmojiGroup) -> ExternResult<EntryHashB64> {
     let eh = hash_entry(input.clone())?;
     let path = get_emoji_group_path();
     path.ensure()?;
-    let anchor_hash = path.hash()?;
+    let anchor_hash = path.path_entry_hash()?;
     create_link(anchor_hash, eh.clone(), ())?;
     let eh64: EntryHashB64 = eh.clone().into();
     // let me = agent_info()?.agent_latest_pubkey.into();
@@ -53,12 +53,12 @@ fn get_emoji_group(input: EntryHashB64) -> ExternResult<Option<EmojiGroup>> {
 #[hdk_extern]
 fn get_all_emoji_groups(_: ()) -> ExternResult<Vec<EmojiGroupOutput>> {
     let path = get_emoji_group_path();
-    let templates = get_all_inner(path.hash()?)?;
+    let templates = get_all_inner(path.path_entry_hash()?)?;
     Ok(templates)
 }
 
 fn get_all_inner(base: EntryHash) -> WhereResult<Vec<EmojiGroupOutput>> {
-    let entries = get_links_and_load_type(base, None)?;
+    let entries = get_links_and_load_type(base, None, false)?;
     let mut templates = vec![];
     for e in entries {
         templates.push(EmojiGroupOutput {hash: hash_entry(&e)?.into(), content: e});

dna/zomes/where/src/emoji_group.rs

@@ -1,6 +1,5 @@
 use hdk::prelude::*;
-
-use hc_utils::*;
+use hc_utils::get_latest_entry;
 use std::collections::BTreeMap;
 use holo_hash::{EntryHashB64, AgentPubKeyB64, HeaderHashB64};
 

dna/zomes/where/src/here.rs

@@ -26,7 +26,7 @@ fn init(_: ()) -> ExternResult<InitCallbackResult> {
 }
 
 entry_defs![
-    Path::entry_def(),
+    PathEntry::entry_def(),
     svg_marker::SvgMarker::entry_def(),
     emoji_group::EmojiGroup::entry_def(),
     template::Template::entry_def(),

dna/zomes/where/src/lib.rs

@@ -1,5 +1,5 @@
 pub use hdk::prelude::*;
-use hc_utils::*;
+use hc_utils::get_links_and_load_type;
 use std::collections::BTreeMap;
 use holo_hash::EntryHashB64;
 
@@ -36,7 +36,7 @@ fn create_space(input: Space) -> ExternResult<EntryHashB64> {
     let space_eh = hash_entry(input.clone())?;
     let path = get_spaces_path();
     path.ensure()?;
-    let anchor_hash = path.hash()?;
+    let anchor_hash = path.path_entry_hash()?;
     create_link(anchor_hash, space_eh.clone(), ())?;
     let eh64: EntryHashB64 = space_eh.clone().into();
     // let me = agent_info()?.agent_latest_pubkey.into();
@@ -78,7 +78,7 @@ fn create_space_with_sessions(input: SpaceSessionsInput) -> ExternResult<EntryHa
 
 /// Returns 0 if no session found or if space does not exist
 pub fn get_next_session_index(space_eh: EntryHash) -> WhereResult<u32> {
-    let sessions: Vec<PlacementSession> = get_links_and_load_type(space_eh, None)?;
+    let sessions: Vec<PlacementSession> = get_links_and_load_type(space_eh, None, false)?;
     let mut top = 0;
     for session in sessions {
         if session.index >= top {
@@ -157,13 +157,13 @@ fn get_visible_spaces(_: ()) -> ExternResult<Vec<SpaceOutput>> {
 #[hdk_extern]
 fn get_spaces(_: ()) -> ExternResult<Vec<SpaceOutput>> {
     let path = get_spaces_path();
-    let anchor_hash = path.hash()?;
+    let anchor_hash = path.path_entry_hash()?;
     let spaces = get_spaces_inner(anchor_hash)?;
     Ok(spaces)
 }
 
 fn get_spaces_inner(base: EntryHash) -> WhereResult<Vec<SpaceOutput>> {
-    let entries = get_links_and_load_type(base, None)?;
+    let entries = get_links_and_load_type(base, None, false)?;
     let mut spaces = vec![];
     for e in entries {
         spaces.push(SpaceOutput {hash: hash_entry(&e)?.into(), content: e});

dna/zomes/where/src/space.rs

@@ -1,4 +1,4 @@
-use hc_utils::*;
+use hc_utils::get_links_and_load_type;
 use holo_hash::EntryHashB64;
 pub use hdk::prelude::*;
 
@@ -29,7 +29,7 @@ fn create_svg_marker(input: SvgMarker) -> ExternResult<EntryHashB64> {
     let eh = hash_entry(input.clone())?;
     let path = get_svg_marker_path();
     path.ensure()?;
-    let anchor_hash = path.hash()?;
+    let anchor_hash = path.path_entry_hash()?;
     create_link(anchor_hash, eh.clone(), ())?;
     let eh64: EntryHashB64 = eh.clone().into();
     // let me = agent_info()?.agent_latest_pubkey.into();
@@ -52,12 +52,12 @@ fn get_svg_marker(input: EntryHashB64) -> ExternResult<Option<SvgMarker>> {
 #[hdk_extern]
 fn get_svg_markers(_: ()) -> ExternResult<Vec<SvgMarkerOutput>> {
     let path = get_svg_marker_path();
-    let templates = get_inner(path.hash()?)?;
+    let templates = get_inner(path.path_entry_hash()?)?;
     Ok(templates)
 }
 
 fn get_inner(base: EntryHash) -> WhereResult<Vec<SvgMarkerOutput>> {
-    let entries = get_links_and_load_type(base, None)?;
+    let entries = get_links_and_load_type(base, None, false)?;
     let mut templates = vec![];
     for e in entries {
         templates.push(SvgMarkerOutput {hash: hash_entry(&e)?.into(), content: e});

dna/zomes/where/src/svg_marker.rs

@@ -1,4 +1,4 @@
-use hc_utils::*;
+use hc_utils::get_links_and_load_type;
 use holo_hash::EntryHashB64;
 pub use hdk::prelude::*;
 
@@ -29,7 +29,7 @@ fn create_template(input: Template) -> ExternResult<EntryHashB64> {
     let eh = hash_entry(input.clone())?;
     let path = get_templates_path();
     path.ensure()?;
-    let anchor_hash = path.hash()?;
+    let anchor_hash = path.path_entry_hash()?;
     create_link(anchor_hash, eh.clone(), ())?;
     let eh64: EntryHashB64 = eh.clone().into();
     // let me = agent_info()?.agent_latest_pubkey.into();
@@ -52,12 +52,12 @@ fn get_template(input: EntryHashB64) -> ExternResult<Option<Template>> {
 #[hdk_extern]
 fn get_templates(_: ()) -> ExternResult<Vec<TemplateOutput>> {
     let path = get_templates_path();
-    let templates = get_templates_inner(path.hash()?)?;
+    let templates = get_templates_inner(path.path_entry_hash()?)?;
     Ok(templates)
 }
 
 fn get_templates_inner(base: EntryHash) -> WhereResult<Vec<TemplateOutput>> {
-    let entries = get_links_and_load_type(base, None)?;
+    let entries = get_links_and_load_type(base, None, false)?;
     let mut templates = vec![];
     for e in entries {
         templates.push(TemplateOutput {hash: hash_entry(&e)?.into(), content: e});