Merge branch 'filecoinIntegration' of https://github.com/OpenBazaar/openbazaar-go into filecoinIntegration

Author: cpacia

.travis.yml

@@ -1,6 +1,6 @@
 language: go
 go:
-  - "1.11"
+  - "1.13"
 sudo: required
 services:
   - docker

Dockerfile

@@ -1,5 +1,5 @@
 # Build stage - Use a full build environment to create a static binary
-FROM golang:1.11
+FROM golang:1.13
 COPY . /go/src/github.com/OpenBazaar/openbazaar-go
 RUN go build --ldflags '-extldflags "-static"' -o /opt/openbazaard /go/src/github.com/OpenBazaar/openbazaar-go
 

Godeps/Godeps.json

@@ -100,7 +100,7 @@ func TestTxnsGet(t *testing.T) {
 	if err != nil {
 		t.Error(err)
 	}
-	txn, err := txdb.Get(tx.TxHash())
+	txn, err := txdb.Get(tx.TxHash().String())
 	if err != nil {
 		t.Error(err)
 	}
@@ -208,11 +208,11 @@ func TestTxnsDB_UpdateHeight(t *testing.T) {
 	if err != nil {
 		t.Error(err)
 	}
-	err = txdb.UpdateHeight(tx.TxHash(), -1, time.Now())
+	err = txdb.UpdateHeight(tx.TxHash().String(), -1, time.Now())
 	if err != nil {
 		t.Error(err)
 	}
-	txn, err := txdb.Get(tx.TxHash())
+	txn, err := txdb.Get(tx.TxHash().String())
 	if err != nil {
 		t.Error(err)
 	}