fix staticcheck issues

jackjhy · Apr 29, 2020 · b121f62 · b121f62
1 parent 7dd5539
commit b121f62
Show file tree

Hide file tree

Showing 8 changed files with 64 additions and 65 deletions.
diff --git a/cmd/gryffin-distributed/main.go b/cmd/gryffin-distributed/main.go
@@ -25,16 +25,19 @@ import (
 	"github.com/yahoo/gryffin/renderer"
 )
 
-var storage = flag.String("storage", "memory", "storag method or the storage url")
-var service string
-var url string
-var wg sync.WaitGroup
-var wq chan bool
-
-var t *gryffin.Scan
-
-var logWriter io.Writer
-var store *gryffin.GryffinStore
+var (
+	// storage is currently unused - TODO: use or remove
+	// storage = flag.String("storage", "memory", "storag method or the storage url")
+	service string
+	url     string
+	wg      sync.WaitGroup
+	wq      chan bool
+
+	t *gryffin.Scan
+
+	logWriter io.Writer
+	store     *gryffin.GryffinStore
+)
 
 // var method = flag.String("method", "GET", "the HTTP method for the request.")
 // var url string
@@ -47,11 +50,6 @@ func usage() {
 	flag.PrintDefaults()
 }
 
-// handler
-type h struct {
-	HandleMessage nsq.HandlerFunc
-}
-
 func captureCtrlC() {
 	sigChan := make(chan os.Signal, 1)
 	signal.Notify(sigChan, syscall.SIGINT, syscall.SIGTERM)

diff --git a/cmd/gryffin-standalone/main.go b/cmd/gryffin-standalone/main.go
@@ -124,16 +124,18 @@ func linkChannels(s *gryffin.Scan) {
 	// Start, Poke -> RateLimit
 	go func() {
 		for scan := range chanStart {
-			err := scan.Poke(&http.Client{})
-			if err != nil {
-				// if scan.HitCount <= 5 {
-				// 	go func() {
-				// 		time.Sleep(5 * time.Second)
-				// 		chanStart <- scan
-				// 	}()
-				// }
-				// continue
-			}
+			// TODO: add error handling
+			// err := scan.Poke(&http.Client{})
+			_ = scan.Poke(&http.Client{})
+			// if err != nil {
+			// if scan.HitCount <= 5 {
+			// 	go func() {
+			// 		time.Sleep(5 * time.Second)
+			// 		chanStart <- scan
+			// 	}()
+			// }
+			// continue
+			// }
 			chanRateLimit <- scan
 		}
 	}()

diff --git a/data/memory.go b/data/memory.go
@@ -73,58 +73,58 @@ func NewMemoryStore() *MemoryStore {
 func convertIntToPtr(v interface{}) (s *int64, ok bool) {
 	var t int64
 
-	switch v.(type) {
+	switch v := v.(type) {
 
 	case int:
-		t = int64(v.(int))
+		t = int64(v)
 	case int8:
-		t = int64(v.(int8))
+		t = int64(v)
 	case int16:
-		t = int64(v.(int16))
+		t = int64(v)
 	case int32:
-		t = int64(v.(int32))
+		t = int64(v)
 	case int64:
-		t = int64(v.(int64))
+		t = v
 	case uint:
-		t = int64(v.(uint))
+		t = int64(v)
 	case uint8:
-		t = int64(v.(uint8))
+		t = int64(v)
 	case uint16:
-		t = int64(v.(uint16))
+		t = int64(v)
 	case uint32:
-		t = int64(v.(uint32))
+		t = int64(v)
 	case uint64:
-		t = int64(v.(uint64))
+		t = int64(v)
 	}
 
 	return &t, ok
 }
 
 func convertPtrToInt(v interface{}) (s int64, ok bool) {
 
-	switch v.(type) {
+	switch v := v.(type) {
 
 	case *int:
-		return int64(*(v.(*int))), true
+		return int64(*v), true
 	case *int8:
-		return int64(*(v.(*int8))), true
+		return int64(*v), true
 	case *int16:
-		return int64(*(v.(*int16))), true
+		return int64(*v), true
 	case *int32:
-		return int64(*(v.(*int32))), true
+		return int64(*v), true
 	case *int64:
-		return int64(*(v.(*int64))), true
+		return *v, true
 
 	case *uint:
-		return int64(*(v.(*uint))), true
+		return int64(*v), true
 	case *uint8:
-		return int64(*(v.(*uint8))), true
+		return int64(*v), true
 	case *uint16:
-		return int64(*(v.(*uint16))), true
+		return int64(*v), true
 	case *uint32:
-		return int64(*(v.(*uint32))), true
+		return int64(*v), true
 	case *uint64:
-		return int64(*(v.(*uint64))), true
+		return int64(*v), true
 	}
 
 	return

diff --git a/gryffin.go b/gryffin.go
@@ -148,9 +148,9 @@ func (s *Scan) MergeRequest(req *http.Request) {
 	}
 
 	// TODO - drop if Method, URL, Body are same..
-	if req == s.Request {
-		// s.Logf("Result after merge generate same request.", nil)
-	}
+	// if req == s.Request {
+	// s.Logf("Result after merge generate same request.", nil)
+	// }
 
 	// swap
 	prevReq := s.Request
@@ -213,9 +213,9 @@ func (s *Scan) Poke(client HTTPDoer) (err error) {
 	s.Logm("Poke", "Poking")
 
 	// Add 5s timeout if it is http.Client
-	switch client.(type) {
+	switch client := client.(type) {
 	case *http.Client:
-		client.(*http.Client).Timeout = time.Duration(3) * time.Second
+		client.Timeout = time.Duration(3) * time.Second
 	}
 
 	// delete the similarity case for the domain.
@@ -264,9 +264,9 @@ func (s *Scan) UpdateFingerprint() {
 		if f.Request == 0 {
 			f.Request = hash(s.Request.URL.String() + "\n" + s.RequestBody)
 		}
-		if f.RequestFull == 0 {
-			// TODO
-		}
+		// if f.RequestFull == 0 {
+		// TODO
+		// }
 	}
 
 	if f.ResponseSimilarity == 0 {

diff --git a/gryffin_test.go b/gryffin_test.go
@@ -35,7 +35,6 @@ func TestNewScan(t *testing.T) {
 		t.Error("Scan is nil.")
 	}
 	// TODO - verify s.DomainAllowed.
-	t.Logf("Jobid: %s.", s.Job.ID)
 }
 
 func TestNewScanInvalid(t *testing.T) {

diff --git a/renderer/base_test.go b/renderer/base_test.go
@@ -20,8 +20,7 @@ func testCrawlAsync(t *testing.T, r gryffin.Renderer) {
 
 	s := gryffin.NewScan("GET", url, "")
 	r.Do(s)
-	s = <-r.GetRequestBody()
-	// t.Logf("Got async body %s", s)
+	<-r.GetRequestBody()
 	for link := range r.GetLinks() {
 		t.Logf("Got link %s", link.Request.URL)
 	}

diff --git a/renderer/noscript.go b/renderer/noscript.go
@@ -10,6 +10,7 @@ import (
 	"net/http"
 	"strings"
 	"time"
+
 	// "sync"
 
 	"github.com/yahoo/gryffin"
@@ -75,9 +76,10 @@ func (r *NoScriptRenderer) Do(s *gryffin.Scan) {
 									if link.IsScanAllowed() {
 										r.chanLinks <- link
 									}
-								} else {
-									// ignore relative URL. TOFIX.
 								}
+								// else {
+								// FIXME: ignore relative URL.
+								// }
 							} else {
 								log.Printf("error in building request: %s", err)
 							}

diff --git a/session.go b/session.go
@@ -10,17 +10,16 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/yahoo/gryffin/data"
-	"github.com/yahoo/gryffin/html-distance"
+	distance "github.com/yahoo/gryffin/html-distance"
 )
 
 type GryffinStore struct {
 	Oracles map[string]*distance.Oracle
 	Hashes  map[string]bool
 	Hits    map[string]int
-	store   data.Store
-	snd     chan []byte
-	rcv     chan []byte
+	// store   data.Store - currently unused, TODO: use or remove
+	snd chan []byte
+	rcv chan []byte
 }
 
 type PublishMessage struct {