fix: examples and tests

Author: Joonas Koivunen

examples/dag_creation.rs

@@ -1,13 +1,14 @@
 use futures::join;
-use ipfs::{make_ipld, Ipfs, IpfsPath, Types, UninitializedIpfs};
+use ipfs::{make_ipld, Ipfs, IpfsOptions, IpfsPath, TestTypes, UninitializedIpfs};
 use tokio::task;
 
 #[tokio::main]
 async fn main() {
     tracing_subscriber::fmt::init();
 
     // Initialize the repo and start a daemon
-    let (ipfs, fut): (Ipfs<Types>, _) = UninitializedIpfs::default().await.start().await.unwrap();
+    let opts = IpfsOptions::inmemory_with_generated_keys();
+    let (ipfs, fut): (Ipfs<TestTypes>, _) = UninitializedIpfs::new(opts).start().await.unwrap();
     task::spawn(fut);
 
     // Create a DAG

examples/fetch_and_cat.rs

@@ -48,11 +48,7 @@ async fn main() {
 
     // UninitializedIpfs will handle starting up the repository and return the facade (ipfs::Ipfs)
     // and the background task (ipfs::IpfsFuture).
-    let (ipfs, fut): (Ipfs<TestTypes>, _) = UninitializedIpfs::new(opts, None)
-        .await
-        .start()
-        .await
-        .unwrap();
+    let (ipfs, fut): (Ipfs<TestTypes>, _) = UninitializedIpfs::new(opts).start().await.unwrap();
 
     // The background task must be spawned to use anything other than the repository; most notably,
     // the libp2p.

http/src/v0.rs

@@ -192,11 +192,8 @@ mod tests {
         use ipfs::{IpfsOptions, UninitializedIpfs};
 
         let options = IpfsOptions::inmemory_with_generated_keys();
-        let (ipfs, _): (Ipfs<TestTypes>, _) = UninitializedIpfs::new(options, None)
-            .await
-            .start()
-            .await
-            .unwrap();
+        let (ipfs, _): (Ipfs<TestTypes>, _) =
+            UninitializedIpfs::new(options).start().await.unwrap();
 
         let (shutdown_tx, _) = tokio::sync::mpsc::channel::<()>(1);
 

http/src/v0/root_files/add.rs

@@ -410,11 +410,7 @@ mod tests {
 
     async fn tokio_ipfs() -> ipfs::Ipfs<ipfs::TestTypes> {
         let options = ipfs::IpfsOptions::inmemory_with_generated_keys();
-        let (ipfs, fut) = ipfs::UninitializedIpfs::new(options, None)
-            .await
-            .start()
-            .await
-            .unwrap();
+        let (ipfs, fut) = ipfs::UninitializedIpfs::new(options).start().await.unwrap();
 
         tokio::spawn(fut);
         ipfs

src/lib.rs

@@ -142,8 +142,9 @@ pub struct IpfsOptions {
     /// Bound listening addresses; by default the node will not listen on any address.
     pub listening_addrs: Vec<Multiaddr>,
 
-    /// The span for tracing purposes.
-    span: Option<Span>,
+    /// The span for tracing purposes. All futures returned by `Ipfs`, background task actions and
+    /// swarm actions are instrumented with this span or spans referring to this as their parent.
+    pub span: Option<Span>,
 }
 
 impl fmt::Debug for IpfsOptions {