nectar->kinode

Author: dr-frmr

.gitmodules

@@ -1,4 +1,4 @@
-[submodule "nectar-wit"]
-	path = nectar-wit
-	url = https://github.com/uqbar-dao/nectar-wit.git
+[submodule "kinode-wit"]
+	path = kinode-wit
+	url = https://github.com/uqbar-dao/kinode-wit.git
 	branch = master

Cargo.lock

@@ -1,5 +1,5 @@
 [package]
-name = "nectar_process_lib"
+name = "kinode_process_lib"
 version = "0.5.0"
 edition = "2021"
 

Cargo.toml

@@ -1,10 +1,10 @@
 # process_lib
 
-Library of functions for more ergonomic Nectar process development.
+Library of functions for more ergonomic kinode process development.
 
 To develop/build:
 ```
-git submodule add https://github.com/uqbar-dao/nectar-wit.git
+git submodule add https://github.com/uqbar-dao/kinode-wit.git
 ```
 
 Docs: (TODO link)

README.md

@@ -329,7 +329,7 @@ where
             local_only,
             cache: true,
         })?)
-        .blob(crate::nectar::process::standard::LazyLoadBlob {
+        .blob(crate::kinode::process::standard::LazyLoadBlob {
             mime: content_type,
             bytes: content,
         })

nectar-wit renamed to kinode-wit

@@ -1,12 +1,12 @@
-use crate::nectar::process::standard as wit;
+use crate::kinode::process::standard as wit;
 use crate::{Address, ProcessId};
 use serde::{Deserialize, Serialize};
 use std::collections::HashSet;
 
 //
 // process-facing kernel types, used for process
 // management and message-passing
-// matches types in nectar.wit
+// matches types in kinode.wit
 //
 
 pub type Context = Vec<u8>;

src/http.rs

@@ -1,7 +1,7 @@
-//! Nectar process standard library for Rust compiled to WASM
-//! Must be used in context of bindings generated by `nectar.wit`.
+//! kinode process standard library for Rust compiled to WASM
+//! Must be used in context of bindings generated by `kinode.wit`.
 //!
-//! This library provides a set of functions for interacting with the Nectar
+//! This library provides a set of functions for interacting with the kinode
 //! kernel interface, which is a WIT file. The types generated by this file
 //! are available in processes via the wit_bindgen macro, if a process needs
 //! to use them directly. However, the most convenient way to do most things
@@ -13,11 +13,11 @@
 //! for applications that want to maximize composability and introspectability.
 //! For blobs, we recommend bincode to serialize and deserialize to bytes.
 //!
-pub use crate::nectar::process::standard::*;
+pub use crate::kinode::process::standard::*;
 use serde::{Deserialize, Serialize};
 
 wit_bindgen::generate!({
-    path: "nectar-wit",
+    path: "kinode-wit",
     world: "lib",
 });
 
@@ -101,8 +101,8 @@ pub fn await_message() -> Result<Message, SendError> {
         Ok((source, message)) => Ok(wit_message_to_message(source, message)),
         Err((send_err, context)) => Err(SendError {
             kind: match send_err.kind {
-                crate::nectar::process::standard::SendErrorKind::Offline => SendErrorKind::Offline,
-                crate::nectar::process::standard::SendErrorKind::Timeout => SendErrorKind::Timeout,
+                crate::kinode::process::standard::SendErrorKind::Offline => SendErrorKind::Offline,
+                crate::kinode::process::standard::SendErrorKind::Timeout => SendErrorKind::Timeout,
             },
             message: wit_message_to_message(
                 Address::new("our", ProcessId::new(Some("net"), "distro", "sys")),
@@ -123,7 +123,7 @@ pub fn spawn(
     grant_capabilities: Vec<ProcessId>,
     public: bool,
 ) -> Result<ProcessId, SpawnError> {
-    crate::nectar::process::standard::spawn(
+    crate::kinode::process::standard::spawn(
         name,
         wasm_path,
         &on_exit._to_standard().map_err(|_e| SpawnError::NameTaken)?,

src/kernel_types.rs

@@ -131,17 +131,17 @@ impl std::error::Error for SendError {
 
 pub fn wit_message_to_message(
     source: Address,
-    message: crate::nectar::process::standard::Message,
+    message: crate::kinode::process::standard::Message,
 ) -> Message {
     match message {
-        crate::nectar::process::standard::Message::Request(req) => Message::Request {
+        crate::kinode::process::standard::Message::Request(req) => Message::Request {
             source,
             expects_response: req.expects_response,
             body: req.body,
             metadata: req.metadata,
             capabilities: req.capabilities,
         },
-        crate::nectar::process::standard::Message::Response((resp, context)) => Message::Response {
+        crate::kinode::process::standard::Message::Response((resp, context)) => Message::Response {
             source,
             body: resp.body,
             metadata: resp.metadata,

src/lib.rs

@@ -10,10 +10,10 @@ pub enum OnExit {
 impl OnExit {
     /// Call the kernel to get the current set OnExit behavior
     pub fn get() -> Self {
-        match crate::nectar::process::standard::get_on_exit() {
-            crate::nectar::process::standard::OnExit::None => OnExit::None,
-            crate::nectar::process::standard::OnExit::Restart => OnExit::Restart,
-            crate::nectar::process::standard::OnExit::Requests(reqs) => {
+        match crate::kinode::process::standard::get_on_exit() {
+            crate::kinode::process::standard::OnExit::None => OnExit::None,
+            crate::kinode::process::standard::OnExit::Restart => OnExit::Restart,
+            crate::kinode::process::standard::OnExit::Requests(reqs) => {
                 let mut requests: Vec<Request> = Vec::with_capacity(reqs.len());
                 for req in reqs {
                     requests.push(Request {
@@ -76,25 +76,25 @@ impl OnExit {
     }
     /// Set the OnExit behavior for this process
     pub fn set(self) -> anyhow::Result<()> {
-        crate::nectar::process::standard::set_on_exit(&self._to_standard()?);
+        crate::kinode::process::standard::set_on_exit(&self._to_standard()?);
         Ok(())
     }
     /// Convert this OnExit to the kernel's OnExit type
-    pub fn _to_standard(self) -> anyhow::Result<crate::nectar::process::standard::OnExit> {
+    pub fn _to_standard(self) -> anyhow::Result<crate::kinode::process::standard::OnExit> {
         match self {
-            OnExit::None => Ok(crate::nectar::process::standard::OnExit::None),
-            OnExit::Restart => Ok(crate::nectar::process::standard::OnExit::Restart),
+            OnExit::None => Ok(crate::kinode::process::standard::OnExit::None),
+            OnExit::Restart => Ok(crate::kinode::process::standard::OnExit::Restart),
             OnExit::Requests(reqs) => {
                 let mut kernel_reqs: Vec<(
                     Address,
-                    nectar::process::standard::Request,
+                    kinode::process::standard::Request,
                     Option<LazyLoadBlob>,
                 )> = Vec::with_capacity(reqs.len());
                 for req in reqs {
                     kernel_reqs.push((
                         req.target
                             .ok_or(anyhow::anyhow!("request without target given"))?,
-                        nectar::process::standard::Request {
+                        kinode::process::standard::Request {
                             inherit: req.inherit,
                             expects_response: None,
                             body: req
@@ -106,7 +106,7 @@ impl OnExit {
                         req.blob,
                     ));
                 }
-                Ok(crate::nectar::process::standard::OnExit::Requests(
+                Ok(crate::kinode::process::standard::OnExit::Requests(
                     kernel_reqs,
                 ))
             }