skoupidi 1 год назад
Родитель
Сommit
a55471cbcf
3 измененных файлов с 14 добавлено и 14 удалено
  1. 2 2
      bin/genev/genev-cli/src/rpc.rs
  2. 9 9
      bin/genev/genevd/src/main.rs
  3. 3 3
      bin/genev/genevd/src/rpc.rs

+ 2 - 2
bin/genev/genev-cli/src/rpc.rs

@@ -42,7 +42,7 @@ impl Gen {
         let req = JsonRequest::new("add", JsonValue::Array([event].to_vec()));
         let rep = self.rpc_client.request(req).await?;
 
-        debug!("Got reply: {:?}", rep);
+        debug!("Got reply: {rep:?}");
         Ok(())
     }
 
@@ -51,7 +51,7 @@ impl Gen {
         let req = JsonRequest::new("list", JsonValue::Array([].to_vec()));
         let rep = self.rpc_client.request(req).await?;
 
-        debug!("reply: {:?}", rep);
+        debug!("reply: {rep:?}");
 
         let bytes: Vec<u8> = base64::decode(rep.get::<String>().unwrap()).unwrap();
         let events: Vec<GenEvent> = deserialize(&bytes)?;

+ 9 - 9
bin/genev/genevd/src/main.rs

@@ -101,7 +101,7 @@ async fn start_sync_loop(
             continue
         }
 
-        debug!("new event: {:?}", event);
+        debug!("new event: {event:?}");
     }
 }
 
@@ -151,7 +151,7 @@ async fn realmain(settings: Args, executor: Arc<smol::Executor<'static>>) -> Res
     // We'll attempt to sync 5 times
     if !settings.skip_dag_sync {
         for i in 1..=6 {
-            info!("Syncing event DAG (attempt #{})", i);
+            info!("Syncing event DAG (attempt #{i})");
             match event_graph.dag_sync().await {
                 Ok(()) => break,
                 Err(e) => {
@@ -162,7 +162,7 @@ async fn realmain(settings: Args, executor: Arc<smol::Executor<'static>>) -> Res
                     } else {
                         // TODO: Maybe at this point we should prune or something?
                         // TODO: Or maybe just tell the user to delete the DAG from FS.
-                        error!("Failed syncing DAG ({}), retrying in 10s...", e);
+                        error!("Failed syncing DAG ({e}), retrying in 10s...");
                         sleep(10).await;
                     }
                 }
@@ -186,7 +186,7 @@ async fn realmain(settings: Args, executor: Arc<smol::Executor<'static>>) -> Res
         |res| async {
             match res {
                 Ok(()) | Err(Error::DetachedTaskStopped) => { /* Do nothing */ }
-                Err(e) => error!(target: "genevd", "Failed starting sync loop task: {}", e),
+                Err(e) => error!(target: "genevd", "Failed starting sync loop task: {e}"),
             }
         },
         Error::DetachedTaskStopped,
@@ -203,14 +203,14 @@ async fn realmain(settings: Args, executor: Arc<smol::Executor<'static>>) -> Res
             let dnet_sub = p2p_.dnet_subscribe().await;
             loop {
                 let event = dnet_sub.receive().await;
-                debug!("Got dnet event: {:?}", event);
+                debug!("Got dnet event: {event:?}");
                 dnet_sub_.notify(vec![event.into()].into()).await;
             }
         },
         |res| async {
             match res {
                 Ok(()) | Err(Error::DetachedTaskStopped) => { /* Do nothing */ }
-                Err(e) => panic!("{}", e),
+                Err(e) => panic!("{e}"),
             }
         },
         Error::DetachedTaskStopped,
@@ -227,14 +227,14 @@ async fn realmain(settings: Args, executor: Arc<smol::Executor<'static>>) -> Res
             let deg_sub = event_graph_.deg_subscribe().await;
             loop {
                 let event = deg_sub.receive().await;
-                debug!("Got deg event: {:?}", event);
+                debug!("Got deg event: {event:?}");
                 deg_sub_.notify(vec![event.into()].into()).await;
             }
         },
         |res| async {
             match res {
                 Ok(()) | Err(Error::DetachedTaskStopped) => { /* Do nothing */ }
-                Err(e) => panic!("{}", e),
+                Err(e) => panic!("{e}"),
             }
         },
         Error::DetachedTaskStopped,
@@ -258,7 +258,7 @@ async fn realmain(settings: Args, executor: Arc<smol::Executor<'static>>) -> Res
         |res| async move {
             match res {
                 Ok(()) | Err(Error::RpcServerStopped) => rpc_interface_.stop_connections().await,
-                Err(e) => error!(target: "genevd", "Failed starting JSON-RPC server: {}", e),
+                Err(e) => error!(target: "genevd", "Failed starting JSON-RPC server: {e}"),
             }
         },
         Error::RpcServerStopped,

+ 3 - 3
bin/genev/genevd/src/rpc.rs

@@ -209,7 +209,7 @@ impl JsonRpcInterface {
         let event = Event::new(serialize_async(&genevent).await, &self.event_graph).await;
 
         if let Err(e) = self.event_graph.dag_insert(&[event.clone()]).await {
-            error!("Failed inserting new event to DAG: {}", e);
+            error!("Failed inserting new event to DAG: {e}");
         } else {
             // Otherwise, broadcast it
             self.p2p.broadcast(&EventPut(event)).await;
@@ -234,12 +234,12 @@ impl JsonRpcInterface {
             let genevent: GenEvent = match deserialize_async_partial(event.content()).await {
                 Ok((v, _)) => v,
                 Err(e) => {
-                    error!("Failed deserializing incoming event: {}", e);
+                    error!("Failed deserializing incoming event: {e}");
                     continue
                 }
             };
 
-            debug!("Marking event {} as seen", event_id);
+            debug!("Marking event {event_id} as seen");
             seen_events.push(genevent);
         }