diff --git a/Cargo.lock b/Cargo.lock index 61d3cb7..bad3491 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -125,9 +125,6 @@ name = "anyhow" version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" -dependencies = [ - "backtrace", -] [[package]] name = "arrayref" @@ -625,9 +622,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.6.1" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" [[package]] name = "cacaos" @@ -669,14 +666,28 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.7" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26a5c3fd7bfa1ce3897a3a3501d362b2d87b7f2583ebcb4a949ec25911025cbc" +checksum = "504bdec147f2cc13c8b57ed9401fd8a147cc66b67ad5cb241394244f2c947549" + +[[package]] +name = "ceramic-car" +version = "0.34.0" +source = "git+https://github.com/ceramicnetwork/rust-ceramic.git?branch=main#d067bfc31a77ad5f4be9fb89256a1ceb9cf32c42" +dependencies = [ + "cid 0.11.1", + "futures", + "integer-encoding", + "serde", + "serde_ipld_dagcbor", + "thiserror", + "tokio", +] [[package]] name = "ceramic-core" -version = "0.30.0" -source = "git+https://github.com/ceramicnetwork/rust-ceramic.git?branch=main#89788719e3cffa649a60fb3166e1349537842b9c" +version = "0.34.0" +source = "git+https://github.com/ceramicnetwork/rust-ceramic.git?branch=main#d067bfc31a77ad5f4be9fb89256a1ceb9cf32c42" dependencies = [ "anyhow", "base64 0.21.7", @@ -702,15 +713,16 @@ dependencies = [ [[package]] name = "ceramic-event" -version = "0.30.0" -source = "git+https://github.com/ceramicnetwork/rust-ceramic.git?branch=main#89788719e3cffa649a60fb3166e1349537842b9c" +version = "0.34.0" +source = "git+https://github.com/ceramicnetwork/rust-ceramic.git?branch=main#d067bfc31a77ad5f4be9fb89256a1ceb9cf32c42" dependencies = [ "anyhow", "base64 0.21.7", + "ceramic-car", "ceramic-core", + "chrono", "cid 0.11.1", "ipld-core", - "iroh-car", "multibase 0.9.1", "multihash-codetable", "serde", @@ -793,9 +805,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.11" +version = "4.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35723e6a11662c2afb578bcf0b88bf6ea8e21282a953428f240574fcc3a2b5b3" +checksum = "0fbb260a053428790f3de475e304ff84cdbc4face759ea7a3e64c1edd938a7fc" dependencies = [ "clap_builder", "clap_derive", @@ -803,9 +815,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.11" +version = "4.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49eb96cbfa7cfa35017b7cd548c75b14c3118c98b423041d70562665e07fb0fa" +checksum = "64b17d7ea74e9f833c7dbf2cbe4fb12ff26783eda4782a8975b72f895c9b4d99" dependencies = [ "anstream", "anstyle", @@ -815,9 +827,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.11" +version = "4.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d029b67f89d30bbb547c89fd5161293c0aec155fc691d7924b64550662db93e" +checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -1671,9 +1683,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.30" +version = "1.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +checksum = "7f211bbe8e69bbd0cfdea405084f128ae8b4aaa6b0b522fc8f2b009084797920" dependencies = [ "crc32fast", "miniz_oxide", @@ -2020,7 +2032,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap 2.2.6", + "indexmap 2.3.0", "slab", "tokio", "tokio-util", @@ -2326,9 +2338,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.6" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "de3fc2e30ba82dd1b3911c8de1ffc143c74a914a14e99514d7637e3099df5ea0" dependencies = [ "equivalent", "hashbrown 0.14.5", @@ -2436,20 +2448,6 @@ dependencies = [ "serde", ] -[[package]] -name = "iroh-car" -version = "0.30.0" -source = "git+https://github.com/ceramicnetwork/rust-ceramic.git?branch=main#89788719e3cffa649a60fb3166e1349537842b9c" -dependencies = [ - "cid 0.11.1", - "futures", - "integer-encoding", - "serde", - "serde_ipld_dagcbor", - "thiserror", - "tokio", -] - [[package]] name = "is_terminal_polyfill" version = "1.70.1" @@ -2819,6 +2817,7 @@ dependencies = [ "anyhow", "async-trait", "base64 0.21.7", + "ceramic-car", "ceramic-core", "ceramic-http-client", "chrono", @@ -2829,7 +2828,6 @@ dependencies = [ "hex", "ipld-core", "ipld-dagpb", - "iroh-car", "keramik-common", "multibase 0.9.1", "multihash 0.19.1", @@ -3652,9 +3650,9 @@ dependencies = [ [[package]] name = "object" -version = "0.36.2" +version = "0.36.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f203fa8daa7bb185f760ae12bd8e097f63d17041dcdcaf675ac54cdf863170e" +checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9" dependencies = [ "memchr", ] @@ -3723,7 +3721,7 @@ checksum = "1e32339a5dc40459130b3bd269e9892439f55b33e772d2a9d402a789baaf4e8a" dependencies = [ "futures-core", "futures-sink", - "indexmap 2.2.6", + "indexmap 2.3.0", "js-sys", "once_cell", "pin-project-lite", @@ -4096,12 +4094,11 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.19" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2288c0e17cc8d342c712bb43a257a80ebffce59cdb33d5000d8348f3ec02528b" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" dependencies = [ "zerocopy", - "zerocopy-derive", ] [[package]] @@ -4402,9 +4399,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.5" +version = "1.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" dependencies = [ "aho-corasick", "memchr", @@ -4887,9 +4884,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.121" +version = "1.0.122" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ab380d7d9f22ef3f21ad3e6c1ebe8e4fc7a2000ccba2e4d71fc96f15b2cb609" +checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da" dependencies = [ "itoa", "memchr", @@ -4966,7 +4963,7 @@ version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.3.0", "itoa", "ryu", "serde", @@ -5693,14 +5690,15 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.10.1" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if", "fastrand 2.1.0", + "once_cell", "rustix 0.38.34", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -5960,7 +5958,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.3.0", "toml_datetime", "winnow", ] @@ -5971,7 +5969,7 @@ version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.3.0", "toml_datetime", "winnow", ] @@ -6539,11 +6537,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -6579,6 +6577,15 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + [[package]] name = "windows-targets" version = "0.48.5" diff --git a/Cargo.toml b/Cargo.toml index ac01214..4ac688e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,7 +8,7 @@ async-trait = "0.1" clap = { version = "4", features = ["derive", "env"] } console-subscriber = "0.2" ceramic-core = { git = "https://github.com/ceramicnetwork/rust-ceramic.git", branch = "main" } -iroh-car = { git = "https://github.com/ceramicnetwork/rust-ceramic.git", branch = "main" } +ceramic-car = { git = "https://github.com/ceramicnetwork/rust-ceramic.git", branch = "main" } env_logger = "0.10.0" expect-patch = { path = "./expect-patch/" } hex = "0.4.3" diff --git a/runner/Cargo.toml b/runner/Cargo.toml index 4580595..075c130 100644 --- a/runner/Cargo.toml +++ b/runner/Cargo.toml @@ -9,7 +9,7 @@ edition = "2021" anyhow.workspace = true async-trait.workspace = true ceramic-core.workspace = true -iroh-car.workspace = true +ceramic-car.workspace = true ceramic-http-client = { git = "https://github.com/3box/ceramic-http-client-rs.git", branch = "main", default-features = false } clap.workspace = true did-method-key = "0.2" diff --git a/runner/src/scenario/ceramic/anchor.rs b/runner/src/scenario/ceramic/anchor.rs index ead72b1..e21a6f6 100644 --- a/runner/src/scenario/ceramic/anchor.rs +++ b/runner/src/scenario/ceramic/anchor.rs @@ -7,7 +7,7 @@ use ceramic_http_client::{ use chrono::Utc; use goose::prelude::*; use ipld_core::ipld; -use iroh_car::{CarHeader, CarWriter}; +use ceramic_car::{CarHeader, CarWriter}; use multihash_codetable::{Code, MultihashDigest}; use redis::{aio::MultiplexedConnection, AsyncCommands}; diff --git a/runner/src/scenario/util.rs b/runner/src/scenario/util.rs index 21fee1a..ae70834 100644 --- a/runner/src/scenario/util.rs +++ b/runner/src/scenario/util.rs @@ -93,7 +93,7 @@ pub(crate) async fn random_init_event_car( .with_unique(unique.to_vec()) .with_data(ipld_core::ipld!({"a": 1, "b": 2})) .build(); - let car = res.encode_car().await?; + let car = res.encode_car()?; Ok(MultiBase32String::from(car)) }