Merge branch 'hc-0.2-into-develop' into add-holo-and-hello-world-hc-0.2

holochain · Sep 25, 2023 · 1a06907 · 1a06907
2 parents 162ded7 + f12dab7
commit 1a06907
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/.github/actions/extend-space/action.yaml b/.github/actions/extend-space/action.yaml
@@ -1,6 +1,5 @@
 # Extends disk space on github hosted runners
 
-
 name: "Extend space"
 description: "Teases out as much free space as possible"
 

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -15,7 +15,6 @@ jobs:
 
       - name: Extend space
         uses: ./.github/actions/extend-space
-
       - name: Install nix
         uses: cachix/install-nix-action@v23
         with:

diff --git a/templates/vanilla/example/Cargo.toml.hbs b/templates/vanilla/example/Cargo.toml.hbs
@@ -8,9 +8,10 @@ opt-level = "z"
 members = ["dnas/*/zomes/coordinator/*", "dnas/*/zomes/integrity/*"]
 
 [workspace.dependencies]
-hdi = "=0.2.1"
-hdk = "=0.1.1"
-serde = "1"
+hdi = "=0.3.1"
+hdk = "=0.2.1"
+holochain_integrity_types = "=0.1.2"
+serde = "=1.0.166"
 
 [workspace.dependencies.hello_world]
 path = "dnas/hello_world/zomes/coordinator/hello_world"

diff --git a/templates/vanilla/example/dnas/hello_world/zomes/coordinator/hello_world/src/lib.rs.hbs b/templates/vanilla/example/dnas/hello_world/zomes/coordinator/hello_world/src/lib.rs.hbs
@@ -32,11 +32,11 @@ pub fn get_hellos(_: ()) -> ExternResult<Vec<HelloOutput>> {
     let links = get_links(path.path_entry_hash()?, LinkTypes::AllHellos, None)?;
     let get_input: Vec<GetInput> = links
         .into_iter()
-        .map(|link| GetInput::new(
-            ActionHash::from(link.target).into(),
+        .map(|link| Ok(GetInput::new(
+            link.target.into_action_hash().ok_or(wasm_error!(WasmErrorInner::Guest(String::from("No action hash associated with link"))))?.into(),
             GetOptions::default(),
-        ))
-        .collect();
+        )))
+        .collect::<ExternResult<Vec<GetInput>>>()?;
 
     // load the records for all the links
     let records = HDK.with(|hdk| hdk.borrow().get(get_input))?;