From d617bb5480830e5e4d67292aa9d77008f8dc7279 Mon Sep 17 00:00:00 2001
From: Alan Lu <alanlu1023@gmail.com>
Date: Fri, 15 May 2020 11:07:11 -0500
Subject: Only use POST for IPFS v0.5 compat

---
 ipfs-api/src/client.rs         | 9 +++++----
 ipfs-api/src/request/add.rs    | 3 ---
 ipfs-api/src/request/block.rs  | 3 ---
 ipfs-api/src/request/config.rs | 3 ---
 ipfs-api/src/request/dag.rs    | 3 ---
 ipfs-api/src/request/files.rs  | 3 ---
 ipfs-api/src/request/mod.rs    | 4 ----
 ipfs-api/src/request/tar.rs    | 3 ---
 8 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/ipfs-api/src/client.rs b/ipfs-api/src/client.rs
index 3a37cf0..67c5d3d 100644
--- a/ipfs-api/src/client.rs
+++ b/ipfs-api/src/client.rs
@@ -144,8 +144,9 @@ impl IpfsClient {
         #[cfg(feature = "hyper")]
         {
             url.parse::<Uri>().map_err(From::from).and_then(move |url| {
-                let builder = http::Request::builder();
-                let builder = builder.method(Req::METHOD.clone()).uri(url);
+                let builder = http::Request::builder()
+                    .method("POST")
+                    .uri(url);
 
                 let req = if let Some(form) = form {
                     form.set_body_convert::<hyper::Body, multipart::Body>(builder)
@@ -160,10 +161,10 @@ impl IpfsClient {
         {
             let req = if let Some(form) = form {
                 self.client
-                    .request(Req::METHOD.clone(), url)
+                    .post(url)
                     .content_type(form.content_type())
             } else {
-                self.client.request(Req::METHOD.clone(), url)
+                self.client.post(url)
             };
 
             Ok(req.timeout(std::time::Duration::from_secs(90)))
diff --git a/ipfs-api/src/request/add.rs b/ipfs-api/src/request/add.rs
index cf11fb5..70eb89a 100644
--- a/ipfs-api/src/request/add.rs
+++ b/ipfs-api/src/request/add.rs
@@ -7,7 +7,6 @@
 //
 
 use crate::request::ApiRequest;
-use http::Method;
 
 pub struct Add;
 
@@ -15,6 +14,4 @@ impl_skip_serialize!(Add);
 
 impl ApiRequest for Add {
     const PATH: &'static str = "/add";
-
-    const METHOD: &'static Method = &Method::POST;
 }
diff --git a/ipfs-api/src/request/block.rs b/ipfs-api/src/request/block.rs
index 377dc51..2f48d73 100644
--- a/ipfs-api/src/request/block.rs
+++ b/ipfs-api/src/request/block.rs
@@ -8,7 +8,6 @@
 
 use crate::request::ApiRequest;
 use crate::serde::Serialize;
-use http::Method;
 
 #[derive(Serialize)]
 pub struct BlockGet<'a> {
@@ -26,8 +25,6 @@ impl_skip_serialize!(BlockPut);
 
 impl ApiRequest for BlockPut {
     const PATH: &'static str = "/block/put";
-
-    const METHOD: &'static Method = &Method::POST;
 }
 
 #[derive(Serialize)]
diff --git a/ipfs-api/src/request/config.rs b/ipfs-api/src/request/config.rs
index 415eb8b..a6d5c58 100644
--- a/ipfs-api/src/request/config.rs
+++ b/ipfs-api/src/request/config.rs
@@ -7,7 +7,6 @@
 //
 
 use crate::request::ApiRequest;
-use http::Method;
 
 pub struct ConfigEdit;
 
@@ -23,8 +22,6 @@ impl_skip_serialize!(ConfigReplace);
 
 impl ApiRequest for ConfigReplace {
     const PATH: &'static str = "/config/replace";
-
-    const METHOD: &'static Method = &Method::POST;
 }
 
 pub struct ConfigShow;
diff --git a/ipfs-api/src/request/dag.rs b/ipfs-api/src/request/dag.rs
index 630a93a..4e2bde3 100644
--- a/ipfs-api/src/request/dag.rs
+++ b/ipfs-api/src/request/dag.rs
@@ -8,7 +8,6 @@
 
 use crate::request::ApiRequest;
 use crate::serde::Serialize;
-use http::Method;
 
 #[derive(Serialize)]
 pub struct DagGet<'a> {
@@ -27,6 +26,4 @@ impl_skip_serialize!(DagPut);
 
 impl ApiRequest for DagPut {
     const PATH: &'static str = "/dag/put";
-
-    const METHOD: &'static Method = &Method::POST;
 }
diff --git a/ipfs-api/src/request/files.rs b/ipfs-api/src/request/files.rs
index 0233021..3ec4186 100644
--- a/ipfs-api/src/request/files.rs
+++ b/ipfs-api/src/request/files.rs
@@ -8,7 +8,6 @@
 
 use crate::request::ApiRequest;
 use crate::serde::Serialize;
-use http::Method;
 
 #[derive(Serialize)]
 pub struct FilesCp<'a> {
@@ -112,6 +111,4 @@ pub struct FilesWrite<'a> {
 
 impl<'a> ApiRequest for FilesWrite<'a> {
     const PATH: &'static str = "/files/write";
-
-    const METHOD: &'static Method = &Method::POST;
 }
diff --git a/ipfs-api/src/request/mod.rs b/ipfs-api/src/request/mod.rs
index 52df37c..bdb983c 100644
--- a/ipfs-api/src/request/mod.rs
+++ b/ipfs-api/src/request/mod.rs
@@ -106,8 +106,4 @@ pub trait ApiRequest {
     /// All paths should begin with '/'.
     ///
     const PATH: &'static str;
-
-    /// Method used to make the request.
-    ///
-    const METHOD: &'static ::http::Method = &::http::Method::GET;
 }
diff --git a/ipfs-api/src/request/tar.rs b/ipfs-api/src/request/tar.rs
index 6129521..1e7c247 100644
--- a/ipfs-api/src/request/tar.rs
+++ b/ipfs-api/src/request/tar.rs
@@ -8,7 +8,6 @@
 
 use crate::request::ApiRequest;
 use crate::serde::Serialize;
-use http::Method;
 
 pub struct TarAdd;
 
@@ -16,8 +15,6 @@ impl_skip_serialize!(TarAdd);
 
 impl ApiRequest for TarAdd {
     const PATH: &'static str = "/tar/add";
-
-    const METHOD: &'static Method = &Method::POST;
 }
 
 #[derive(Serialize)]
-- 
cgit v1.2.3