Merge pull request #2027 from OpenBazaar/brian.fix-traavis

Upgrade golangci

Author: hoffmabc

.travis.yml

@@ -8,11 +8,11 @@ env:
   - "PATH=/home/travis/gopath/bin:$PATH"
 before_install:
   - go get -u github.com/axw/gocov/gocov github.com/mattn/goveralls github.com/tcnksm/ghr
-  - curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | bash -s -- -b $GOPATH/bin v1.15.0
+  - curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | bash -s -- -b $GOPATH/bin v1.23.3
 install:
   - echo "No external dependencies required. Skipping travis default library dependency setup to use vendors..."
 script:
-  - $GOPATH/bin/golangci-lint run --deadline 10m --new-from-rev=24dc0f64
+  - $GOPATH/bin/golangci-lint run --deadline 10m --new-from-rev=
   - cd $TRAVIS_BUILD_DIR && go test -i && ./test_compile.sh
   - goveralls -coverprofile=coverage.out -service travis-ci -repotoken $COVERALLS_TOKEN
 after_success:

api/jsonapi.go

@@ -3696,7 +3696,10 @@ func (i *jsonAPIHandler) POSTFetchRatings(w http.ResponseWriter, r *http.Request
 		id := r.URL.Query().Get("asyncID")
 		if id == "" {
 			idBytes := make([]byte, 16)
-			rand.Read(idBytes)
+			_, err := rand.Read(idBytes)
+			if err != nil {
+				return
+			}
 			id = base58.Encode(idBytes)
 		}
 

ipfs/config.go

@@ -15,7 +15,7 @@ import (
 	"github.com/ipfs/go-ipfs/repo"
 )
 
-var routerCacheURI string
+//var routerCacheURI string
 
 // UpdateIPFSGlobalProtocolVars is a hack to manage custom protocol strings
 // which do not yet have an API to manage their configuration
@@ -34,7 +34,7 @@ func UpdateIPFSGlobalProtocolVars(testnetEnable bool) {
 // PrepareIPFSConfig builds the configuration options for the internal
 // IPFS node.
 func PrepareIPFSConfig(r repo.Repo, routerAPIEndpoint string, testEnable, regtestEnable bool) *ipfscore.BuildCfg {
-	routerCacheURI = routerAPIEndpoint
+	//routerCacheURI = routerAPIEndpoint
 	ncfg := &ipfscore.BuildCfg{
 		Repo:   r,
 		Online: true,

repo/notification.go

@@ -450,7 +450,7 @@ func (n PaymentNotification) GetID() string             { return n.ID }
 func (n PaymentNotification) GetType() NotificationType { return NotifierTypePaymentNotification }
 func (n PaymentNotification) GetSMTPTitleAndBody() (string, string, bool) {
 	form := "Payment for order \"%s\" received (total %d)."
-	return "Payment received", fmt.Sprintf(form, n.OrderId, n.FundingTotal), true
+	return "Payment received", fmt.Sprintf(form, n.OrderId, n.FundingTotal.Amount), true
 }
 
 type OrderConfirmationNotification struct {