Skip to content

Commit 4bb568c

Browse files
thiagodeevthiagodeev
committed
Fixes linter and test errors
1 parent 05d7e90 commit 4bb568c

12 files changed

+41
-50
lines changed

‎account/account_test.go

+4-12
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"context"
55
"encoding/json"
66
"flag"
7-
"fmt"
87
"math/big"
98
"os"
109
"testing"
@@ -18,7 +17,6 @@ import (
1817
"github.com/NethermindEth/starknet.go/mocks"
1918
"github.com/NethermindEth/starknet.go/rpc"
2019
"github.com/NethermindEth/starknet.go/utils"
21-
"github.com/joho/godotenv"
2220
"github.com/stretchr/testify/require"
2321
"go.uber.org/mock/gomock"
2422
)
@@ -43,18 +41,12 @@ var (
4341
//
4442
// none
4543
func TestMain(m *testing.M) {
46-
flag.StringVar(&testEnv, "env", "mock", "set the test environment")
44+
flag.StringVar(&testEnv, "env", "devnet", "set the test environment")
4745
flag.Parse()
4846
if testEnv == "mock" {
4947
return
5048
}
51-
base = os.Getenv("INTEGRATION_BASE")
52-
if base == "" {
53-
if err := godotenv.Load(fmt.Sprintf(".env.%s", testEnv)); err != nil {
54-
panic(fmt.Sprintf("Failed to load .env.%s, err: %s", testEnv, err))
55-
}
56-
base = os.Getenv("INTEGRATION_BASE")
57-
}
49+
base = "http://localhost:5050"
5850
os.Exit(m.Run())
5951
}
6052

@@ -1076,7 +1068,7 @@ func TestWaitForTransactionReceipt(t *testing.T) {
10761068
Timeout: 3, // Should poll 3 times
10771069
Hash: new(felt.Felt).SetUint64(100),
10781070
ExpectedReceipt: rpc.TransactionReceipt{},
1079-
ExpectedErr: rpc.Err(rpc.InternalError, &rpc.RPCData{Message: "Post \"http://localhost:5050\": context deadline exceeded"}),
1071+
ExpectedErr: rpc.Err(rpc.InternalError, &rpc.RPCData{Message: "context deadline exceeded"}),
10801072
},
10811073
},
10821074
}[testEnv]
@@ -1090,7 +1082,7 @@ func TestWaitForTransactionReceipt(t *testing.T) {
10901082
rpcErr, ok := err.(*rpc.RPCError)
10911083
require.True(t, ok)
10921084
require.Equal(t, test.ExpectedErr.Code, rpcErr.Code)
1093-
require.Equal(t, test.ExpectedErr.Data.Message, rpcErr.Data.Message)
1085+
require.Contains(t, rpcErr.Data.Message, test.ExpectedErr.Data.Message) // sometimes the error message starts with "Post \"http://localhost:5050\":..."
10941086
} else {
10951087
require.Equal(t, test.ExpectedReceipt.ExecutionStatus, (*resp).ExecutionStatus)
10961088
}

