Rewrite async methods to return owned futures.

.github/workflows/ci.yml

@@ -34,23 +34,18 @@ jobs:
         components: rustfmt
     - name: Run tests
       run: |
-        cargo check --all-targets --no-default-features --features tokio
-        cargo check --all-targets --no-default-features --features tokio,sparse
-        cargo check --all-targets --no-default-features --features tokio,sparse,cache
-        cargo check --all-targets --no-default-features --features async-std
-        cargo check --all-targets --no-default-features --features async-std,sparse
-        cargo check --all-targets --no-default-features --features async-std,sparse,cache
-        cargo test --no-default-features --features js_interop_tests,tokio
-        cargo test --no-default-features --features js_interop_tests,tokio,shared-core
-        cargo test --no-default-features --features js_interop_tests,tokio,sparse
-        cargo test --no-default-features --features js_interop_tests,tokio,sparse,cache
-        cargo test --no-default-features --features js_interop_tests,async-std
-        cargo test --no-default-features --features js_interop_tests,async-std,shared-core
-        cargo test --no-default-features --features js_interop_tests,async-std,sparse
-        cargo test --no-default-features --features js_interop_tests,async-std,sparse,cache
-        cargo test --benches --no-default-features --features tokio
-        cargo test --benches --no-default-features --features async-std
-
+        cargo check --all-targets
+        cargo check --all-targets --all-features
+        cargo check --all-targets --no-default-features
+        cargo check --all-targets --no-default-features --features sparse
+        cargo check --all-targets --no-default-features --features sparse,cache
+        cargo test
+        cargo test --all-features
+        cargo test --no-default-features
+        cargo test --no-default-features --features js_interop_tests
+        cargo test --no-default-features --features js_interop_tests,sparse
+        cargo test --no-default-features --features js_interop_tests,sparse,cache
+        cargo test --benches --no-default-features
   test-windows:
     runs-on: windows-latest
 
@@ -61,22 +56,17 @@ jobs:
           components: rustfmt
       - name: Run tests
         run: |
-          cargo check --all-targets --no-default-features --features tokio
-          cargo check --all-targets --no-default-features --features tokio,sparse
-          cargo check --all-targets --no-default-features --features tokio,sparse,cache
-          cargo check --all-targets --no-default-features --features async-std
-          cargo check --all-targets --no-default-features --features async-std,sparse
-          cargo check --all-targets --no-default-features --features async-std,sparse,cache
-          cargo test --no-default-features --features tokio
-          cargo test --no-default-features --features tokio,shared-core
-          cargo test --no-default-features --features tokio,sparse
-          cargo test --no-default-features --features tokio,sparse,cache
-          cargo test --no-default-features --features async-std
-          cargo test --no-default-features --features async-std,shared-core
-          cargo test --no-default-features --features async-std,sparse
-          cargo test --no-default-features --features async-std,sparse,cache
-          cargo test --benches --no-default-features --features tokio
-          cargo test --benches --no-default-features --features async-std
+          cargo check --all-targets
+          cargo check --all-targets --all-features
+          cargo check --all-targets --no-default-features
+          cargo check --all-targets --no-default-features --features sparse
+          cargo check --all-targets --no-default-features --features sparse,cache
+          cargo test
+          cargo test --all-features
+          cargo test --no-default-features
+          cargo test --no-default-features --features sparse
+          cargo test --no-default-features --features sparse,cache
+          cargo test --benches --no-default-features
 
   test-macos:
     runs-on: macos-latest
@@ -88,22 +78,18 @@ jobs:
           components: rustfmt
       - name: Run tests
         run: |
