Update tests

Author: rafal-ch

rust/hermes-ipfs/examples/hermes-ipfs-cli.rs

@@ -1,6 +1,7 @@
 //! Hermes IPFS VFS compatibility
 
 use clap::{Parser, Subcommand};
+use connexa::dummy;
 use hermes_ipfs::{HermesIpfs, HermesIpfsBuilder};
 use lipsum::lipsum;
 use rust_ipfs::IpfsPath;
@@ -44,11 +45,11 @@ async fn main() -> anyhow::Result<()> {
     let args = Cli::parse();
     let base_dir = dirs::data_dir().unwrap_or_else(|| std::path::PathBuf::from("."));
     let ipfs_data_path = base_dir.as_path().join("hermes/ipfs");
-    let builder = HermesIpfsBuilder::new()
+    let builder = HermesIpfsBuilder::<dummy::Behaviour>::new()
         .with_default()
         .set_default_listener()
         // TODO(saibatizoku): Re-Enable default transport config when libp2p Cert bug is fixed
-        .disable_tls()
+        //.enable_secure_websocket()
         .set_disk_storage(ipfs_data_path);
     let hermes_node: HermesIpfs = builder.start().await?.into();
     match args.command {

rust/hermes-ipfs/examples/pubsub.rs

@@ -14,8 +14,8 @@
 //! * The task that reads lines from stdin and publishes them as either node.
 use std::io::Write;
 
-use hermes_ipfs::{pin_mut, FutureExt, HermesIpfs, StreamExt};
-use rust_ipfs::PubsubEvent;
+use futures::{pin_mut, FutureExt, StreamExt};
+use hermes_ipfs::HermesIpfs;
 use rustyline_async::Readline;
 
 #[allow(clippy::indexing_slicing)]
@@ -57,15 +57,11 @@ async fn start_bootstrapped_nodes() -> anyhow::Result<(HermesIpfs, HermesIpfs)>
 /// Main function
 async fn main() -> anyhow::Result<()> {
     let topic = String::from("ipfs-chat");
-    let option_topic = Option::Some(topic.clone());
 
     // Initialize the repo and start a daemon
     let (hermes_a, hermes_b) = start_bootstrapped_nodes().await?;
     let (mut rl, mut stdout) = Readline::new(format!("{} > ", "Write message to publish"))?;
 
-    let mut event_stream = hermes_a.pubsub_events(option_topic.clone()).await?;
-    let mut event_stream_b = hermes_b.pubsub_events(option_topic).await?;
-
     let stream = hermes_a.pubsub_subscribe(topic.clone()).await?;
     let stream_b = hermes_b.pubsub_subscribe(topic.clone()).await?;
 
@@ -79,24 +75,12 @@ async fn main() -> anyhow::Result<()> {
         tokio::select! {
             data = stream.next() => {
                 if let Some(msg) = data {
-                    writeln!(stdout, "NODE A RECV: {}", String::from_utf8_lossy(&msg.data))?;
+                    writeln!(stdout, "NODE A RECV: {:?}", &msg)?;
                 }
             }
             data = stream_b.next() => {
                 if let Some(msg) = data {
-                    writeln!(stdout, "NODE B RECV: {}", String::from_utf8_lossy(&msg.data))?;
-                }
-            }
-            Some(event) = event_stream.next() => {
-                match event {
-                    PubsubEvent::Subscribe { peer_id, topic } => writeln!(stdout, "{peer_id} subscribed to {topic:?}")?,
-                    PubsubEvent::Unsubscribe { peer_id, topic } => writeln!(stdout, "{peer_id} unsubscribed from {topic:?}")?,
-                }
-            }
-            Some(event) = event_stream_b.next() => {
-                match event {
-                    PubsubEvent::Subscribe { peer_id , topic} => writeln!(stdout, "{peer_id} subscribed to {topic:?}")?,
-                    PubsubEvent::Unsubscribe { peer_id, topic } => writeln!(stdout, "{peer_id} unsubscribed from {topic:?}")?,
+                    writeln!(stdout, "NODE B RECV: {:?}", &msg)?;
                 }
             }
             line = rl.readline().fuse() => match line {

rust/hermes-ipfs/examples/put-get-dht.rs

@@ -48,7 +48,8 @@ async fn main() -> anyhow::Result<()> {
     println!("* Hermes IPFS node A is publishing 'my_key' to DHT.");
     hermes_ipfs_a.dht_put(b"my_key", ipfs_file).await?;
     println!("* Hermes IPFS node B is getting 'my_key' from DHT.");
-    let data_retrieved = hermes_ipfs_b.dht_get(b"my_key").await?;
+    let key: Vec<u8> = "my_key".bytes().collect();
+    let data_retrieved = hermes_ipfs_b.dht_get(key).await?;
     let data = String::from_utf8(data_retrieved)?;
     println!("  Got data: {data:?}");
     // Stop the nodes and exit.