update to current weave

lightningrodlabs · Apr 10, 2024 · 9037692 · 9037692
1 parent f7a4410
commit 9037692
Show file tree

Hide file tree

Showing 20 changed files with 1,065 additions and 326 deletions.
diff --git a/dnas/converge/zomes/coordinator/converge/src/lib.rs b/dnas/converge/zomes/coordinator/converge/src/lib.rs
@@ -48,6 +48,7 @@ pub fn init(_: ()) -> ExternResult<InitCallbackResult> {
 pub struct ActivityPayload {
     deliberation_hash: ActionHash,
     message: String,
+    title: String,
 }
 #[hdk_extern]
 pub fn new_activity_sender(data: ActivityPayload) -> ExternResult<InitCallbackResult> {
@@ -66,16 +67,17 @@ pub fn new_activity_sender(data: ActivityPayload) -> ExternResult<InitCallbackRe
             debug!("all_agents: {:?}", all_agents);
             for agent in all_agents {
                 if agent != agent_info()?.agent_latest_pubkey.into() {
-                    // let zome_call_response = call_remote(
-                    //     agent.clone(),
-                    //     "converge",
-                    //     FunctionName(String::from("new_activity_receiver")),
-                    //     None,
-                    //     data.clone(),
-                    // )?;
-                    let zome_call_response = send_remote_signal(
-                        ExternIO::encode(data.clone()).unwrap(), vec![agent.clone()]
+                    let zome_call_response = call_remote(
+                        agent.clone(),
+                        "converge",
+                        FunctionName(String::from("new_activity_receiver")),
+                        None,
+                        data.clone(),
                     )?;
+                    // let zome_call_response = send_remote_signal(
+                    //     ExternIO::encode(data.clone()).unwrap(), 
+                    //     vec![agent.clone()]
+                    // )?;
                     debug!("zome_call_response: {:?}", zome_call_response);
                 }
             }

diff --git a/dnas/converge/zomes/integrity/converge/src/deliberation.rs b/dnas/converge/zomes/integrity/converge/src/deliberation.rs
@@ -1,18 +1,12 @@
 use hdi::prelude::{holo_hash::HoloHashB64, *};
 #[hdk_entry_helper]
 #[derive(Clone, PartialEq)]
-pub struct HrlB64WithContext {
-    pub hrl: String,
-    pub context: Option<String>,
-}
-#[hdk_entry_helper]
-#[derive(Clone, PartialEq)]
 pub struct Deliberation {
     pub title: String,
     pub description: String,
     pub settings: String,
-    pub attachments: Option<Vec<HrlB64WithContext>>,
-    pub discussion: Option<HrlB64WithContext>,
+    pub attachments: Option<Vec<String>>,
+    pub discussion: Option<String>,
 }
 pub fn validate_create_deliberation(
     _action: EntryCreationAction,

diff --git a/dnas/converge/zomes/integrity/converge/src/proposal.rs b/dnas/converge/zomes/integrity/converge/src/proposal.rs
@@ -1,16 +1,10 @@
 use hdi::prelude::*;
 #[hdk_entry_helper]
 #[derive(Clone, PartialEq)]
-pub struct HrlB64WithContext {
-    pub hrl: String,
-    pub context: Option<String>,
-}
-#[hdk_entry_helper]
-#[derive(Clone, PartialEq)]
 pub struct Proposal {
     pub title: String,
     pub description: String,
-    pub attachments: Option<Vec<HrlB64WithContext>>,
+    pub attachments: Option<Vec<String>>,
 }
 pub fn validate_create_proposal(
     _action: EntryCreationAction,