golangci-lint/CI: Bump versions and introduce new linters (#798)

* golangci-lint/CI: Bump versions

Fix remaining linter issues

* Specifically set AppVeyor version

* Fix the infamous typos 👀

* Add go env cmd to AppVeyor

* Add go version cmd to AppVeyor

* Specify AppVeyor image, adjust linters

* Update go get to go install due to deprecation

* Bump golangci-lint timeout time for AppVeyor

* Change NW contract to NQ

* Address nitters

* GetRandomPair -> Pair{}

* Address nits

* Address time nitterinos plus additional tweaks

* More time inception upgrades!

* Bending time and space
This commit is contained in:
Adrian Gallagher
2021-10-14 16:38:53 +11:00
committed by GitHub
parent 0a91af0f2e
commit f0d45aa1d2
194 changed files with 1506 additions and 1233 deletions

View File

@@ -48,8 +48,7 @@ func (m *Match) IncomingWithData(signature interface{}, data []byte) bool {
func (m *Match) set(signature interface{}) (matcher, error) {
var ch chan []byte
m.Lock()
_, ok := m.m[signature]
if ok {
if _, ok := m.m[signature]; ok {
m.Unlock()
return matcher{}, errors.New("signature collision")
}

View File

@@ -42,9 +42,8 @@ func TestMatch(t *testing.T) {
fmt.Println("should not have been able to match")
}
data := <-m.C
if data != nil {
t.Fatal("wow")
if data := <-m.C; data != nil {
t.Fatal("data chan should be nil")
}
m.Cleanup()

View File

@@ -475,8 +475,7 @@ func (w *Websocket) FlushChannels() error {
return nil
}
err := w.Shutdown()
if err != nil {
if err := w.Shutdown(); err != nil {
return err
}
return w.Connect()
@@ -867,8 +866,7 @@ func (w *Websocket) SubscribeToChannels(channels []ChannelSubscription) error {
}
}
}
err := w.Subscriber(channels)
if err != nil {
if err := w.Subscriber(channels); err != nil {
return fmt.Errorf("%v %w: %v", w.exchangeName, ErrSubscriptionFailure, err)
}
return nil

View File

@@ -167,8 +167,7 @@ func TestSetup(t *testing.T) {
func TestTrafficMonitorTimeout(t *testing.T) {
t.Parallel()
ws := *New()
err := ws.Setup(defaultSetup)
if err != nil {
if err := ws.Setup(defaultSetup); err != nil {
t.Fatal(err)
}
ws.trafficTimeout = time.Second * 2
@@ -650,6 +649,7 @@ func TestDial(t *testing.T) {
for i := range testCases {
testData := &testCases[i]
t.Run(testData.WC.ExchangeName, func(t *testing.T) {
t.Parallel()
if testData.WC.ProxyURL != "" && !useProxyTests {
t.Skip("Proxy testing not enabled, skipping")
}
@@ -697,6 +697,7 @@ func TestSendMessage(t *testing.T) {
for i := range testCases {
testData := &testCases[i]
t.Run(testData.WC.ExchangeName, func(t *testing.T) {
t.Parallel()
if testData.WC.ProxyURL != "" && !useProxyTests {
t.Skip("Proxy testing not enabled, skipping")
}
@@ -737,7 +738,7 @@ func TestSendMessageWithResponse(t *testing.T) {
t.Fatal(err)
}
go readMessages(wc, t)
go readMessages(t, wc)
request := testRequest{
Event: "subscribe",
@@ -755,7 +756,8 @@ func TestSendMessageWithResponse(t *testing.T) {
}
// readMessages helper func
func readMessages(wc *WebsocketConnection, t *testing.T) {
func readMessages(t *testing.T, wc *WebsocketConnection) {
t.Helper()
timer := time.NewTimer(20 * time.Second)
for {
select {