feat: update to [email protected] (#168)

* feat: update to [email protected]

* update to released

Author: dignifiedquire

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "iroh-ffi"
-version = "0.20.0"
+version = "0.21.0"
 edition = "2021"
 publish = false
 readme = "README.md"
@@ -30,13 +30,11 @@ async-trait = "0.1.80"
 blake3 = "1.3.3"
 bytes = "1"
 data-encoding = { version = "2.3.3" }
-iroh = { version = "0.20.0" }
+iroh = { version = "0.21.0" }
 iroh-io = { version = "0.6.0" }
 libc = "0.2.141"
-multibase = { version = "0.9.1" }
 num_cpus = { version = "1.15.0" }
 range-collections = "0.4.0"
-tempfile = "3.4"
 thiserror = "1.0.44"
 tokio = "1.25.0"
 tokio-util = { version = "0.7", features = ["io-util", "io"] }
@@ -51,6 +49,7 @@ serde_json = "1.0.113"
 
 [dev-dependencies]
 rand = "0.8"
+tempfile = "3.4"
 tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
 tokio = { version = "1", features = ["full"] }
 

Cargo.toml

@@ -1,10 +1,10 @@
 Pod::Spec.new do |spec|
   spec.name         = "IrohLib"
-  spec.version      = "0.20.0"
+  spec.version      = "0.21.0"
   spec.summary      = "iroh is a toolkit for building distributed apps"
   spec.description  = <<-DESC
                       Build distributed apps that raise the status quo for your users.
-                      Open source and universally compatible, it's the quickest route from 
+                      Open source and universally compatible, it's the quickest route from
                       concept to connected devices.
                     DESC
   spec.homepage           = "https://iroh.computer"
@@ -22,4 +22,4 @@ Pod::Spec.new do |spec|
   spec.framework          = "SystemConfiguration"
   spec.ios.deployment_target  = '15.0'
   spec.dependency 'IrohLibFramework', "#{spec.version}"
-end
+end

IrohLib.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
   spec.name         = "IrohLibFramework"
-  spec.version      = "0.20.0"
+  spec.version      = "0.21.0"
   spec.summary      = "Complied rust cocoa framework for Iroh"
   spec.description  = <<-DESC
                    Complied rust cocoa framework for Iroh.
@@ -15,4 +15,4 @@ Pod::Spec.new do |spec|
   spec.static_framework = true
   spec.source = { :http => "https://github.com/n0-computer/iroh-ffi/releases/download/v#{spec.version}/IrohLib.xcframework.zip" }
   spec.vendored_frameworks = 'Iroh.xcframework'
-end
+end

IrohLibFramework.podspec

@@ -286,7 +286,7 @@ runBlocking {
     // delete the tag for the first blob
     node.tags().delete(removeTag)
     // wait for GC to clear the blob
-    java.lang.Thread.sleep(250)
+    java.lang.Thread.sleep(500)
 
     val clearedHashes = node.blobs().list()
     assert(clearedHashes.size == numBlobs - 1)

kotlin/blob_test.kts

@@ -246,7 +246,7 @@ async def test_list_and_delete():
     # delete the tag for the first blob
     await node.tags().delete(remove_tag)
     # wait for GC to clear the blob
-    time.sleep(0.25)
+    time.sleep(0.5)
 
     got_hashes = await node.blobs().list()
     assert len(got_hashes) == num_blobs - 1

python/blob_test.py

@@ -1525,7 +1525,7 @@ mod tests {
         let iroh_dir = tempfile::tempdir().unwrap();
         // we're going to use a very fast GC interval to get this test to delete stuff aggressively
         let opts = NodeOptions {
-            gc_interval_millis: Some(100),
+            gc_interval_millis: Some(50),
         };
         let node = Iroh::persistent_with_options(iroh_dir.into_path().display().to_string(), opts)
             .await
@@ -1559,7 +1559,7 @@ mod tests {
         // delete the tag for the first blob
         node.tags().delete(remove_tag).await.unwrap();
         // wait for GC to clear the blob. windows test runner is slow & needs like 500ms
-        std::thread::sleep(Duration::from_millis(500));
+        tokio::time::sleep(Duration::from_secs(1)).await;
 
         let got_hashes = node.blobs().list().await.unwrap();
         assert_eq!(num_blobs - 1, got_hashes.len());

src/blob.rs

@@ -2,7 +2,6 @@ use std::{path::PathBuf, str::FromStr, sync::Arc, time::SystemTime};
 
 use bytes::Bytes;
 use futures::{StreamExt, TryStreamExt};
-use iroh::client::MemDoc;
 use serde::{Deserialize, Serialize};
 
 use crate::{ticket::AddrInfoOptions, AuthorId, CallbackError, Hash, Iroh, IrohError, PublicKey};
@@ -147,7 +146,7 @@ pub struct NamespaceAndCapability {
 /// A representation of a mutable, synchronizable key-value store.
 #[derive(Clone, uniffi::Object)]
 pub struct Doc {
-    pub(crate) inner: MemDoc,
+    pub(crate) inner: iroh::client::Doc,
 }
 
 #[uniffi::export]
@@ -246,7 +245,7 @@ impl Doc {
     ///
     /// Returns the number of entries deleted.
     #[uniffi::method(async_runtime = "tokio")]
-    pub async fn delete_entry(
+    pub async fn delete(
         &self,
         author_id: Arc<AuthorId>,
         prefix: Vec<u8>,