Merge branch 'main' into feat/trustgraph-integration

GeekGene · Sep 18, 2024 · 3c3380e · 3c3380e
2 parents 6326440 + 6550dd5
commit 3c3380e
Show file tree

Hide file tree

Showing 30 changed files with 1,872 additions and 1,057 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -3,12 +3,12 @@ members = ["dnas/*/zomes/coordinator/*", "dnas/*/zomes/integrity/*", "crates/*"]
 resolver = "2"
 
 [workspace.dependencies]
-hdi = "=0.4.1"
-hdk = "=0.3.1"
-serde = "=1.0.197"
+hdi = "=0.4.2"
+hdk = "=0.3.2"
+serde = "1.0"
 paste = "1.0"
 rand = "0.8.5"
-hc_prefix_index = "0.10.0"
+hc_prefix_index = "0.12.0"
 regex = "1.10.3"
 hc_zome_profiles_coordinator = { git = "https://github.com/holochain-open-dev/profiles.git", rev = "a1a487c8d6a8fd9910ba9b3f26e47df0bf0d09ae" }
 hc_zome_profiles_integrity = { git = "https://github.com/holochain-open-dev/profiles.git", rev = "a1a487c8d6a8fd9910ba9b3f26e47df0bf0d09ae" }

diff --git a/crates/mews_types/src/lib.rs b/crates/mews_types/src/lib.rs
@@ -10,6 +10,7 @@ pub enum LinkTarget {
 }
 
 #[derive(Serialize, Deserialize, SerializedBytes, Debug, Clone, PartialEq, Eq)]
+#[serde(tag = "type", content = "original_action_hash")]
 pub enum MewType {
     Original,
     Reply(ActionHash),

diff --git a/dnas/mewsfeed/zomes/coordinator/likes/src/liker_to_hashes.rs b/dnas/mewsfeed/zomes/coordinator/likes/src/liker_to_hashes.rs
@@ -94,7 +94,7 @@ pub fn remove_hash_for_liker(input: RemoveHashForLikerInput) -> ExternResult<()>
     let links = get_links(
         GetLinksInputBuilder::try_new(
             input.base_liker.clone(),
-            LinkTypes::HashToLikers.try_into_filter()?,
+            LinkTypes::LikerToHashes.try_into_filter()?,
         )?
         .build(),
     )?;

diff --git a/dnas/mewsfeed/zomes/coordinator/mews/Cargo.toml b/dnas/mewsfeed/zomes/coordinator/mews/Cargo.toml
@@ -11,8 +11,8 @@ name = "mews"
 hdk = { workspace = true }
 serde = { workspace = true }
 regex = { workspace = true }
-mews_integrity = { workspace = true }
-hc_prefix_index = { git = "https://github.com/holochain-open-dev/holochain-prefix-index" }
+mews_integrity = { workspace = true } 
+hc_prefix_index = { workspace = true }
 profiles_integrity = { workspace = true }
 mews_types = { workspace = true }
 rand = { workspace = true }

diff --git a/dnas/mewsfeed/zomes/integrity/mews/Cargo.toml b/dnas/mewsfeed/zomes/integrity/mews/Cargo.toml
@@ -11,5 +11,5 @@ name = "mews_integrity"
 hdi = { workspace = true }
 hdk = { workspace = true }
 serde = { workspace = true }
-hc_prefix_index = { git = "https://github.com/holochain-open-dev/holochain-prefix-index" }
+hc_prefix_index = { workspace = true }
 mews_types = { workspace = true }