Merge pull request #20 from RTradeLtd/fix/changes

Minor Merge Cleanup

Author: postables

.travis.yml

@@ -1,42 +1,22 @@
-os:
-  - linux
-
 language: go
-
+sudo: required
 go:
-  - 1.11.x
-
+  - "1.12"
 services:
-  - docker
-
-env:
-  global:
-    - GOTFLAGS="-race"
-    - IPFS_PATH=/tmp/ipfs
-  matrix:
-    - BUILD_DEPTYPE=gx
-    - BUILD_DEPTYPE=gomod
+- docker
+env: GO111MODULE=on
 
-before_install:
-  - docker pull ipfs/go-ipfs:master
-  - mkdir /tmp/ipfs && chmod 0777 /tmp/ipfs
-  - docker run -d -v /tmp/ipfs:/data/ipfs -p 8080:8080 -p 4001:4001 -p 5001:5001 ipfs/go-ipfs:master --enable-pubsub-experiment
-
-
-# disable travis install
-install:
-  - true
+before_script:
+  - go vet ./...
+  - go build ./...
+  - go test -run xxxx ./...
+  - make testenv
 
 script:
-  - go get -d -t github.com/cheekybits/is/... # remove with gx
-  - bash <(curl -s https://raw.githubusercontent.com/ipfs/ci-helpers/master/travis-ci/run-standard-tests.sh)
-
+ - go test -race -failfast -coverprofile=coverage.txt ./...
 
-cache:
-  directories:
-    - $GOPATH/src/gx
-    - $GOPATH/pkg/mod
-    - $HOME/.cache/go-build
+after_success:
+- bash <(curl -s https://codecov.io/bash)
 
 notifications:
   email: false

Makefile

@@ -1,16 +1,21 @@
-all: deps
-gx:
-	go get github.com/whyrusleeping/gx
-	go get github.com/whyrusleeping/gx-go
-deps: gx
-	gx --verbose install --global
-	gx-go rewrite
-.PHONY: all gx deps
+GO=env GO111MODULE=on go
+GONOMOD=env GO111MODULE=off go
 
+.PHONY: deps
+deps:
+	$(GO) mod vendor
+	$(GO) mod verify
+		
 # Set up test environment
 .PHONY: testenv
 WAIT=3
 testenv:
 	@echo "===================   preparing test env    ==================="
 	( cd testenv ; make testenv )
 	@echo "===================          done           ==================="
+
+.PHONY: clean
+clean:
+	@echo "===================   stopping test env    ==================="
+	( cd testenv ; make clean )
+	@echo "===================          done           ==================="

go.mod

@@ -1,13 +1,15 @@
 module github.com/ipfs/go-ipfs-api
 
 require (
+	github.com/RTradeLtd/go-ipfs-api v2.0.9+incompatible
 	github.com/cheekybits/is v0.0.0-20150225183255-68e9c0620927
 	github.com/ipfs/go-ipfs-files v0.0.1
-	github.com/ipfs/go-ipfs-util v0.0.1
+	github.com/ipfs/go-ipfs-util v0.0.1 // indirect
 	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
 	github.com/multiformats/go-multiaddr v0.0.1
 	github.com/multiformats/go-multiaddr-net v0.0.1
+	github.com/whyrusleeping/gx v0.14.2 // indirect
 	github.com/whyrusleeping/tar-utils v0.0.0-20180509141711-8c6c8ba81d5c
 )

go.sum

@@ -1,3 +1,5 @@
+github.com/RTradeLtd/go-ipfs-api v2.0.9+incompatible h1:LBG4bj/5X2YLXrKbADnCxfj1CDtN9hLsd22A68O9m7U=
+github.com/RTradeLtd/go-ipfs-api v2.0.9+incompatible/go.mod h1:gNXXZcJz7PkDXtUhjrlf4pSgDVV7yhVKQvLWUO/5k9o=
 github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII=
 github.com/btcsuite/btcd v0.0.0-20190213025234-306aecffea32 h1:qkOC5Gd33k54tobS36cXdAzJbeHaduLtnLQQwNoIi78=
 github.com/btcsuite/btcd v0.0.0-20190213025234-306aecffea32/go.mod h1:DrZx5ec/dmnfpw9KyYoQyYo7d0KEvTkk/5M/vbZjAr8=
@@ -59,6 +61,7 @@ github.com/multiformats/go-multihash v0.0.1/go.mod h1:w/5tugSrLEbWqlcgJabL3oHFKT
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
+github.com/whyrusleeping/gx v0.14.2/go.mod h1:e7k5R8Ndb9Ocdv8fWAeyg9uqjRuLl19xi/SvpGS0UuU=
 github.com/whyrusleeping/tar-utils v0.0.0-20180509141711-8c6c8ba81d5c h1:GGsyl0dZ2jJgVT+VvWBf/cNijrHRhkrTjkmp5wg7li0=
 github.com/whyrusleeping/tar-utils v0.0.0-20180509141711-8c6c8ba81d5c/go.mod h1:xxcJeBb7SIUl/Wzkz1eVKJE/CB34YNrqX2TQI6jY9zs=
 golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=

pubsub.go

@@ -1,11 +1,9 @@
 package shell
 
 import (
-	"encoding/binary"
 	"encoding/json"
 
-	"github.com/libp2p/go-libp2p-peer"
-	pb "github.com/libp2p/go-libp2p-pubsub/pb"
+	peer "github.com/libp2p/go-libp2p-peer"
 )
 
 // Message is a pubsub message.
@@ -16,36 +14,6 @@ type Message struct {
 	TopicIDs []string
 }
 
-type message struct {
-	*pb.Message
-}
-
-func (m *message) GetFrom() peer.ID {
-	return peer.ID(m.Message.GetFrom())
-}
-
-type floodsubRecord struct {
-	msg *message
-}
-
-func (r floodsubRecord) From() peer.ID {
-	return r.msg.GetFrom()
-}
-
-func (r floodsubRecord) Data() []byte {
-	return r.msg.GetData()
-}
-
-func (r floodsubRecord) SeqNo() int64 {
-	return int64(binary.BigEndian.Uint64(r.msg.GetSeqno()))
-}
-
-func (r floodsubRecord) TopicIDs() []string {
-	return r.msg.GetTopicIDs()
-}
-
-///
-
 // PubSubSubscription allow you to receive pubsub records that where published on the network.
 type PubSubSubscription struct {
 	resp *Response
@@ -60,7 +28,7 @@ func newPubSubSubscription(resp *Response) *PubSubSubscription {
 }
 
 // Next waits for the next record and returns that.
-func (s *PubSubSubscription) Next() (PubSubRecord, error) {
+func (s *PubSubSubscription) Next() (*Message, error) {
 	if s.resp.Error != nil {
 		return nil, s.resp.Error
 	}

shell.go

@@ -82,7 +82,7 @@ func NewShell(url string) *Shell {
 func NewDirectShell(url string) *Shell {
 	return &Shell{
 		url: url,
-		httpcli: &gohttp.Client{
+		httpcli: gohttp.Client{
 			Transport: &gohttp.Transport{
 				Proxy:             gohttp.ProxyFromEnvironment,
 				DisableKeepAlives: true,
@@ -118,7 +118,7 @@ func NewShellWithClient(url string, c *gohttp.Client) *Shell {
 func (s *Shell) WithAuthorization(token string) *Shell {
 	return &Shell{
 		url: s.url,
-		httpcli: &gohttp.Client{
+		httpcli: gohttp.Client{
 			Transport: newAuthenticatedTransport(s.httpcli.Transport, token),
 		},
 	}
@@ -160,18 +160,6 @@ func (s *Shell) ID(peer ...string) (*IdOutput, error) {
 	return &out, nil
 }
 
-// Cat the content at the given path. Callers need to drain and close the returned reader after usage.
-func (s *Shell) CatGet(path string) (io.ReadCloser, error) {
-	resp, err := NewRequest(context.Background(), s.url, "cat", path).SendGET(s.httpcli)
-	if err != nil {
-		return nil, err
-	}
-	if resp.Error != nil {
-		return nil, resp.Error
-	}
-	return resp.Output, nil
-}
-
 // Cat the content at the given path. Callers need to drain and close the returned reader after usage.
 func (s *Shell) Cat(path string) (io.ReadCloser, error) {
 	resp, err := s.Request("cat", path).Send(context.Background())