-          cargo check --all-targets --no-default-features --features tokio
-          cargo check --all-targets --no-default-features --features tokio,sparse
-          cargo check --all-targets --no-default-features --features tokio,sparse,cache
-          cargo check --all-targets --no-default-features --features async-std
-          cargo check --all-targets --no-default-features --features async-std,sparse
-          cargo check --all-targets --no-default-features --features async-std,sparse,cache
-          cargo test --no-default-features --features js_interop_tests,tokio
-          cargo test --no-default-features --features js_interop_tests,tokio,shared-core
-          cargo test --no-default-features --features js_interop_tests,tokio,sparse
-          cargo test --no-default-features --features js_interop_tests,tokio,sparse,cache
-          cargo test --no-default-features --features js_interop_tests,async-std
-          cargo test --no-default-features --features js_interop_tests,async-std,shared-core
-          cargo test --no-default-features --features js_interop_tests,async-std,sparse
-          cargo test --no-default-features --features js_interop_tests,async-std,sparse,cache
-          cargo test --benches --no-default-features --features tokio
-          cargo test --benches --no-default-features --features async-std
+          cargo check --all-targets
+          cargo check --all-targets --all-features
+          cargo check --all-targets --no-default-features
+          cargo check --all-targets --no-default-features --features sparse
+          cargo check --all-targets --no-default-features --features sparse,cache
+          cargo test
+          cargo test --all-features
+          cargo test --no-default-features
+          cargo test --no-default-features --features js_interop_tests
+          cargo test --no-default-features --features js_interop_tests,sparse
+          cargo test --no-default-features --features js_interop_tests,sparse,cache
+          cargo test --benches --no-default-features
 
   build-extra:
     runs-on: ubuntu-latest
@@ -115,24 +101,17 @@ jobs:
           targets: wasm32-unknown-unknown
       - name: Build WASM
         run: |
-          cargo build --target=wasm32-unknown-unknown --no-default-features --features tokio
-          cargo build --target=wasm32-unknown-unknown --no-default-features --features async-std
+          cargo build --target=wasm32-unknown-unknown --no-default-features
       - name: Build release
         run: |
-          cargo build --release --no-default-features --features tokio
-          cargo build --release --no-default-features --features tokio,sparse
-          cargo build --release --no-default-features --features tokio,sparse,cache
-          cargo build --release --no-default-features --features async-std
-          cargo build --release --no-default-features --features async-std,sparse
-          cargo build --release --no-default-features --features async-std,sparse,cache
+          cargo build --release --no-default-features
+          cargo build --release --no-default-features --features sparse
+          cargo build --release --no-default-features --features sparse,cache
       - name: Run examples
         run: |
-          cargo run --no-default-features --features tokio --example disk 
-          cargo run --no-default-features --features async-std --example disk 
-          cargo run --no-default-features --features tokio --example memory 
-          cargo run --no-default-features --features async-std --example memory 
-          cargo run --no-default-features --features tokio --example replication 
-          cargo run --no-default-features --features async-std --example replication 
+          cargo run --no-default-features --example disk
+          cargo run --no-default-features --example memory
+          cargo run --no-default-features --example replication
 
   lint:
     runs-on: ubuntu-latest

Cargo.toml

@@ -32,21 +32,34 @@ flat-tree = "6"
 merkle-tree-stream =  "0.12"
 pretty-hash = "0.4"
 rand = "0.8"
-random-access-memory = "3"
-random-access-storage = "5"
 sha2 = "0.10"
 futures = "0.3"
 crc32fast = "1"
 intmap = "2"
 moka = { version = "0.12", optional = true, features = ["sync"] }
 async-broadcast = { version = "0.7.1", optional = true }
-async-lock = {version = "3.4.0", optional = true }
+futures-lite = "2.6.1"
 
 [dependencies.hypercore_schema]
 version = "0.2.0"
 
-[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-random-access-disk = { version = "3", default-features = false }
+[dependencies.hypercore-protocol]
+optional = true
+path = "../protocol/"
+
+[dependencies.hypercore_handshake]
+version = "0.6.0"
+optional = true
+
+[dependencies.random-access-storage]
+version = "6.0.0-alpha"
+
+[dependencies.random-access-memory]
+version = "4.0.0-alpha"
+
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies.random-access-disk]
+version = "4.0.0-alpha"
+default-features = false
 
 [dev-dependencies]
 anyhow = "1.0.70"
@@ -55,21 +68,19 @@ proptest-derive = "0.5.1"
 data-encoding = "2.2.0"
 remove_dir_all = "0.7.0"
 tempfile = "3.1.0"
-async-std = { version = "1.12.0", features = ["attributes"] }
-tokio = { version = "1.27.0", default-features = false, features = ["macros", "rt", "rt-multi-thread"] }
+tokio = { version = "1.27.0", default-features = false, features = ["macros", "rt", "rt-multi-thread", "io-util", "time"] }
+tokio-util = { version = "0.7", features = ["compat"] }
+uint24le_framing = { version = "0.2.0" }
 tokio-test = "0.4"
 sha2 = "0.10"
 criterion = { version = "0.4", features = ["async_std", "async_tokio"] }
 test-log = { version = "0.2.11", default-features = false, features = ["trace"] }
 tracing-subscriber = { version = "0.3.16", features = ["env-filter", "fmt"] }
 
 [features]
