Use go-ipfs-http-client for request handling

.travis.yml

@@ -14,7 +14,6 @@ env:
     - GOTFLAGS="-race"
     - IPFS_PATH=/tmp/ipfs
   matrix:
-    - BUILD_DEPTYPE=gx
     - BUILD_DEPTYPE=gomod
 
 before_install:

add.go

@@ -9,37 +9,39 @@ import (
 	"path/filepath"
 
 	"github.com/ipfs/go-ipfs-files"
+
+	httpapi "github.com/ipfs/go-ipfs-http-client"
 )
 
 type object struct {
 	Hash string
 }
 
-type AddOpts = func(*RequestBuilder) error
+type AddOpts = func(httpapi.RequestBuilder) error
 
 func OnlyHash(enabled bool) AddOpts {
-	return func(rb *RequestBuilder) error {
+	return func(rb httpapi.RequestBuilder) error {
 		rb.Option("only-hash", enabled)
 		return nil
 	}
 }
 
 func Pin(enabled bool) AddOpts {
-	return func(rb *RequestBuilder) error {
+	return func(rb httpapi.RequestBuilder) error {
 		rb.Option("pin", enabled)
 		return nil
 	}
 }
 
 func Progress(enabled bool) AddOpts {
-	return func(rb *RequestBuilder) error {
+	return func(rb httpapi.RequestBuilder) error {
 		rb.Option("progress", enabled)
 		return nil
 	}
 }
 
 func RawLeaves(enabled bool) AddOpts {
-	return func(rb *RequestBuilder) error {
+	return func(rb httpapi.RequestBuilder) error {
 		rb.Option("raw-leaves", enabled)
 		return nil
 	}

go.mod

@@ -2,8 +2,10 @@ module github.com/ipfs/go-ipfs-api
 
 require (
 	github.com/cheekybits/is v0.0.0-20150225183255-68e9c0620927
-	github.com/ipfs/go-ipfs-files v0.0.1
+	github.com/ipfs/go-ipfs-files v0.0.2
+	github.com/ipfs/go-ipfs-http-client v0.0.3-0.20190510133820-0534b7ca8319
 	github.com/ipfs/go-ipfs-util v0.0.1
+	github.com/ipfs/interface-go-ipfs-core v0.0.7
 	github.com/libp2p/go-libp2p-metrics v0.0.1
 	github.com/libp2p/go-libp2p-peer v0.0.1
 	github.com/mitchellh/go-homedir v1.1.0

pubsub.go

@@ -4,6 +4,8 @@ import (
 	"encoding/json"
 
 	"github.com/libp2p/go-libp2p-peer"
+
+	httpapi "github.com/ipfs/go-ipfs-http-client"
 )
 
 // Message is a pubsub message.
@@ -16,10 +18,10 @@ type Message struct {
 
 // PubSubSubscription allow you to receive pubsub records that where published on the network.
 type PubSubSubscription struct {
-	resp *Response
+	resp *httpapi.Response
 }
 
-func newPubSubSubscription(resp *Response) *PubSubSubscription {
+func newPubSubSubscription(resp *httpapi.Response) *PubSubSubscription {
 	sub := &PubSubSubscription{
 		resp: resp,
 	}