Skip to content

Commit df1e1ef

Browse files
committed
tests pass
1 parent a78c212 commit df1e1ef

File tree

6 files changed

+261
-143
lines changed

6 files changed

+261
-143
lines changed

examples/random_store.rs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use iroh::{SecretKey, Watcher};
66
use iroh_base::ticket::NodeTicket;
77
use iroh_blobs::{
88
api::downloader::Shuffled,
9-
provider::{AbortReason, Event, EventMask, EventSender2, ProviderMessage},
9+
provider::{AbortReason, EventMask, EventSender2, ProviderMessage},
1010
store::fs::FsStore,
1111
test::{add_hash_sequences, create_random_blobs},
1212
HashAndFormat,
@@ -100,12 +100,7 @@ pub fn get_or_generate_secret_key() -> Result<SecretKey> {
100100
}
101101
}
102102

103-
pub fn dump_provider_events(
104-
allow_push: bool,
105-
) -> (
106-
tokio::task::JoinHandle<()>,
107-
EventSender2,
108-
) {
103+
pub fn dump_provider_events(allow_push: bool) -> (tokio::task::JoinHandle<()>, EventSender2) {
109104
let (tx, mut rx) = mpsc::channel(100);
110105
let dump_task = tokio::spawn(async move {
111106
while let Some(event) = rx.recv().await {

src/api/blobs.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ use super::{
5757
};
5858
use crate::{
5959
api::proto::{BatchRequest, ImportByteStreamUpdate},
60-
provider::{ReaderContext, WriterContext},
60+
provider::WriterContext,
6161
store::IROH_BLOCK_SIZE,
6262
util::temp_tag::TempTag,
6363
BlobFormat, Hash, HashAndFormat,
@@ -1180,9 +1180,6 @@ impl WriteProgress for WriterContext {
11801180
}
11811181

11821182
async fn send_transfer_started(&mut self, index: u64, hash: &Hash, size: u64) {
1183-
self.tracker
1184-
.transfer_started(index, hash, size)
1185-
.await
1186-
.ok();
1183+
self.tracker.transfer_started(index, hash, size).await.ok();
11871184
}
11881185
}

src/net_protocol.rs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,9 @@ use iroh::{
4343
protocol::{AcceptError, ProtocolHandler},
4444
Endpoint, Watcher,
4545
};
46-
use tokio::sync::mpsc;
4746
use tracing::error;
4847

49-
use crate::{
50-
api::Store,
51-
provider::{Event, EventSender2},
52-
ticket::BlobTicket,
53-
HashAndFormat,
54-
};
48+
use crate::{api::Store, provider::EventSender2, ticket::BlobTicket, HashAndFormat};
5549

5650
#[derive(Debug)]
5751
pub(crate) struct BlobsInner {

0 commit comments

Comments
 (0)