‎client/client.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -705,7 +705,7 @@ func (c *Client) read(codec ServerCodec) {
705705
msgs, batch, err := codec.readBatch()
706706
if _, ok := err.(*json.SyntaxError); ok {
707707
msg := errorMessage(&parseError{err.Error()})
708-
codec.writeJSON(context.Background(), msg, true)
708+
_ = codec.writeJSON(context.Background(), msg, true)
709709
}
710710
if err != nil {
711711
c.readErr <- err

‎client/client_test.go

+7-5
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ func TestClientSubscribeInvalidArg(t *testing.T) {
427427
t.Error(string(buf))
428428
}
429429
}()
430-
client.EthSubscribe(context.Background(), arg, "foo_bar")
430+
_, _ = client.EthSubscribe(context.Background(), arg, "foo_bar")
431431
}
432432
check(true, nil)
433433
check(true, 1)
@@ -565,7 +565,7 @@ func TestUnsubscribeTimeout(t *testing.T) {
565565
t.Parallel()
566566

567567
srv := NewServer()
568-
srv.RegisterName("nftest", new(notificationTestService))
568+
_ = srv.RegisterName("nftest", new(notificationTestService))
569569

570570
// Setup middleware to block on unsubscribe.
571571
p1, p2 := net.Pipe()
@@ -637,7 +637,7 @@ func TestClientSubscriptionUnsubscribeServer(t *testing.T) {
637637

638638
// Create the server.
639639
srv := NewServer()
640-
srv.RegisterName("nftest", new(notificationTestService))
640+
_ = srv.RegisterName("nftest", new(notificationTestService))
641641
p1, p2 := net.Pipe()
642642
recorder := &unsubscribeRecorder{ServerCodec: NewCodec(p1)}
643643
go srv.ServeCodec(recorder, OptionMethodInvocation|OptionSubscriptions)
@@ -680,7 +680,7 @@ func TestClientSubscriptionChannelClose(t *testing.T) {
680680
defer srv.Stop()
681681
defer httpsrv.Close()
682682

683-
srv.RegisterName("nftest", new(notificationTestService))
683+
_ = srv.RegisterName("nftest", new(notificationTestService))
684684
client, _ := Dial(wsURL)
685685
defer client.Close()
686686

@@ -842,7 +842,9 @@ func TestClientReconnect(t *testing.T) {
842842
if err != nil {
843843
t.Fatal("can't listen:", err)
844844
}
845-
go http.Serve(l, srv.WebsocketHandler([]string{"*"}))
845+
go func() {
846+
_ = http.Serve(l, srv.WebsocketHandler([]string{"*"}))
847+
}()
846848
return srv, l
847849
}
848850

‎client/handler.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ func (b *batchCallBuffer) doWrite(ctx context.Context, conn jsonWriter, isErrorR
163163
}
164164
b.wrote = true // can only write once
165165
if len(b.resp) > 0 {
166-
conn.writeJSON(ctx, b.resp, isErrorResponse)
166+
_ = conn.writeJSON(ctx, b.resp, isErrorResponse)
167167
}
168168
}
169169

@@ -173,7 +173,7 @@ func (h *handler) handleBatch(msgs []*jsonrpcMessage) {
173173
if len(msgs) == 0 {
174174
h.startCallProc(func(cp *callProc) {
175175
resp := errorMessage(&invalidRequestError{"empty batch"})
176-
h.conn.writeJSON(cp.ctx, resp, true)
176+
_ = h.conn.writeJSON(cp.ctx, resp, true)
177177
})
178178
return
179179
}
@@ -245,7 +245,7 @@ func (h *handler) handleBatch(msgs []*jsonrpcMessage) {
245245
h.addSubscriptions(cp.notifiers)
246246
callBuffer.write(cp.ctx, h.conn)
247247
for _, n := range cp.notifiers {
248-
n.activate()
248+
_ = n.activate()
249249
}
250250
})
251251
}
@@ -261,7 +261,7 @@ func (h *handler) respondWithBatchTooLarge(cp *callProc, batch []*jsonrpcMessage
261261
break
262262
}
263263
}
264-
h.conn.writeJSON(cp.ctx, []*jsonrpcMessage{resp}, true)
264+
_ = h.conn.writeJSON(cp.ctx, []*jsonrpcMessage{resp}, true)
265265
}
266266

267267
// handleMsg handles a single non-batch message.
@@ -291,7 +291,7 @@ func (h *handler) handleNonBatchCall(cp *callProc, msg *jsonrpcMessage) {
291291
cancel()
292292
responded.Do(func() {
293293
resp := msg.errorResponse(&internalServerError{errcodeTimeout, errMsgTimeout})
294-
h.conn.writeJSON(cp.ctx, resp, true)
294+
_ = h.conn.writeJSON(cp.ctx, resp, true)
295295
})
296296
})
297297
}
@@ -303,11 +303,11 @@ func (h *handler) handleNonBatchCall(cp *callProc, msg *jsonrpcMessage) {
303303
h.addSubscriptions(cp.notifiers)
304304
if answer != nil {
305305
responded.Do(func() {
306-
h.conn.writeJSON(cp.ctx, answer, false)
306+
_ = h.conn.writeJSON(cp.ctx, answer, false)
307307
})
308308
}
309309
for _, n := range cp.notifiers {
310-
n.activate()
310+
_ = n.activate()
311311
}
312312
}
313313

