chore: Upgrade to blockstore 0.5 (#43)

* chore: Upgrade to blockstore 0.5

* update cargo toml

Cargo.toml

@@ -4,11 +4,24 @@ version = "0.1.0"
 edition = "2021"
 license = "Apache-2.0"
 description = "Implementation of bitswap protocol for libp2p"
+authors = ["Eiger <[email protected]>"]
+homepage = "https://www.eiger.co"
+readme = "README.md"
 rust-version = "1.75"
+repository = "https://github.com/eigerco/beetswap"
+# crates.io is limited to 5 keywords and 5 categories
+keywords = ["bitswap", "blockstore", "ipld", "cid"]
+# Must be one of <https://crates.io/category_slugs>
+categories = [
+  "asynchronous",
+  "cryptography::cryptocurrencies",
+  "network-programming",
+  "wasm",
+]
 
 [dependencies]
 asynchronous-codec = "0.7"
-blockstore = "0.4"
+blockstore = "0.5"
 bytes = "1"
 cid = "0.11"
 fnv = "1.0.5"
@@ -36,13 +49,15 @@ libp2p-noise = "0.44"
 libp2p-stream = "0.1.0-alpha"
 libp2p-swarm-test = "0.3.0"
 libp2p-yamux = "0.45"
-log = "0.4.18" # needed for minimal-versions
 multihash = "0.19"
 multihash-codetable = { version = "0.1", features = ["digest", "sha2"] }
 tokio = { version = "1", features = ["rt", "macros", "time", "sync"] }
 tracing-appender = "0.2.2"
 tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
 
+# needed for minimal-versions
+log = "0.4.18"
+
 [features]
 wasm-bindgen = ["futures-timer/wasm-bindgen", "instant/wasm-bindgen"]
 

src/client.rs

@@ -6,7 +6,7 @@ use std::time::Duration;
 use std::{fmt, mem};
 
 use asynchronous_codec::FramedWrite;
-use blockstore::{Blockstore, BlockstoreError};
+use blockstore::Blockstore;
 use cid::CidGeneric;
 use fnv::{FnvHashMap, FnvHashSet};
 use futures_timer::Delay;
@@ -56,9 +56,9 @@ enum TaskResult<const S: usize> {
     Get(
         QueryId,
         CidGeneric<S>,
-        Result<Option<Vec<u8>>, BlockstoreError>,
+        Result<Option<Vec<u8>>, blockstore::Error>,
     ),
-    Set(Result<Vec<(CidGeneric<S>, Vec<u8>)>, BlockstoreError>),
+    Set(Result<Vec<(CidGeneric<S>, Vec<u8>)>, blockstore::Error>),
     Cancelled,
 }
 

src/lib.rs

@@ -4,7 +4,7 @@
 use std::sync::Arc;
 use std::task::{ready, Context, Poll};
 
-use blockstore::{Blockstore, BlockstoreError};
+use blockstore::Blockstore;
 use cid::CidGeneric;
 use client::SendingState;
 use futures_util::stream::{SelectAll, StreamExt};
@@ -85,7 +85,7 @@ pub enum Error {
 
     /// Error received when interacting with blockstore
     #[error("Blockstore error: {0}")]
-    Blockstore(#[from] BlockstoreError),
+    Blockstore(#[from] blockstore::Error),
 }
 
 /// Alias for a [`Result`] with the error type [`beetswap::Error`].

src/server.rs

@@ -5,7 +5,7 @@ use std::sync::Arc;
 use std::task::{ready, Context, Poll};
 
 use asynchronous_codec::FramedWrite;
-use blockstore::{Blockstore, BlockstoreError};
+use blockstore::Blockstore;
 use cid::CidGeneric;
 use fnv::{FnvHashMap, FnvHashSet};
 use futures_util::sink::SinkExt;
@@ -58,7 +58,7 @@ enum TaskResult<const S: usize> {
 
 struct GetCidResult<const S: usize> {
     cid: CidGeneric<S>,
-    data: Result<Option<Vec<u8>>, BlockstoreError>,
+    data: Result<Option<Vec<u8>>, blockstore::Error>,
 }
 
 #[derive(Debug, Default)]