remove our as parameter when possible with our() wit fn

Author: dr-frmr

src/http/server.rs

@@ -1,6 +1,6 @@
 use crate::vfs::{FileType, VfsAction, VfsRequest, VfsResponse};
 use crate::{
-    get_blob, last_blob, Address, LazyLoadBlob as KiBlob, Message, Request as KiRequest,
+    get_blob, last_blob, LazyLoadBlob as KiBlob, Message, Request as KiRequest,
     Response as KiResponse,
 };
 pub use http::StatusCode;
@@ -809,11 +809,11 @@ impl HttpServer {
     /// An error will be returned if the file does not exist.
     pub fn serve_file(
         &mut self,
-        our: &Address,
         file_path: &str,
         paths: Vec<&str>,
         config: HttpBindingConfig,
     ) -> Result<(), HttpServerError> {
+        let our = crate::our();
         let _res = KiRequest::to(("our", "vfs", "distro", "sys"))
             .body(
                 serde_json::to_vec(&VfsRequest {
@@ -887,11 +887,11 @@ impl HttpServer {
     /// An error will be returned if the file does not exist.
     pub fn serve_ui(
         &mut self,
-        our: &Address,
         directory: &str,
         roots: Vec<&str>,
         config: HttpBindingConfig,
     ) -> Result<(), HttpServerError> {
+        let our = crate::our();
         let initial_path = format!("{}/pkg/{}", our.package_id(), directory);
 
         let mut queue = std::collections::VecDeque::new();

src/logging.rs

@@ -119,12 +119,12 @@ impl<'a> tracing_subscriber::fmt::MakeWriter<'a> for TerminalWriterMaker {
 /// directory, `package` is the package name, `publisher.os` is the publisher of the
 /// package, and `process` is the process name of the process doing the logging.
 pub fn init_logging(
-    our: &Address,
     file_level: Level,
     terminal_level: Level,
     remote: Option<RemoteLogSettings>,
     terminal_levels_mapping: Option<(u8, u8, u8, u8)>,
 ) -> anyhow::Result<()> {
+    let our = crate::our();
     let log_dir_path = create_drive(our.package_id(), "log", None)?;
     let log_file_path = format!("{log_dir_path}/{}.log", our.process());
     let log_file = open_file(&log_file_path, true, None)?;

src/types/message.rs

@@ -83,7 +83,8 @@ impl Message {
     }
     /// Check if a `Message` was sent by a local process.
     /// Returns `false` if the `source` node is not our local node.
-    pub fn is_local(&self, our: &Address) -> bool {
+    pub fn is_local(&self) -> bool {
+        let our = crate::our();
         match self {
             Message::Request { source, .. } => source.node == our.node,
             Message::Response { source, .. } => source.node == our.node,

src/types/request.rs

@@ -235,9 +235,10 @@ impl Request {
         self
     }
     /// Attach the [`Capability`] to message this process to the next message.
-    pub fn attach_messaging(mut self, our: &Address) -> Self {
+    pub fn attach_messaging(mut self) -> Self {
+        let our = crate::our();
         self.capabilities.extend(vec![Capability {
-            issuer: our.clone(),
+            issuer: our,
             params: "\"messaging\"".to_string(),
         }]);
         self