Merge pull request paritytech#200 from subspace/farmer-improvements

Farmer improvements

crates/subspace-farmer/Cargo.toml

@@ -20,6 +20,7 @@ async-trait = "0.1.51"
 clap = { version = "3.0.0-beta.5", features = ["color", "derive"] }
 dirs = "4.0.0"
 env_logger = "0.9.0"
+event-listener-primitives = "2.0.1"
 futures = "0.3.13"
 hex = "0.4.3"
 hex-buffer-serde = "0.3.0"
@@ -28,6 +29,7 @@ jsonrpsee = { version = "0.4.1", features = ["client", "macros", "server"] }
 log = "0.4.14"
 lru = "0.6.6"
 parity-scale-codec = "2.3.0"
+parking_lot = "0.11.2"
 rayon = "1.5.1"
 schnorrkel = "0.9.1"
 serde = { version = "1.0.130", features = ["derive"] }

crates/subspace-farmer/src/bin/subspace-farmer/commands/farm.rs

@@ -19,10 +19,20 @@ pub(crate) async fn farm(
     // TODO: This doesn't account for the fact that node can
     // have a completely different history to what farmer expects
     info!("Opening plot");
-    let plot = Plot::open_or_create(&base_directory).await?;
+    let plot_fut = tokio::task::spawn_blocking({
+        let base_directory = base_directory.clone();
+
+        move || Plot::open_or_create(&base_directory)
+    });
+    let plot = plot_fut.await.unwrap()?;
 
     info!("Opening commitments");
-    let commitments = Commitments::new(base_directory.join("commitments").into()).await?;
+    let commitments_fut = tokio::task::spawn_blocking({
+        let path = base_directory.join("commitments");
+
+        move || Commitments::new(path)
+    });
+    let commitments = commitments_fut.await.unwrap()?;
 
     info!("Opening object mapping");
     let object_mappings = tokio::task::spawn_blocking({