Merge #397

397: Prepare bitswap release r=koivunej a=koivunej

Renames `bitswap` crate for `ipfs-bitswap` and format fallout for the change. To help with upcoming work I changed the

```diff
-use bitswap::Block;
+use crate::Block;
```

Co-authored-by: Joonas Koivunen <joonas@equilibrium.co>

Author: bors[bot]

Cargo.lock

@@ -15,7 +15,7 @@ anyhow = { default-features = false, version = "1.0" }
 async-stream = { default-features = false, version = "0.3" }
 async-trait = { default-features = false, version = "0.1" }
 base64 = { default-features = false, features = ["alloc"], version = "0.12" }
-bitswap = { path = "bitswap" }
+ipfs-bitswap = { path = "bitswap" }
 byteorder = { default-features = false, version = "1.3" }
 bytes = { default-features = false, version = "0.5" }
 cid = { default-features = false, version = "0.5" }

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 authors = ["Rust-IPFS contributors"]
 edition = "2018"
-name = "bitswap"
+name = "ipfs-bitswap"
 version = "0.1.0"
 
 [build-dependencies]

bitswap/Cargo.toml

@@ -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/dag.rs

@@ -81,8 +81,8 @@ pub use self::{
     path::IpfsPath,
     repo::{PinKind, PinMode, RepoTypes},
 };
-pub use bitswap::Block;
 pub use cid::Cid;
+pub use ipfs_bitswap::Block;
 pub use libp2p::{
     core::{connection::ListenerId, multiaddr::Protocol, Multiaddr, PeerId, PublicKey},
     identity::Keypair,
@@ -260,7 +260,10 @@ enum IpfsEvent {
     PubsubPublish(String, Vec<u8>, OneshotSender<()>),
     PubsubPeers(Option<String>, OneshotSender<Vec<PeerId>>),
     PubsubSubscribed(OneshotSender<Vec<String>>),
-    WantList(Option<PeerId>, OneshotSender<Vec<(Cid, bitswap::Priority)>>),
+    WantList(
+        Option<PeerId>,
+        OneshotSender<Vec<(Cid, ipfs_bitswap::Priority)>>,
+    ),
     BitswapStats(OneshotSender<BitswapStats>),
     AddListeningAddress(Multiaddr, Channel<Multiaddr>),
     RemoveListeningAddress(Multiaddr, Channel<()>),
@@ -809,7 +812,7 @@ impl<Types: IpfsTypes> Ipfs<Types> {
     pub async fn bitswap_wantlist(
         &self,
         peer: Option<PeerId>,
-    ) -> Result<Vec<(Cid, bitswap::Priority)>, Error> {
+    ) -> Result<Vec<(Cid, ipfs_bitswap::Priority)>, Error> {
         async move {
             let (tx, rx) = oneshot_channel();
 
@@ -1568,12 +1571,22 @@ pub struct BitswapStats {
     /// The current peers
     pub peers: Vec<PeerId>,
     /// The wantlist of the local node
-    pub wantlist: Vec<(Cid, bitswap::Priority)>,
+    pub wantlist: Vec<(Cid, ipfs_bitswap::Priority)>,
 }
 
-impl From<(bitswap::Stats, Vec<PeerId>, Vec<(Cid, bitswap::Priority)>)> for BitswapStats {
+impl
+    From<(
+        ipfs_bitswap::Stats,
+        Vec<PeerId>,
+        Vec<(Cid, ipfs_bitswap::Priority)>,
+    )> for BitswapStats
+{
     fn from(
-        (stats, peers, wantlist): (bitswap::Stats, Vec<PeerId>, Vec<(Cid, bitswap::Priority)>),
+        (stats, peers, wantlist): (
+            ipfs_bitswap::Stats,
+            Vec<PeerId>,
+            Vec<(Cid, ipfs_bitswap::Priority)>,
+        ),
     ) -> Self {
         BitswapStats {
             blocks_sent: stats.sent_blocks.load(Ordering::Relaxed),

src/lib.rs

@@ -6,8 +6,8 @@ use crate::repo::{BlockPut, Repo};
 use crate::subscription::{SubscriptionFuture, SubscriptionRegistry};
 use crate::IpfsTypes;
 use anyhow::anyhow;
-use bitswap::{Bitswap, BitswapEvent};
 use cid::Cid;
+use ipfs_bitswap::{Bitswap, BitswapEvent};
 use libp2p::core::{Multiaddr, PeerId};
 use libp2p::identify::{Identify, IdentifyEvent};
 use libp2p::kad::record::{store::MemoryStore, Key, Record};

src/p2p/behaviour.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/fs/blocks.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/mem.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/repo/mod.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};