From 4c2ce469aa3c6d776a23a7b3652b5cbe628ee179 Mon Sep 17 00:00:00 2001
From: Svarog <feanorr@gmail.com>
Date: Mon, 5 Nov 2018 14:29:33 +0200
Subject: [PATCH] [DEV-265] Fixed dockerfile to actually run golint and gofmt +
 fix gofmt errors (#122)

---
 docker/Dockerfile            |  5 ++---
 util/bech32/internal_test.go | 12 ++++++------
 util/certgen.go              |  2 +-
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 374925393..6dac4249c 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -19,10 +19,9 @@ RUN dep ensure -v -vendor-only
 
 COPY . .
 
-RUN TEST_DIRS=`go list -f {{.Dir}} ./... | grep -v /vendor/`
-RUN GOFMT_RESULT=`gofmt -l $TEST_DIRS`; echo $GOFMT_RESULT; test -z "$GOFMT_RESULT"
+RUN TEST_DIRS=`go list -f {{.Dir}} ./... | grep -v /vendor/` GOFMT_RESULT=`gofmt -l $TEST_DIRS`; echo $GOFMT_RESULT; test -z "$GOFMT_RESULT"
 RUN go vet ./...
-RUN golint -set_exit_status $TEST_DIRS
+RUN TEST_DIRS=`go list -f {{.Dir}} ./... | grep -v /vendor/` golint -set_exit_status $TEST_DIRS
 # RUN aligncheck ./...
 # RUN structcheck -e ./...
 # RUN varcheck -e ./...
diff --git a/util/bech32/internal_test.go b/util/bech32/internal_test.go
index 007b7ac9d..79a3678ef 100644
--- a/util/bech32/internal_test.go
+++ b/util/bech32/internal_test.go
@@ -21,12 +21,12 @@ func TestBech32(t *testing.T) {
 		{"::qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq40ku0e3z", true},
 		{"split:checkupstagehandshakeupstreamerranterredcaperred3za27wc5", true},
 		{"aaa:bbb", false}, // too short
-		{"split:checkupstagehandshakeupstreamerranterredCaperred3za27wc5", false},                   // mixed uppercase and lowercase
-		{"split:checkupstagehandshakeupstreamerranterredcaperred3za28wc5", false},                   // invalid checksum
-		{"s lit:checkupstagehandshakeupstreamerranterredcaperred3za27wc5", false},                   // invalid character (space) in prefix
-		{"spl" + string(127) + "t:checkupstagehandshakeupstreamerranterredcaperred3za27wc5", false}, // invalid character (DEL) in prefix
-		{"split:cheosgds2s3c", false}, // invalid character (o) in data part
-		{"split:te5peu7", false},      // too short data part
+		{"split:checkupstagehandshakeupstreamerranterredCaperred3za27wc5", false},                              // mixed uppercase and lowercase
+		{"split:checkupstagehandshakeupstreamerranterredcaperred3za28wc5", false},                              // invalid checksum
+		{"s lit:checkupstagehandshakeupstreamerranterredcaperred3za27wc5", false},                              // invalid character (space) in prefix
+		{"spl" + string(127) + "t:checkupstagehandshakeupstreamerranterredcaperred3za27wc5", false},            // invalid character (DEL) in prefix
+		{"split:cheosgds2s3c", false},                                                                          // invalid character (o) in data part
+		{"split:te5peu7", false},                                                                               // too short data part
 		{":checkupstagehandshakeupstreamerranterredcaperred3za27wc5", false},                                   // empty prefix
 		{"::qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq40ku0e3z", false}, // too long
 		{"bitcoincash:qr6m7j9njldwwzlg9v7v53unlr4jkmx6eylep8ekg2", true},
diff --git a/util/certgen.go b/util/certgen.go
index 6643aa0a5..3ffee65a4 100644
--- a/util/certgen.go
+++ b/util/certgen.go
@@ -110,7 +110,7 @@ func NewTLSCertPair(organization string, validUntil time.Time, extraHosts []stri
 
 		KeyUsage: x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature |
 			x509.KeyUsageCertSign,
-		IsCA:                  true, // so can sign self.
+		IsCA: true, // so can sign self.
 		BasicConstraintsValid: true,
 
 		DNSNames:    dnsNames,