upgrade dependencies

Author: sameer

Cargo.lock

@@ -1,8 +1,8 @@
 [package]
 name = "git-lfs-ipfs-cli"
-version = "0.1.0"
+version = "0.1.1"
 authors = ["Sameer Puri <crates@purisa.me>"]
-edition = "2018"
+edition = "2021"
 description = "A git-lfs custom transfer & extension that makes it easy to store large files with IPFS"
 readme = "../README.md"
 license = "MIT OR Apache-2.0"
@@ -18,8 +18,8 @@ serde_json = "1"
 cid = { version = "0", default-features = false, features = ["std"] }
 git-lfs-spec = { path = "../git-lfs-spec", version = "0" }
 structopt = "0.3"
-multihash = { version = "0.14", features = ["sha2", "multihash-impl"], default-features = false }
-ipfs-api = { version = "0.12", features = ["with-hyper-rustls"], default-features = false, git = "https://github.com/ferristseng/rust-ipfs-api.git" }
+multihash = { version = "0.18", features = ["sha2", "multihash-impl"], default-features = false }
+ipfs-api-backend-hyper = { version = "0.6", features = ["with-hyper-rustls"] }
 hex = "0"
 serde = "1"
 futures = "0.3"

git-lfs-ipfs-cli/Cargo.toml

@@ -1,7 +1,8 @@
+use std::io::Read;
+
 use anyhow::Result;
 use futures::StreamExt;
-use ipfs_api::{response::AddResponse, IpfsApi};
-use std::io::Read;
+use ipfs_api_backend_hyper::{response::AddResponse, IpfsApi};
 use tokio::io::{AsyncWrite, AsyncWriteExt};
 
 /// Replace file contents with the raw IPFS block contents.
@@ -15,7 +16,7 @@ use tokio::io::{AsyncWrite, AsyncWriteExt};
 /// <https://github.com/git-lfs/git-lfs/blob/main/docs/extensions.md#clean>
 pub async fn clean<E: 'static + Send + Sync + std::error::Error>(
     client: impl IpfsApi<Error = E>,
-    input: impl Read + Send + Sync + 'static,
+    input: impl Read + Send + Sync + Unpin + 'static,
     mut output: impl AsyncWrite + AsyncWriteExt + Unpin,
 ) -> Result<()> {
     let AddResponse { hash, .. } = client.add(input).await?;

git-lfs-ipfs-cli/src/clean.rs

@@ -1,7 +1,7 @@
 use anyhow::Result;
 use hyper::client::HttpConnector;
-use ipfs_api::IpfsClient;
-use multihash::{Code, MultihashDigest, Sha2Digest, U32};
+use ipfs_api_backend_hyper::IpfsClient;
+use multihash::{Code, MultihashDigest};
 
 /// Assuming that the sha256 hash is for a Qmhash
 pub fn sha256_to_cid(sha256_str: &str) -> Result<cid::Cid> {
@@ -12,9 +12,7 @@ pub fn sha256_to_cid(sha256_str: &str) -> Result<cid::Cid> {
             raw_digest.len()
         ))
     } else {
-        let mut digest = Sha2Digest::<U32>::default();
-        digest.as_mut().copy_from_slice(&raw_digest);
-        Ok(cid::Cid::new_v0(Code::multihash_from_digest(&digest))?)
+        Ok(cid::Cid::new_v0(Code::Sha2_256.wrap(&raw_digest)?)?)
     }
 }
 

git-lfs-ipfs-cli/src/ipfs.rs

@@ -1,8 +1,8 @@
 use anyhow::Result;
 use cid::Cid;
 use futures::stream::StreamExt;
-use ipfs_api::IpfsApi;
-use multihash::{Code, MultihashDigest, Sha2Digest, Sha2_256, StatefulHasher, U32};
+use ipfs_api_backend_hyper::IpfsApi;
+use multihash::{Code, Hasher, Multihash, MultihashDigest, Sha2_256};
 use tokio::io::{AsyncRead, AsyncReadExt, AsyncWrite, AsyncWriteExt};
 
 /// Verbatim from IPFS cli docs:
@@ -14,9 +14,7 @@ const CHUNKER_FIXED_BLOCK_SIZE: usize = 256 * 1024;
 
 const BUFFER_SIZE: usize = CHUNKER_FIXED_BLOCK_SIZE / 256;
 
