Simplify the examples using the builder, while still publicly using the router API

Author: rklaehn

examples/custom-protocol.rs

@@ -51,10 +51,7 @@ use iroh::{
     router::ProtocolHandler,
 };
 use iroh_base::hash::Hash;
-use iroh_blobs::{
-    downloader::Downloader, net_protocol::Blobs, rpc::client::blobs::MemClient,
-    util::local_pool::LocalPool,
-};
+use iroh_blobs::{net_protocol::Blobs, rpc::client::blobs::MemClient, util::local_pool::LocalPool};
 use tracing_subscriber::{prelude::*, EnvFilter};
 
 #[derive(Debug, Parser)]
@@ -93,21 +90,9 @@ async fn main() -> Result<()> {
     // Build a in-memory node. For production code, you'd want a persistent node instead usually.
     let mut builder = iroh::node::Node::memory().build().await?;
     let local_pool = LocalPool::default();
-    let store = iroh_blobs::store::mem::Store::new();
-    let downloader = Downloader::new(
-        store.clone(),
-        builder.endpoint().clone(),
-        local_pool.handle().clone(),
-    );
-    let blobs = Arc::new(Blobs::new(
-        store,
-        local_pool.handle().clone(),
-        Default::default(),
-        downloader,
-        builder.endpoint().clone(),
-    ));
-    let blobs_client = blobs.clone().client();
-    builder = builder.accept(iroh_blobs::protocol::ALPN.to_vec(), blobs);
+    let blobs = Blobs::memory().build(&local_pool.handle(), builder.endpoint());
+    builder = builder.accept(iroh_blobs::protocol::ALPN.to_vec(), blobs.clone());
+    let blobs_client = blobs.client();
 
     // Build our custom protocol handler. The `builder` exposes access to various subsystems in the
     // iroh node. In our case, we need a blobs client and the endpoint.

examples/hello-world-fetch.rs

@@ -3,13 +3,11 @@
 //!
 //! This is using an in memory database and a random node id.
 //! Run the `provide` example, which will give you instructions on how to run this example.
-use std::{env, str::FromStr, sync::Arc};
+use std::{env, str::FromStr};
 
 use anyhow::{bail, ensure, Context, Result};
 use iroh::base::ticket::BlobTicket;
-use iroh_blobs::{
-    downloader::Downloader, net_protocol::Blobs, util::local_pool::LocalPool, BlobFormat,
-};
+use iroh_blobs::{net_protocol::Blobs, util::local_pool::LocalPool, BlobFormat};
 use tracing_subscriber::{prelude::*, EnvFilter};
 
 // set the RUST_LOG env var to one of {debug,info,warn} to see logging info
@@ -39,22 +37,10 @@ async fn main() -> Result<()> {
     // create a new node
     let mut builder = iroh::node::Node::memory().build().await?;
     let local_pool = LocalPool::default();
-    let store = iroh_blobs::store::mem::Store::new();
-    let downloader = Downloader::new(
-        store.clone(),
-        builder.endpoint().clone(),
-        local_pool.handle().clone(),
-    );
-    let blobs = Arc::new(Blobs::new(
-        store,
-        local_pool.handle().clone(),
-        Default::default(),
-        downloader,
-        builder.endpoint().clone(),
-    ));
-    let blobs_client = blobs.clone().client();
-    builder = builder.accept(iroh_blobs::protocol::ALPN.to_vec(), blobs);
+    let blobs = Blobs::memory().build(&local_pool.handle(), builder.endpoint());
+    builder = builder.accept(iroh_blobs::protocol::ALPN.to_vec(), blobs.clone());
     let node = builder.spawn().await?;
+    let blobs_client = blobs.client();
 
     println!("fetching hash:  {}", ticket.hash());
     println!("node id:        {}", node.node_id());

examples/local-swarm-discovery.rs

@@ -5,7 +5,7 @@
 //! Wait for output that looks like the following:
 //!  $ cargo run --example local_swarm_discovery --features="discovery-local-network" -- connect [NODE_ID] [HASH] -o [FILE_PATH]
 //! Run that command on another machine in the same local network, replacing [FILE_PATH] to the path on which you want to save the transferred content.
-use std::{path::PathBuf, sync::Arc};
+use std::path::PathBuf;
 
 use anyhow::ensure;
 use clap::{Parser, Subcommand};
@@ -15,8 +15,7 @@ use iroh::{
     node::DiscoveryConfig,
 };
 use iroh_blobs::{
-    downloader::Downloader, net_protocol::Blobs, rpc::client::blobs::WrapOption,
-    util::local_pool::LocalPool,
+    net_protocol::Blobs, rpc::client::blobs::WrapOption, util::local_pool::LocalPool,
 };
 use tracing_subscriber::{prelude::*, EnvFilter};
 
@@ -76,22 +75,10 @@ async fn main() -> anyhow::Result<()> {
         .build()
         .await?;
     let local_pool = LocalPool::default();
-    let store = iroh_blobs::store::mem::Store::new();
-    let downloader = Downloader::new(
-        store.clone(),
-        builder.endpoint().clone(),
-        local_pool.handle().clone(),
-    );
-    let blobs = Arc::new(Blobs::new(
-        store,
-        local_pool.handle().clone(),
-        Default::default(),
-        downloader,
-        builder.endpoint().clone(),
-    ));
-    let blobs_client = blobs.clone().client();
-    builder = builder.accept(iroh_blobs::protocol::ALPN.to_vec(), blobs);
+    let blobs = Blobs::memory().build(&local_pool.handle(), builder.endpoint());
+    builder = builder.accept(iroh_blobs::ALPN.to_vec(), blobs.clone());
     let node = builder.spawn().await?;
+    let blobs_client = blobs.client();
 
     match &cli.command {
         Commands::Accept { path } => {