‎client/http_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ func TestHTTPRespBodyUnlimited(t *testing.T) {
110110

111111
s := NewServer()
112112
defer s.Stop()
113-
s.RegisterName("test", largeRespService{respLength})
113+
_ = s.RegisterName("test", largeRespService{respLength})
114114
ts := httptest.NewServer(s)
115115
defer ts.Close()
116116

‎client/json.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ func (c *jsonCodec) writeJSON(ctx context.Context, v interface{}, isErrorRespons
260260
if !ok {
261261
deadline = time.Now().Add(defaultWriteTimeout)
262262
}
263-
c.conn.SetWriteDeadline(deadline)
263+
_ = c.conn.SetWriteDeadline(deadline)
264264
return c.encode(v, isErrorResponse)
265265
}
266266

@@ -283,15 +283,15 @@ func (c *jsonCodec) closed() <-chan interface{} {
283283
func parseMessage(raw json.RawMessage) ([]*jsonrpcMessage, bool) {
284284
if !isBatch(raw) {
285285
msgs := []*jsonrpcMessage{{}}
286-
json.Unmarshal(raw, &msgs[0])
286+
_ = json.Unmarshal(raw, &msgs[0])
287287
return msgs, false
288288
}
289289
dec := json.NewDecoder(bytes.NewReader(raw))
290-
dec.Token() // skip '['
290+
_, _ = dec.Token() // skip '['
291291
var msgs []*jsonrpcMessage
292292
for dec.More() {
293293
msgs = append(msgs, new(jsonrpcMessage))
294-
dec.Decode(&msgs[len(msgs)-1])
294+
_ = dec.Decode(&msgs[len(msgs)-1])
295295
}
296296
return msgs, true
297297
}

‎client/server.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ func NewServer() *Server {
6767
// Register the default service providing meta information about the RPC service such
6868
// as the services and methods it offers.
6969
rpcService := &RPCService{server}
70-
server.RegisterName(MetadataApi, rpcService)
70+
_ = server.RegisterName(MetadataApi, rpcService)
7171
return server
7272
}
7373

@@ -177,7 +177,7 @@ func (s *Server) serveSingleRequest(ctx context.Context, codec ServerCodec) {
177177
if err != nil {
178178
if msg := messageForReadError(err); msg != "" {
179179
resp := errorMessage(&invalidMessageError{msg})
180-
codec.writeJSON(ctx, resp, true)
180+
_ = codec.writeJSON(ctx, resp, true)
181181
}
182182
return
183183
}

‎client/server_test.go

+8-6
Original file line numberDiff line numberDiff line change
@@ -90,15 +90,15 @@ func runTestScript(t *testing.T, file string) {
9090
case strings.HasPrefix(line, "--> "):
9191
t.Log(line)
9292
// write to connection
93-
clientConn.SetWriteDeadline(time.Now().Add(5 * time.Second))
93+
_ = clientConn.SetWriteDeadline(time.Now().Add(5 * time.Second))
9494
if _, err := io.WriteString(clientConn, line[4:]+"\n"); err != nil {
9595
t.Fatalf("write error: %v", err)
9696
}
9797
case strings.HasPrefix(line, "<-- "):
9898
t.Log(line)
9999
want := line[4:]
100100
// read line from connection and compare text
101-
clientConn.SetReadDeadline(time.Now().Add(5 * time.Second))
101+
_ = clientConn.SetReadDeadline(time.Now().Add(5 * time.Second))
102102
sent, err := readbuf.ReadString('\n')
103103
if err != nil {
104104
t.Fatalf("read error: %v", err)
@@ -124,7 +124,9 @@ func TestServerShortLivedConn(t *testing.T) {
124124
t.Fatal("can't listen:", err)
125125
}
126126
defer listener.Close()
127-
go server.ServeListener(listener)
127+
go func() {
128+
_ = server.ServeListener(listener)
129+
}()
128130

129131
var (
130132
request = `{"jsonrpc":"2.0","id":1,"method":"rpc_modules"}` + "\n"
@@ -137,10 +139,10 @@ func TestServerShortLivedConn(t *testing.T) {
137139
t.Fatal("can't dial:", err)
138140
}
139141

140-
conn.SetDeadline(deadline)
142+
_ = conn.SetDeadline(deadline)
141143
// Write the request, then half-close the connection so the server stops reading.
142-
conn.Write([]byte(request))
143-
conn.(*net.TCPConn).CloseWrite()
144+
_, _ = conn.Write([]byte(request))
145+
_ = conn.(*net.TCPConn).CloseWrite()
144146
// Now try to get the response.
145147
buf := make([]byte, 2000)
146148
n, err := conn.Read(buf)

‎client/subscription.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ func (sub *ClientSubscription) run() {
305305

306306
// Call the unsubscribe method on the server.
307307
if unsubscribe {
308-
sub.requestUnsubscribe()
308+
_ = sub.requestUnsubscribe()
309309
}
310310

311311
// Send the error.

‎client/testdata/invalid-syntax.json

-5
This file was deleted.

‎client/testservice_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ func (s *testService) CallMeBackLater(ctx context.Context, method string, args [
154154
go func() {
155155
<-ctx.Done()
156156
var result interface{}
157-
c.Call(&result, method, args...)
157+
_ = c.Call(&result, method, args...)
158158
}()
159159
return nil
160160
}
@@ -214,7 +214,7 @@ func (s *notificationTestService) HangSubscription(ctx context.Context, val int)
214214
subscription := notifier.CreateSubscription()
215215

216216
go func() {
217-
notifier.Notify(subscription.ID, val)
217+
_ = notifier.Notify(subscription.ID, val)
218218
}()
219219
return subscription, nil
220220
}

‎client/websocket.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -369,14 +369,14 @@ func (wc *websocketCodec) pingLoop() {
369369

370370
case <-pingTimer.C:
371371
wc.jsonCodec.encMu.Lock()
372-
wc.conn.SetWriteDeadline(time.Now().Add(wsPingWriteTimeout))
373-
wc.conn.WriteMessage(websocket.PingMessage, nil)
374-
wc.conn.SetReadDeadline(time.Now().Add(wsPongTimeout))
372+
_ = wc.conn.SetWriteDeadline(time.Now().Add(wsPingWriteTimeout))
373+
_ = wc.conn.WriteMessage(websocket.PingMessage, nil)
374+
_ = wc.conn.SetReadDeadline(time.Now().Add(wsPongTimeout))
375375
wc.jsonCodec.encMu.Unlock()
376376
pingTimer.Reset(wsPingInterval)
377377

378378
case <-wc.pongReceived:
379-
wc.conn.SetReadDeadline(time.Time{})
379+
_ = wc.conn.SetReadDeadline(time.Time{})
380380
}
381381
}
382382
}

0 commit comments

Comments
 (0)