Skip to content

Commit 6b13c0b

Browse files
committed
Update to hc 0.0.123
1 parent 3666f90 commit 6b13c0b

24 files changed

+4858
-4246
lines changed

Cargo.lock

Lines changed: 23 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

default.nix

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
{
2-
holonixPath ? builtins.fetchTarball { url = "https://github.com/holochain/holonix/archive/ccbed64b383ba57cc716797669ce92df3905117c.tar.gz"; }
3-
}:
4-
51
let
6-
holonix = import (holonixPath) { };
2+
holonixRev = "c72cfede8d1e673fdbd5f1b6e908fa3086f56e8d";
3+
holonixPath = builtins.fetchTarball "https://github.com/holochain/holonix/archive/${holonixRev}.tar.gz";
4+
holonix = import (holonixPath) {
5+
holochainVersionId = "v0_0_123";
6+
};
77
nixpkgs = holonix.pkgs;
88
in nixpkgs.mkShell {
99
inputsFrom = [ holonix.main ];
10-
buildInputs = with nixpkgs; [
11-
binaryen
10+
packages = with nixpkgs; [
11+
# Additional packages go here
1212
nodejs-16_x
1313
];
1414
}

dna/zomes/profiles/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ crate-type = ["cdylib", "rlib"]
99
name = "profiles"
1010

1111
[dependencies]
12-
hc_zome_profiles = {git = "https://github.com/holochain-open-dev/profiles", tag = "for-hc-v0.0.115", package = "hc_zome_profiles"}
12+
hc_zome_profiles = {git = "https://github.com/holochain-open-dev/profiles", tag = "for-hc-v0.0.123", package = "hc_zome_profiles"}
1313

14-
hdk = "0.0.115"
15-
holo_hash = "0.0.12"
14+
hdk = "0.0.119"
15+
holo_hash = "0.0.16"

dna/zomes/where/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ chrono = {version = "0.4", features = ['alloc', 'std']}
1313
derive_more = "0.99"
1414
serde = "1.0.123"
1515
thiserror = "1.0.20"
16-
hc_utils = {git = "https://github.com/holochain/hc-utils", branch = "v0.0.115", package = "hc_utils"}
16+
hc_utils = {git = "https://github.com/holochain/hc-utils", branch = "v0.0.123", package = "hc_utils"}
1717
#hc_utils = {git = "https://github.com/ddd-mtl/hc-utils", branch = "develop", package = "hc_utils"}
18-
hdk = "0.0.115"
19-
holo_hash = {version = "0.0.12", features = ["encoding"]}
18+
hdk = "0.0.119"
19+
holo_hash = {version = "0.0.16", features = ["encoding"]}
2020

2121
[dev-dependencies]
2222
#holochain = { git = "https://github.com/holochain/holochain.git", branch = "develop", features = ["test_utils"] }

dna/zomes/where/src/emoji_group.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ fn create_emoji_group(input: EmojiGroup) -> ExternResult<EntryHashB64> {
3030
let eh = hash_entry(input.clone())?;
3131
let path = get_emoji_group_path();
3232
path.ensure()?;
33-
let anchor_hash = path.hash()?;
33+
let anchor_hash = path.path_entry_hash()?;
3434
create_link(anchor_hash, eh.clone(), ())?;
3535
let eh64: EntryHashB64 = eh.clone().into();
3636
// let me = agent_info()?.agent_latest_pubkey.into();
@@ -53,7 +53,7 @@ fn get_emoji_group(input: EntryHashB64) -> ExternResult<Option<EmojiGroup>> {
5353
#[hdk_extern]
5454
fn get_all_emoji_groups(_: ()) -> ExternResult<Vec<EmojiGroupOutput>> {
5555
let path = get_emoji_group_path();
56-
let templates = get_all_inner(path.hash()?)?;
56+
let templates = get_all_inner(path.path_entry_hash()?)?;
5757
Ok(templates)
5858
}
5959

dna/zomes/where/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ fn init(_: ()) -> ExternResult<InitCallbackResult> {
2626
}
2727

2828
entry_defs![
29-
Path::entry_def(),
29+
PathEntry::entry_def(),
3030
svg_marker::SvgMarker::entry_def(),
3131
emoji_group::EmojiGroup::entry_def(),
3232
template::Template::entry_def(),

dna/zomes/where/src/space.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ fn create_space(input: Space) -> ExternResult<EntryHashB64> {
3636
let space_eh = hash_entry(input.clone())?;
3737
let path = get_spaces_path();
3838
path.ensure()?;
39-
let anchor_hash = path.hash()?;
39+
let anchor_hash = path.path_entry_hash()?;
4040
create_link(anchor_hash, space_eh.clone(), ())?;
4141
let eh64: EntryHashB64 = space_eh.clone().into();
4242
// let me = agent_info()?.agent_latest_pubkey.into();
@@ -157,7 +157,7 @@ fn get_visible_spaces(_: ()) -> ExternResult<Vec<SpaceOutput>> {
157157
#[hdk_extern]
158158
fn get_spaces(_: ()) -> ExternResult<Vec<SpaceOutput>> {
159159
let path = get_spaces_path();
160-
let anchor_hash = path.hash()?;
160+
let anchor_hash = path.path_entry_hash()?;
161161
let spaces = get_spaces_inner(anchor_hash)?;
162162
Ok(spaces)
163163
}

dna/zomes/where/src/svg_marker.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ fn create_svg_marker(input: SvgMarker) -> ExternResult<EntryHashB64> {
2929
let eh = hash_entry(input.clone())?;
3030
let path = get_svg_marker_path();
3131
path.ensure()?;
32-
let anchor_hash = path.hash()?;
32+
let anchor_hash = path.path_entry_hash()?;
3333
create_link(anchor_hash, eh.clone(), ())?;
3434
let eh64: EntryHashB64 = eh.clone().into();
3535
// let me = agent_info()?.agent_latest_pubkey.into();
@@ -52,7 +52,7 @@ fn get_svg_marker(input: EntryHashB64) -> ExternResult<Option<SvgMarker>> {
5252
#[hdk_extern]
5353
fn get_svg_markers(_: ()) -> ExternResult<Vec<SvgMarkerOutput>> {
5454
let path = get_svg_marker_path();
55-
let templates = get_inner(path.hash()?)?;
55+
let templates = get_inner(path.path_entry_hash()?)?;
5656
Ok(templates)
5757
}
5858

dna/zomes/where/src/template.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ fn create_template(input: Template) -> ExternResult<EntryHashB64> {
2929
let eh = hash_entry(input.clone())?;
3030
let path = get_templates_path();
3131
path.ensure()?;
32-
let anchor_hash = path.hash()?;
32+
let anchor_hash = path.path_entry_hash()?;
3333
create_link(anchor_hash, eh.clone(), ())?;
3434
let eh64: EntryHashB64 = eh.clone().into();
3535
// let me = agent_info()?.agent_latest_pubkey.into();
@@ -52,7 +52,7 @@ fn get_template(input: EntryHashB64) -> ExternResult<Option<Template>> {
5252
#[hdk_extern]
5353
fn get_templates(_: ()) -> ExternResult<Vec<TemplateOutput>> {
5454
let path = get_templates_path();
55-
let templates = get_templates_inner(path.hash()?)?;
55+
let templates = get_templates_inner(path.path_entry_hash()?)?;
5656
Ok(templates)
5757
}
5858

0 commit comments

Comments
 (0)