chore: Upgrade to blockstore 0.5

eigerco · Apr 15, 2024 · 330e773 · 330e773
1 parent 5b94a30
commit 330e773
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -8,7 +8,7 @@ rust-version = "1.75"
 
 [dependencies]
 asynchronous-codec = "0.7"
-blockstore = "0.4"
+blockstore = "0.5"
 bytes = "1"
 cid = "0.11"
 fnv = "1.0.5"

diff --git a/src/client.rs b/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,
 }
 

diff --git a/src/lib.rs b/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`].

diff --git a/src/server.rs b/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)]