fixes for go 1.10 (#15)

Author: evq

.travis.yml

@@ -5,8 +5,9 @@ branches:
   only:
   - master
 go:
-- 1.9
-- master
+- "1.9"
+- "1.10"
+- "master"
 services:
 - redis-server
 matrix:

README.md

@@ -5,7 +5,7 @@ Status](https://travis-ci.org/brave-intl/bat-go.svg?branch=master)](https://trav
 
 ## Developer Setup
 
-1. [Install Go 1.9](https://golang.org/doc/install)
+1. [Install Go 1.10](https://golang.org/doc/install)
 
 2. Run `go get -d github.com/brave-intl/bat-go`. 
 

bin/create-tokens/main.go

@@ -78,7 +78,7 @@ func main() {
 	if len(*expiryDateStr) > 0 {
 		expiryDate, err = time.Parse(dateFormat, *expiryDateStr)
 		if err != nil {
-			log.Fatalln("%s is not a valid ISO 8601 datetime", *expiryDateStr)
+			log.Fatalf("%s is not a valid ISO 8601 datetime\n", *expiryDateStr)
 		}
 	} else {
 		expiryDate = maturityDate.AddDate(0, 0, int(*validWeeks)*7)

controllers/grants.go

@@ -86,7 +86,7 @@ func ClaimGrant(w http.ResponseWriter, r *http.Request) {
 
 	conn := datastore.GetRedisConn(r.Context())
 	// FIXME TODO clean this up via a better abstraction
-	if _, err := redis.Int((*conn).Do("ZINCRBY", "count:claimed:ip", "1", r.RemoteAddr)); err != nil {
+	if _, err = redis.Int((*conn).Do("ZINCRBY", "count:claimed:ip", "1", r.RemoteAddr)); err != nil {
 		raven.CaptureMessage("Could not increment claim count for ip.", map[string]string{"IP": r.RemoteAddr})
 	}
 	if err = (*conn).Close(); err != nil {

wallet/provider/uphold/errors.go

@@ -17,9 +17,9 @@ type upholdDenominationValidationErrors struct {
 }
 
 type upholdDenominationErrors struct {
-	Code                               string `json:"code"`
-	upholdDenominationValidationErrors `json:"errors,omitempty"`
-	Data                               json.RawMessage `json:",omitempty"`
+	Code             string                             `json:"code"`
+	ValidationErrors upholdDenominationValidationErrors `json:"errors,omitempty"`
+	Data             json.RawMessage                    `json:",omitempty"`
 }
 
 type upholdValidationErrors struct {
@@ -44,12 +44,12 @@ func (uhErr upholdError) DenominationError() bool {
 }
 
 func (uhErr upholdError) AmountError() bool {
-	return uhErr.DenominationError() && len(uhErr.ValidationErrors.DenominationErrors.AmountError) > 0
+	return uhErr.DenominationError() && len(uhErr.ValidationErrors.DenominationErrors.ValidationErrors.AmountError) > 0
 }
 
 func (uhErr upholdError) InsufficientBalance() bool {
 	if uhErr.AmountError() {
-		for _, ae := range uhErr.ValidationErrors.DenominationErrors.AmountError {
+		for _, ae := range uhErr.ValidationErrors.DenominationErrors.ValidationErrors.AmountError {
 			if ae.Code == "sufficient_funds" {
 				return true
 			}
@@ -64,7 +64,7 @@ func (uhErr upholdError) InvalidSignature() bool {
 
 func (uhErr upholdError) String() string {
 	if uhErr.InsufficientBalance() {
-		for _, ae := range uhErr.ValidationErrors.DenominationErrors.AmountError {
+		for _, ae := range uhErr.ValidationErrors.DenominationErrors.ValidationErrors.AmountError {
 			if ae.Code == "sufficient_funds" {
 				return ae.Message
 			}