-async fn sha256_hash_of_raw_block(
-    mut input: impl AsyncRead + AsyncReadExt + Unpin,
-) -> Result<Sha2Digest<U32>> {
+async fn sha256_hash_of_raw_block(mut input: impl AsyncRead + Unpin) -> Result<Multihash> {
     let mut buffer = [0u8; BUFFER_SIZE];
     let mut hasher = Sha2_256::default();
     loop {
@@ -26,13 +24,12 @@ async fn sha256_hash_of_raw_block(
         }
         hasher.update(&buffer[..bytes_read]);
     }
-    Ok(hasher.finalize())
+    Ok(Code::Sha2_256.wrap(hasher.finalize())?)
 }
 
-async fn cid_of_raw_block(input: impl AsyncRead + AsyncReadExt + Unpin) -> Result<Cid> {
+async fn cid_of_raw_block(input: impl AsyncRead + Unpin) -> Result<Cid> {
     let sha256_hash = sha256_hash_of_raw_block(input).await?;
-    let hash = Code::multihash_from_digest(&sha256_hash);
-    Ok(Cid::new_v0(hash.into()).unwrap())
+    Ok(Cid::new_v0(sha256_hash).unwrap())
 }
 
 /// Convert a file's raw IPFS block back into the file itself
@@ -43,8 +40,8 @@ async fn cid_of_raw_block(input: impl AsyncRead + AsyncReadExt + Unpin) -> Resul
 /// <https://github.com/git-lfs/git-lfs/blob/main/docs/extensions.md#smudge>
 pub async fn smudge<E: 'static + Send + Sync + std::error::Error>(
     client: impl IpfsApi<Error = E>,
-    input: impl AsyncRead + AsyncReadExt + Unpin,
-    mut output: impl AsyncWrite + AsyncWriteExt + Unpin,
+    input: impl AsyncRead + Unpin,
+    mut output: impl AsyncWrite + Unpin,
 ) -> Result<()> {
     let cid = cid_of_raw_block(input).await?;
     let mut stream = client.cat(&format!("/ipfs/{}", cid));
@@ -70,7 +67,7 @@ mod tests {
     #[tokio::test]
     async fn sha256_hash_of_raw_block_returns_expected_hash() {
         assert_eq!(
-            sha256_hash_of_raw_block(RAW_BLOCK).await.unwrap().as_ref(),
+            sha256_hash_of_raw_block(RAW_BLOCK).await.unwrap().digest(),
             hex::decode(SHA256_HASH).unwrap()
         );
     }

git-lfs-ipfs-cli/src/smudge.rs

@@ -1,14 +1,12 @@
 use anyhow::{Context, Result};
 use futures::{Stream, StreamExt};
-use ipfs_api::IpfsApi;
+use ipfs_api_backend_hyper::IpfsApi;
 use std::{io::Write, path::Path};
 use tokio::io::{AsyncBufRead, AsyncBufReadExt};
 
 use git_lfs_spec::transfer::custom::{self, Complete, Error, Event, Operation, Progress};
 
-pub fn read_events(
-    input: impl AsyncBufRead + AsyncBufReadExt + Unpin,
-) -> impl Stream<Item = Result<Event>> {
+pub fn read_events(input: impl AsyncBufRead + Unpin) -> impl Stream<Item = Result<Event>> {
     async_stream::stream! {
         let mut lines = input.lines();
         while let Some(line) = lines.next_line().await? {
@@ -149,7 +147,7 @@ mod tests {
     async fn transfer_handles_events_as_expected_for_download() {
         let temp_dir = tempdir().unwrap();
 
-        let expected_output_path = temp_dir.path().join(&OID);
+        let expected_output_path = temp_dir.path().join(OID);
 
         let client = client();
         let input_events = [

git-lfs-ipfs-cli/src/transfer.rs

@@ -1,8 +1,8 @@
 [package]
 name = "git-lfs-spec"
-version = "0.1.0"
+version = "0.1.1"
 authors = ["Sameer Puri <crates@purisa.me>"]
-edition = "2018"
+edition = "2021"
 description = "Rust types for Git LFS"
 readme = "../README.md"
 license = "MIT OR Apache-2.0"

git-lfs-spec/Cargo.toml

@@ -33,9 +33,10 @@ pub enum Operation {
 }
 
 /// https://github.com/git-lfs/git-lfs/blob/master/docs/api/basic-transfers.md#basic-transfer-api
-#[derive(PartialEq, Eq, Debug, Deserialize, Serialize)]
+#[derive(PartialEq, Eq, Debug, Deserialize, Serialize, Default)]
 #[serde(rename_all = "lowercase")]
 pub enum Transfer {
+    #[default]
     Basic,
     Custom,
 }
@@ -46,12 +47,6 @@ impl Transfer {
     }
 }
 
-impl Default for Transfer {
-    fn default() -> Self {
-        Transfer::Basic
-    }
-}
-
 /// https://github.com/git-lfs/git-lfs/blob/master/docs/api/batch.md#ref-property
 #[derive(PartialEq, Eq, Debug, Deserialize)]
 pub struct Ref {
@@ -67,7 +62,7 @@ pub enum ObjectResponse {
         object: Object,
         #[serde(skip_serializing_if = "Option::is_none")]
         authenticated: Option<bool>,
-        actions: Actions,
+        actions: Box<Actions>,
     },
     Error {
         #[serde(flatten)]
@@ -81,7 +76,7 @@ impl ObjectResponse {
         ObjectResponse::Success {
             object,
             authenticated: None,
-            actions,
+            actions: Box::new(actions),
         }
     }
 
@@ -223,7 +218,7 @@ mod test {
                         size: 123,
                     },
                     authenticated: Some(true),
-                    actions: Actions::Download {
+                    actions: Box::new(Actions::Download {
                         download: Action {
                             href: Url::parse("https://some-download.com").unwrap(),
                             header: Some(
@@ -237,7 +232,7 @@ mod test {
                                 .unwrap()
                                 .into()
                         }
-                    }
+                    })
                 }],
             })
             .unwrap(),