fix: linting

Author: nugaon

pkg/api/pubsub_test.go

@@ -160,7 +160,11 @@ func TestPubsubList_NilService(t *testing.T) {
 
 	client, _, _, _ := newTestServer(t, testServerOptions{})
 
-	resp, err := client.Get("/pubsub/")
+	req, err := http.NewRequestWithContext(t.Context(), http.MethodGet, "/pubsub/", nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+	resp, err := client.Do(req)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -177,7 +181,11 @@ func TestPubsubList_Empty(t *testing.T) {
 	svc := pubsub.New(nil, log.Noop, true)
 	client, _, _, _ := newTestServer(t, testServerOptions{PubsubService: svc})
 
-	resp, err := client.Get("/pubsub/")
+	req, err := http.NewRequestWithContext(t.Context(), http.MethodGet, "/pubsub/", nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+	resp, err := client.Do(req)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -195,7 +203,11 @@ func TestPubsubWs_MissingPeer(t *testing.T) {
 	client, _, listener, _ := newTestServer(t, testServerOptions{PubsubService: svc})
 	_ = listener
 
-	resp, err := client.Get("/pubsub/testtopic")
+	req, err := http.NewRequestWithContext(t.Context(), http.MethodGet, "/pubsub/testtopic", nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+	resp, err := client.Do(req)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -212,7 +224,11 @@ func TestPubsubWs_InvalidMultiaddr(t *testing.T) {
 	svc := pubsub.New(nil, log.Noop, false)
 	client, _, _, _ := newTestServer(t, testServerOptions{PubsubService: svc})
 
-	resp, err := client.Get("/pubsub/testtopic?peer=notamultiaddr")
+	req, err := http.NewRequestWithContext(t.Context(), http.MethodGet, "/pubsub/testtopic?peer=notamultiaddr", nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+	resp, err := client.Do(req)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -229,7 +245,11 @@ func TestPubsubWs_InvalidGsocEthAddress(t *testing.T) {
 	svc := pubsub.New(nil, log.Noop, false)
 	client, _, _, _ := newTestServer(t, testServerOptions{PubsubService: svc})
 
-	resp, err := client.Get("/pubsub/testtopic?peer=/ip4/127.0.0.1/tcp/9000&gsoc-eth-address=ZZZZ&gsoc-topic=aabb")
+	req, err := http.NewRequestWithContext(t.Context(), http.MethodGet, "/pubsub/testtopic?peer=/ip4/127.0.0.1/tcp/9000&gsoc-eth-address=ZZZZ&gsoc-topic=aabb", nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+	resp, err := client.Do(req)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -246,7 +266,11 @@ func TestPubsubWs_InvalidGsocTopic(t *testing.T) {
 	svc := pubsub.New(nil, log.Noop, false)
 	client, _, _, _ := newTestServer(t, testServerOptions{PubsubService: svc})
 
-	resp, err := client.Get("/pubsub/testtopic?peer=/ip4/127.0.0.1/tcp/9000&gsoc-eth-address=aabbccddeeff001122334455667788990011223344&gsoc-topic=ZZZZ")
+	req, err := http.NewRequestWithContext(t.Context(), http.MethodGet, "/pubsub/testtopic?peer=/ip4/127.0.0.1/tcp/9000&gsoc-eth-address=aabbccddeeff001122334455667788990011223344&gsoc-topic=ZZZZ", nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+	resp, err := client.Do(req)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -339,7 +363,11 @@ func TestPubsubWs_TwoTopicsListAndMessages(t *testing.T) {
 	}
 
 	// Query the list endpoint — both topics must be present.
-	resp, err := client.Get("/pubsub/")
+	req, err := http.NewRequestWithContext(t.Context(), http.MethodGet, "/pubsub/", nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+	resp, err := client.Do(req)
 	if err != nil {
 		t.Fatal(err)
 	}

pkg/pubsub/mode_1_test.go

@@ -85,7 +85,9 @@ func buildPublisherMsg(t *testing.T, tc *socTestCtx, payload []byte) []byte {
 	spanBytes := make([]byte, pubsub.SpanSize)
 	binary.LittleEndian.PutUint64(spanBytes, uint64(len(payload)))
 
-	cacData := append(spanBytes, payload...)
+	cacData := make([]byte, 0, pubsub.SpanSize+len(payload))
+	cacData = append(cacData, spanBytes...)
+	cacData = append(cacData, payload...)
 	ch, err := cac.NewWithDataSpan(cacData)
 	if err != nil {
 		t.Fatal(err)
@@ -101,9 +103,9 @@ func buildPublisherMsg(t *testing.T, tc *socTestCtx, payload []byte) []byte {
 		t.Fatal(err)
 	}
 
-	var msg []byte
+	msg := make([]byte, 0, len(sig)+pubsub.SpanSize+len(payload))
 	msg = append(msg, sig...)
-	msg = append(msg, spanBytes...)
+	msg = append(msg, spanBytes[:pubsub.SpanSize]...)
 	msg = append(msg, payload...)
 	return msg
 }
@@ -213,7 +215,7 @@ func TestReadBrokerMessage_Handshake(t *testing.T) {
 	publisherFrame := buildPublisherMsg(t, tc, payload)
 
 	// Assemble handshake message: [0x02][gsocID(32B)][owner(20B)][sig(65B)][span(8B)][payload]
-	var streamData []byte
+	streamData := make([]byte, 0, 1+len(tc.gsocID)+len(tc.owner)+len(publisherFrame))
 	streamData = append(streamData, pubsub.MsgTypeHandshake)
 	streamData = append(streamData, tc.gsocID...)
 	streamData = append(streamData, tc.owner...)
@@ -245,7 +247,7 @@ func TestReadBrokerMessage_Data(t *testing.T) {
 	publisherFrame := buildPublisherMsg(t, tc, payload)
 
 	// Assemble data message: [0x03][sig(65B)][span(8B)][payload]
-	var streamData []byte
+	streamData := make([]byte, 0, 1+len(publisherFrame))
 	streamData = append(streamData, pubsub.MsgTypeData)
 	streamData = append(streamData, publisherFrame...)
 
@@ -271,7 +273,7 @@ func TestReadBrokerMessage_InvalidSig(t *testing.T) {
 	binary.LittleEndian.PutUint64(spanBytes, uint64(len(payload)))
 	badSig := make([]byte, pubsub.SigSize) // all zeros — invalid signature
 
-	var streamData []byte
+	streamData := make([]byte, 0, 1+len(badSig)+len(spanBytes)+len(payload))
 	streamData = append(streamData, pubsub.MsgTypeData)
 	streamData = append(streamData, badSig...)
 	streamData = append(streamData, spanBytes...)