WIP 0.6.0

Author: ddd-mtl

dna/zomes/files/src/attach_to_hrl.rs

@@ -34,7 +34,7 @@ pub fn get_files_from_hrl(hrl: (DnaHash, EntryHash)) -> ExternResult<Vec<EntryHa
    std::panic::set_hook(Box::new(zome_panic_hook));
    let tp = hrl_path(hrl)?;
    /// Grab links
-   let links = get_links(link_input(tp.path_entry_hash()?, FilesLinkTypes::Attachment, None))?;
+   let links = get_links(LinkQuery::new(tp.path_entry_hash()?, FilesLinkTypes::Attachment.try_into_filter().unwrap()), GetStrategy::Network)?;
    let res = links
       .into_iter()
       .map(|link| link.target.into_entry_hash().unwrap())

dna/zomes/tagging/src/private.rs

@@ -153,7 +153,7 @@ fn untag_private_entry(input: UntagInput) -> ExternResult<()> {
    let tag_eh = hash_entry(PrivateTag { value: input.tag })?;
    /// Get Tag link
    let link_tuples =
-      get_typed_from_links::<PrivateTag>(link_input(input.target.clone(), TaggingLinkTypes::PrivateTags, None))?;
+      get_typed_from_links::<PrivateTag>(link_input(input.target.clone(), TaggingLinkTypes::PrivateTags.try_into_filter().unwrap(), None))?;
    let link_tuple: Vec<(PrivateTag, Link)> = link_tuples
       .into_iter()
       .filter(|(tag_entry, _link)| {
@@ -167,10 +167,10 @@ fn untag_private_entry(input: UntagInput) -> ExternResult<()> {
    let link = link_tuple[0].1.clone();
 
    /// Delete Entry -> Tag Link
-   let _ = delete_link(link.create_link_hash)?;
+   let _ = delete_link(link.create_link_hash, GetOptions::default())?;
    /// Get reverse link
    let tag_eh = hash_entry(link_tuple[0].0.clone())?;
-   let links = get_links(link_input(tag_eh, TaggingLinkTypes::PrivateEntry, None))?;
+   let links = get_links(link_input(tag_eh, TaggingLinkTypes::PrivateEntry.try_into_filter().unwrap(), None), GetStrategy::Network)?;
    let link: Vec<Link> = links
       .into_iter()
       .filter(|link| link.target.clone().into_entry_hash() == Some(input.target.clone()))
@@ -179,7 +179,7 @@ fn untag_private_entry(input: UntagInput) -> ExternResult<()> {
       return error("No reverse link found for private entry tag");
    }
    /// Delete Tag Link -> Entry
-   let _ = delete_link(link[0].clone().create_link_hash)?;
+   let _ = delete_link(link[0].clone().create_link_hash, GetOptions::default())?;
    /// Done
    Ok(())
 }
@@ -191,7 +191,7 @@ pub fn find_private_tags_for_entry(eh: EntryHash) -> ExternResult<Vec<(EntryHash
    /// Make sure entry exist and is private
    let _record = query_private_entry(eh.clone())?;
    /// Grab private tags
-   let link_tuples = get_typed_from_links::<PrivateTag>(link_input(eh, TaggingLinkTypes::PrivateTags, None))?;
+   let link_tuples = get_typed_from_links::<PrivateTag>(LinkQuery::new(eh, TaggingLinkTypes::PrivateTags.try_into_filter().unwrap()))?;
    let res = link_tuples
       .clone()
       .into_iter()
@@ -213,7 +213,7 @@ pub fn find_private_entries_with_tag(tag: String) -> ExternResult<Vec<(EntryHash
    for tuple in private_tags {
       if tuple.2 == tag {
          /// Found: grab links
-         let links = get_links(link_input(tuple.0, TaggingLinkTypes::PrivateEntry, None))?;
+         let links = get_links(link_input(tuple.0, TaggingLinkTypes::PrivateEntry.try_into_filter().unwrap(), None), GetStrategy::Network)?;
          let res = links
             .clone()
             .into_iter()

dna/zomes/tagging/src/public.rs

@@ -120,7 +120,7 @@ pub fn find_public_tags_for_entry(eh: EntryHash) -> ExternResult<Vec<String>> {
    /// Make sure entry exist and is public
    let _ = fetch_public_entry(eh.clone())?;
    /// Grab public tags
-   let link_details = get_link_details(eh, TaggingLinkTypes::PublicTags, None, GetOptions::network())?;
+   let link_details = get_links_details(LinkQuery::new(eh, TaggingLinkTypes::PublicTags.try_into_filter().unwrap()), GetStrategy::Network)?;
    let create_links: Vec<Link> = link_details
       .into_inner()
       .into_iter()
@@ -151,11 +151,11 @@ pub fn find_public_entries_with_tag(tag: String) -> ExternResult<Vec<(ActionHash
    let mut tp = root_path()?;
    tp.path.append_component(tag.clone().into());
    /// Grab entries
-   let link_details = get_link_details(
+   let link_details = get_links_details(LinkQuery::new(
       tp.path_entry_hash()?,
-      TaggingLinkTypes::PublicEntry,
-      None,
-      GetOptions::network(),
+      TaggingLinkTypes::PublicEntry.try_into_filter().unwrap(),
+   ),
+      GetStrategy::Network,
    )?;
    let mut create_links = Vec::new();
    let mut delete_links = Vec::new();
@@ -247,9 +247,9 @@ fn untag_public_entry(link_ah: ActionHash) -> ExternResult<ActionHash> {
    /// Grab reverse link
    let links = get_links(link_input(
       create_link.target_address.clone(),
-      TaggingLinkTypes::PublicTags,
+      TaggingLinkTypes::PublicTags.try_into_filter().unwrap(),
       None,
-   ))?;
+   ), GetStrategy::Network)?;
    let mut maybe_reverse_link_ah = None;
    debug!(
       "untag_public_entry() reverse links: {:?} | target: {}",