Update context handling in tests and remove mux params

Signed-off-by: Satyam Zode <[email protected]>

Author: satyamz

services/friendbot/internal/friendbot_test.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"sync"
 	"testing"
-	"time"
 
 	"github.com/stellar/go/txnbuild"
 
@@ -15,8 +14,8 @@ import (
 )
 
 func TestFriendbot_Pay_accountDoesNotExist(t *testing.T) {
-	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
-	defer cancel()
+	ctx := context.Background()
+
 	mockSubmitTransaction := func(ctx context.Context, minion *Minion, hclient horizonclient.ClientInterface, tx string) (*hProtocol.Transaction, error) {
 		// Instead of submitting the tx, we emulate a success.
 		txSuccess := hProtocol.Transaction{EnvelopeXdr: tx, Successful: true}
@@ -84,8 +83,7 @@ func TestFriendbot_Pay_accountDoesNotExist(t *testing.T) {
 }
 
 func TestFriendbot_Pay_accountExists(t *testing.T) {
-	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
-	defer cancel()
+	ctx := context.Background()
 	mockSubmitTransaction := func(ctx context.Context, minion *Minion, hclient horizonclient.ClientInterface, tx string) (*hProtocol.Transaction, error) {
 		// Instead of submitting the tx, we emulate a success.
 		txSuccess := hProtocol.Transaction{EnvelopeXdr: tx, Successful: true}
@@ -153,8 +151,7 @@ func TestFriendbot_Pay_accountExists(t *testing.T) {
 }
 
 func TestFriendbot_Pay_accountExistsAlreadyFunded(t *testing.T) {
-	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
-	defer cancel()
+	ctx := context.Background()
 	mockSubmitTransaction := func(ctx context.Context, minion *Minion, hclient horizonclient.ClientInterface, tx string) (*hProtocol.Transaction, error) {
 		// Instead of submitting the tx, we emulate a success.
 		txSuccess := hProtocol.Transaction{EnvelopeXdr: tx, Successful: true}

services/friendbot/internal/minion_test.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"sync"
 	"testing"
-	"time"
 
 	"github.com/stellar/go/clients/horizonclient"
 	"github.com/stellar/go/keypair"
@@ -18,8 +17,7 @@ import (
 // in which Minion.Run() will try to send multiple messages to a channel that gets closed
 // immediately after receiving one message.
 func TestMinion_NoChannelErrors(t *testing.T) {
-	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
-	defer cancel()
+	ctx := context.Background()
 
 	mockSubmitTransaction := func(ctx context.Context, minion *Minion, hclient horizonclient.ClientInterface, tx string) (txn *hProtocol.Transaction, err error) {
 		return txn, nil
@@ -83,8 +81,7 @@ func TestMinion_NoChannelErrors(t *testing.T) {
 }
 
 func TestMinion_CorrectNumberOfTxSubmissions(t *testing.T) {
-	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
-	defer cancel()
+	ctx := context.Background()
 
 	var (
 		numTxSubmits int

services/friendbot/main.go

@@ -6,7 +6,6 @@ import (
 	stdhttp "net/http"
 	"os"
 
-	"github.com/go-chi/chi/middleware"
 	"github.com/go-chi/chi/v5"
 	"github.com/riandyrn/otelchi"
 	"github.com/spf13/cobra"
@@ -121,12 +120,6 @@ func newMux(cfg Config) *chi.Mux {
 	// middlewares
 	mux.Use(http.XFFMiddleware(http.XFFMiddlewareConfig{BehindCloudflare: cfg.UseCloudflareIP}))
 	mux.Use(http.NewAPIMux(log.DefaultLogger).Middlewares()...)
-
-	// Add OpenTelemetry middleware
-	mux.Use(middleware.RequestID)
-	mux.Use(middleware.RealIP)
-	mux.Use(middleware.Logger)
-	mux.Use(middleware.Recoverer)
 	mux.Use(otelchi.Middleware(serviceName, otelchi.WithChiRoutes(mux)))
 
 	return mux