refactor: use crate level re-export for Block

Author: Joonas Koivunen

src/dag.rs

@@ -4,8 +4,7 @@ use crate::error::Error;
 use crate::ipld::{decode_ipld, encode_ipld, Ipld};
 use crate::path::{IpfsPath, SlashedPath};
 use crate::repo::RepoTypes;
-use crate::Ipfs;
-use bitswap::Block;
+use crate::{Block, Ipfs};
 use cid::{Cid, Codec, Version};
 use ipfs_unixfs::{
     dagpb::{wrap_node_data, NodeData},

src/repo/fs/blocks.rs

@@ -2,8 +2,8 @@ use super::{block_path, filestem_to_block_cid};
 use super::{BlockRm, BlockRmError, RepoCid};
 use crate::error::Error;
 use crate::repo::{BlockPut, BlockStore};
+use crate::Block;
 use async_trait::async_trait;
-use bitswap::Block;
 use cid::Cid;
 use std::collections::HashMap;
 use std::hash::Hash;
@@ -434,7 +434,7 @@ fn write_through_tempfile(
 #[cfg(test)]
 mod tests {
     use super::*;
-    use bitswap::Block;
+    use crate::Block;
     use cid::{Cid, Codec};
     use hex_literal::hex;
     use multihash::Sha2_256;

src/repo/mem.rs

@@ -1,8 +1,8 @@
 //! Volatile memory backed repo
 use crate::error::Error;
 use crate::repo::{BlockPut, BlockStore, Column, DataStore, PinKind, PinMode, PinStore};
+use crate::Block;
 use async_trait::async_trait;
-use bitswap::Block;
 use cid::Cid;
 use std::convert::TryFrom;
 use std::path::PathBuf;
@@ -654,7 +654,7 @@ crate::pinstore_interface_tests!(common_tests, crate::repo::mem::MemDataStore::n
 #[cfg(test)]
 mod tests {
     use super::*;
-    use bitswap::Block;
+    use crate::Block;
     use cid::{Cid, Codec};
     use multihash::Sha2_256;
     use std::env::temp_dir;

src/repo/mod.rs

@@ -3,9 +3,8 @@ use crate::error::Error;
 use crate::p2p::KadResult;
 use crate::path::IpfsPath;
 use crate::subscription::{RequestKind, SubscriptionFuture, SubscriptionRegistry};
-use crate::IpfsOptions;
+use crate::{Block, IpfsOptions};
 use async_trait::async_trait;
-use bitswap::Block;
 use cid::{self, Cid};
 use core::convert::TryFrom;
 use core::fmt::Debug;

src/unixfs/cat.rs

@@ -1,9 +1,8 @@
 use crate::{
     dag::{ResolveError, UnexpectedResolved},
-    Error, Ipfs, IpfsTypes,
+    Block, Error, Ipfs, IpfsTypes,
 };
 use async_stream::stream;
-use bitswap::Block;
 use cid::Cid;
 use futures::stream::Stream;
 use ipfs_unixfs::file::{visit::IdleFileVisit, FileReadFailed};