-default = ["tokio", "sparse", "replication", "cache"]
-replication = ["dep:async-broadcast"]
-shared-core = ["replication", "dep:async-lock"]
+default = ["sparse", "replication", "cache"]
+replication = ["dep:async-broadcast", "dep:hypercore-protocol", "dep:hypercore_handshake"]
 sparse = ["random-access-disk/sparse"]
-tokio = ["random-access-disk/tokio"]
-async-std = ["random-access-disk/async-std"]
 cache = ["moka"]
 # Used only in interoperability tests under tests/js-interop which use the javascript version of hypercore
 # to verify that this crate works. To run them, use:

benches/disk.rs

@@ -1,7 +1,5 @@
 use std::time::{Duration, Instant};
 
-#[cfg(feature = "async-std")]
-use criterion::async_executor::AsyncStdExecutor;
 use criterion::{Criterion, black_box, criterion_group, criterion_main};
 use hypercore::{Hypercore, HypercoreBuilder, HypercoreError, Storage};
 use tempfile::Builder as TempfileBuilder;
@@ -10,11 +8,6 @@ fn bench_create_disk(c: &mut Criterion) {
     let mut group = c.benchmark_group("slow_call");
     group.measurement_time(Duration::from_secs(20));
 
-    #[cfg(feature = "async-std")]
-    group.bench_function("create_disk", move |b| {
-        b.to_async(AsyncStdExecutor)
-            .iter(|| create_hypercore("create"));
-    });
     #[cfg(feature = "tokio")]
     group.bench_function("create_disk", move |b| {
         let rt = tokio::runtime::Runtime::new().unwrap();
@@ -51,10 +44,6 @@ fn bench_write_disk(c: &mut Criterion) {
     let mut group = c.benchmark_group("slow_call");
     group.measurement_time(Duration::from_secs(20));
 
-    #[cfg(feature = "async-std")]
-    group.bench_function("write disk", |b| {
-        b.to_async(AsyncStdExecutor).iter_custom(write_disk);
-    });
     #[cfg(feature = "tokio")]
     group.bench_function("write disk", |b| {
         let rt = tokio::runtime::Runtime::new().unwrap();
@@ -76,10 +65,6 @@ fn bench_read_disk(c: &mut Criterion) {
     let mut group = c.benchmark_group("slow_call");
     group.measurement_time(Duration::from_secs(20));
 
-    #[cfg(feature = "async-std")]
-    group.bench_function("read disk", |b| {
-        b.to_async(AsyncStdExecutor).iter_custom(read_disk);
-    });
     #[cfg(feature = "tokio")]
     group.bench_function("read disk", |b| {
         let rt = tokio::runtime::Runtime::new().unwrap();
@@ -104,10 +89,6 @@ fn bench_clear_disk(c: &mut Criterion) {
     let mut group = c.benchmark_group("slow_call");
     group.measurement_time(Duration::from_secs(20));
 
-    #[cfg(feature = "async-std")]
-    group.bench_function("clear disk", |b| {
-        b.to_async(AsyncStdExecutor).iter_custom(clear_disk);
-    });
     #[cfg(feature = "tokio")]
     group.bench_function("clear disk", |b| {
         let rt = tokio::runtime::Runtime::new().unwrap();

benches/memory.rs

@@ -1,16 +1,13 @@
-use std::time::{Duration, Instant};
+use std::{
+    sync::Arc,
+    time::{Duration, Instant},
+};
 
-#[cfg(feature = "async-std")]
-use criterion::async_executor::AsyncStdExecutor;
 use criterion::{Criterion, black_box, criterion_group, criterion_main};
 use hypercore::{Hypercore, HypercoreBuilder, HypercoreError, Storage};
 use random_access_memory::RandomAccessMemory;
 
 fn bench_create_memory(c: &mut Criterion) {
-    #[cfg(feature = "async-std")]
-    c.bench_function("create memory", |b| {
-        b.to_async(AsyncStdExecutor).iter(|| create_hypercore(1024));
-    });
     #[cfg(feature = "tokio")]
     c.bench_function("create memory", |b| {
         let rt = tokio::runtime::Runtime::new().unwrap();
@@ -25,7 +22,7 @@ async fn create_hypercore(page_size: usize) -> Result<Hypercore, HypercoreError>
     let storage = Storage::open(
         |_| {
             Box::pin(async move {
-                Ok(Box::new(RandomAccessMemory::new(page_size)) as Box<dyn StorageTraits + Send>)
+                Ok(Arc::new(RandomAccessMemory::new(page_size)) as Arc<dyn StorageTraits>)
             })
         },
         false,
@@ -44,7 +41,7 @@ async fn create_hypercore(page_size: usize) -> Result<Hypercore, HypercoreError>
     let storage = Storage::open(
         |_| {
             Box::pin(async move {
-                Ok(Box::new(RandomAccessMemory::new(page_size)) as Box<dyn StorageTraits + Send>)
+                Ok(Arc::new(RandomAccessMemory::new(page_size)) as Arc<dyn StorageTraits>)
             })
         },
         false,
@@ -54,10 +51,6 @@ async fn create_hypercore(page_size: usize) -> Result<Hypercore, HypercoreError>
 }
 
 fn bench_write_memory(c: &mut Criterion) {
-    #[cfg(feature = "async-std")]
-    c.bench_function("write memory", |b| {
-        b.to_async(AsyncStdExecutor).iter_custom(write_memory);
-    });
     #[cfg(feature = "tokio")]
     c.bench_function("write memory", |b| {
         let rt = tokio::runtime::Runtime::new().unwrap();
@@ -76,10 +69,6 @@ async fn write_memory(iters: u64) -> Duration {
 }
 
 fn bench_read_memory(c: &mut Criterion) {
-    #[cfg(feature = "async-std")]
-    c.bench_function("read memory", |b| {
-        b.to_async(AsyncStdExecutor).iter_custom(read_memory);
-    });
     #[cfg(feature = "tokio")]
     c.bench_function("read memory", |b| {
         let rt = tokio::runtime::Runtime::new().unwrap();
@@ -101,10 +90,6 @@ async fn read_memory(iters: u64) -> Duration {
 }
 
 fn bench_clear_memory(c: &mut Criterion) {
-    #[cfg(feature = "async-std")]
-    c.bench_function("clear memory", |b| {
-        b.to_async(AsyncStdExecutor).iter_custom(clear_memory);
-    });
     #[cfg(feature = "tokio")]
     c.bench_function("clear memory", |b| {
         let rt = tokio::runtime::Runtime::new().unwrap();

examples/disk.rs

@@ -1,12 +1,8 @@
-#[cfg(feature = "async-std")]
-use async_std::main as async_main;
 use hypercore::{HypercoreBuilder, HypercoreError, Storage};
 use tempfile::Builder;
-#[cfg(feature = "tokio")]
-use tokio::main as async_main;
 
 /// Example about using an in-memory hypercore.
-#[async_main]
+#[tokio::main]
 async fn main() {
     // For the purposes of this example, first create a
     // temporary directory to hold hypercore.

examples/memory.rs

@@ -1,11 +1,7 @@
-#[cfg(feature = "async-std")]
-use async_std::main as async_main;
 use hypercore::{HypercoreBuilder, HypercoreError, Storage};
-#[cfg(feature = "tokio")]
-use tokio::main as async_main;
 
 /// Example about using an in-memory hypercore.
-#[async_main]
+#[tokio::main]
 async fn main() {
     // Create a memory storage
     let storage = Storage::new_memory()

examples/replication.rs

@@ -1,15 +1,11 @@
-#[cfg(feature = "async-std")]
-use async_std::main as async_main;
 use hypercore::{Hypercore, HypercoreBuilder, HypercoreError, PartialKeypair, Storage};
 use hypercore_schema::{RequestBlock, RequestUpgrade};
 use tempfile::Builder;
-#[cfg(feature = "tokio")]
-use tokio::main as async_main;
 
 /// Example on how to replicate a (disk) hypercore to another (memory) hypercore.
 /// NB: The replication functions used here are low-level, built for use in the wire
 /// protocol.
-#[async_main]
+#[tokio::main]
 async fn main() {
     // For the purposes of this example, first create a
     // temporary directory to hold hypercore.
@@ -99,7 +95,7 @@ async fn replicate_index(
     // Then the proof is verified and applied to the replicated party.
     assert!(
         replicated_hypercore
-            .verify_and_apply_proof(&proof)
+            .verify_and_apply_proof(proof)
             .await
             .expect("Verifying and applying proof failed")
     );