Skip to content

Commit 7eb3a04

Browse files
authored
Merge pull request #77 from kinode-dao/v0.8
develop 0.8
2 parents ed30ff5 + 12de1dc commit 7eb3a04

File tree

8 files changed

+14
-13
lines changed

8 files changed

+14
-13
lines changed

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
[submodule "kinode-wit"]
22
path = kinode-wit
33
url = https://github.com/uqbar-dao/kinode-wit.git
4-
branch = master
4+
branch = v0.8

Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "kinode_process_lib"
33
description = "A library for writing Kinode processes in Rust."
4-
version = "0.7.1"
4+
version = "0.8.0"
55
edition = "2021"
66
license-file = "LICENSE"
77
homepage = "https://kinode.org"

kinode-wit

src/kernel_types.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ pub struct Erc721Properties {
239239
pub code_hashes: HashMap<String, String>,
240240
pub license: Option<String>,
241241
pub screenshots: Option<Vec<String>>,
242-
pub wit_version: Option<(u32, u32, u32)>,
242+
pub wit_version: Option<u32>,
243243
pub dependencies: Option<Vec<String>>,
244244
}
245245

@@ -417,6 +417,7 @@ pub fn en_wit_message(message: Message) -> wit::Message {
417417
pub fn en_wit_send_error(error: SendError) -> wit::SendError {
418418
wit::SendError {
419419
kind: en_wit_send_error_kind(error.kind),
420+
target: en_wit_address(error.target),
420421
message: en_wit_message(error.message),
421422
lazy_load_blob: en_wit_blob(error.lazy_load_blob),
422423
}

src/lib.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,8 @@ pub fn await_message() -> Result<Message, SendError> {
107107
crate::kinode::process::standard::SendErrorKind::Offline => SendErrorKind::Offline,
108108
crate::kinode::process::standard::SendErrorKind::Timeout => SendErrorKind::Timeout,
109109
},
110-
message: wit_message_to_message(
111-
Address::new("our", ProcessId::new(Some("net"), "distro", "sys")),
112-
send_err.message,
113-
),
110+
target: send_err.target.clone(),
111+
message: wit_message_to_message(send_err.target, send_err.message),
114112
lazy_load_blob: send_err.lazy_load_blob,
115113
context,
116114
}),

src/types/message.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ impl SendErrorKind {
108108
#[derive(Debug, Clone)]
109109
pub struct SendError {
110110
pub kind: SendErrorKind,
111+
pub target: Address,
111112
pub message: Message,
112113
pub lazy_load_blob: Option<LazyLoadBlob>,
113114
pub context: Option<Vec<u8>>,
@@ -117,6 +118,9 @@ impl SendError {
117118
pub fn kind(&self) -> &SendErrorKind {
118119
&self.kind
119120
}
121+
pub fn target(&self) -> &Address {
122+
&self.target
123+
}
120124
pub fn message(&self) -> &Message {
121125
&self.message
122126
}

src/types/request.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -284,10 +284,8 @@ impl Request {
284284
SendErrorKind::Timeout
285285
}
286286
},
287-
message: wit_message_to_message(
288-
Address::new("our", ProcessId::new(Some("net"), "distro", "sys")),
289-
send_err.message,
290-
),
287+
target: send_err.target.clone(),
288+
message: wit_message_to_message(send_err.target, send_err.message),
291289
lazy_load_blob: send_err.lazy_load_blob,
292290
context: None,
293291
})),

0 commit comments

Comments
 (0)