uqbar-dao/nectar
1
1
Fork 0
mirror of https://github.com/uqbar-dao/nectar.git synced 2024-12-23 16:43:24 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: don't parse cap params in wit/de_wit

Browse Source
This commit is contained in:
dr-frmr 2024-07-04 17:57:52 +02:00
parent 9c0f1af7e5
commit c95ee099ee
No known key found for this signature in database
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kinode/src/kernel/mod.rs
View File

@ -143,7 +143,7 @@ async fn handle_kernel_request(
// fire an error back // fire an error back
t::KernelMessage::builder() t::KernelMessage::builder()
.id(km.id) .id(km.id)
.source(("our", KERNEL_PROCESS_ID.clone())) .source((our_name, KERNEL_PROCESS_ID.clone()))
.target(km.rsvp.unwrap_or(km.source)) .target(km.rsvp.unwrap_or(km.source))
.message(t::Message::Response(( .message(t::Message::Response((
t::Response { t::Response {
@ -781,6 +781,10 @@ pub async fn kernel(
kernel_message.source.process kernel_message.source.process
) )
).send(&send_to_terminal).await; ).send(&send_to_terminal).await;
t::Printout::new(
0,
format!("their capabilities: {:?}", proc.capabilities)
).send(&send_to_terminal).await;
throw_timeout(&our.name, &senders, kernel_message).await; throw_timeout(&our.name, &senders, kernel_message).await;
continue; continue;
} }

11
lib/src/core.rs
View File

@ -513,7 +513,12 @@ impl Capability {
impl std::fmt::Display for Capability { impl std::fmt::Display for Capability {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
write!(f, "{}({})", self.issuer, self.params) write!(
f,
"{}({})",
self.issuer,
serde_json::from_str::<serde_json::Value>(&self.params).unwrap_or_default()
)
} }
} }
@ -884,7 +889,7 @@ pub fn de_wit_capability(wit: wit::Capability) -> (Capability, Vec<u8>) {
publisher_node: wit.issuer.process.publisher_node, publisher_node: wit.issuer.process.publisher_node,
}, },
}, },
params: serde_json::from_str(&wit.params).unwrap_or_default(), params: wit.params,
}, },
vec![], vec![],
) )
@ -901,7 +906,7 @@ pub fn de_wit_capability_v0(wit: crate::v0::wit::Capability) -> (Capability, Vec
publisher_node: wit.issuer.process.publisher_node, publisher_node: wit.issuer.process.publisher_node,
}, },
}, },
params: serde_json::from_str(&wit.params).unwrap_or_default(), params: wit.params,
}, },
vec![], vec![],
) )