more moving stuff around

Author: rklaehn

src/downloader2.rs

@@ -207,17 +207,6 @@ pub enum BitfieldPeer {
     Remote(NodeId),
 }
 
-fn total_chunks(chunks: &ChunkRanges) -> Option<u64> {
-    let mut total = 0;
-    for range in chunks.iter() {
-        match range {
-            RangeSetRange::RangeFrom(_range) => return None,
-            RangeSetRange::Range(range) => total += range.end.0 - range.start.0,
-        }
-    }
-    Some(total)
-}
-
 /// A downloader that allows range downloads and downloads from multiple peers.
 #[derive(Debug, Clone)]
 pub struct Downloader {
@@ -361,18 +350,6 @@ impl Downloader {
     }
 }
 
-/// An user-facing command
-#[derive(Debug)]
-pub(super) enum UserCommand {
-    Download {
-        request: DownloadRequest,
-        done: tokio::sync::oneshot::Sender<()>,
-    },
-    Observe {
-        request: ObserveRequest,
-        send: tokio::sync::mpsc::Sender<ObserveEvent>,
-    },
-}
 /// A simple static content discovery mechanism
 #[derive(Debug)]
 pub struct StaticContentDiscovery {

src/downloader2/actor.rs

@@ -1,5 +1,19 @@
+//! The actor for the downloader
 use super::*;
 
+/// An user-facing command
+#[derive(Debug)]
+pub(super) enum UserCommand {
+    Download {
+        request: DownloadRequest,
+        done: tokio::sync::oneshot::Sender<()>,
+    },
+    Observe {
+        request: ObserveRequest,
+        send: tokio::sync::mpsc::Sender<ObserveEvent>,
+    },
+}
+
 pub(super) struct DownloaderActor<S> {
     local_pool: LocalPool,
     endpoint: Endpoint,

src/downloader2/state.rs

@@ -1,4 +1,9 @@
-//! The state machine for the downloader
+//! The state machine for the downloader, as well as the commands and events.
+//!
+//! In addition to the state machine, there are also some structs encapsulating
+//! a part of the state. These are at this point just wrappers around a single
+//! map, but can be made more efficient later if needed without breaking the
+//! interface.
 use super::*;
 
 #[derive(Debug)]
@@ -888,6 +893,17 @@ impl PeerBlobState {
     }
 }
 
+fn total_chunks(chunks: &ChunkRanges) -> Option<u64> {
+    let mut total = 0;
+    for range in chunks.iter() {
+        match range {
+            RangeSetRange::RangeFrom(_range) => return None,
+            RangeSetRange::Range(range) => total += range.end.0 - range.start.0,
+        }
+    }
+    Some(total)
+}
+
 #[cfg(test)]
 mod tests {