more tests

modules/httplib/client_pool.go

@@ -52,13 +52,13 @@ func (cp *ClientPool) GetClient(key string) *http.Client {
 		return client
 	}
 
-	client := cp.createClient(key)
+	client := cp.createClient()
 	cp.clients[key] = client
 	return client
 }
 
 // createClient creates a new HTTP client with optimized connection pooling
-func (cp *ClientPool) createClient(key string) *http.Client {
+func (cp *ClientPool) createClient() *http.Client {
 	transport := &http.Transport{
 		Proxy: proxy.Proxy(),
 		DialContext: (&net.Dialer{

services/f3/driver/options.go

@@ -5,8 +5,6 @@
 package driver
 
 import (
-	"net/http"
-
 	"forgejo.org/modules/httplib"
 	driver_options "forgejo.org/services/f3/driver/options"
 
@@ -16,8 +14,6 @@ import (
 func newOptions() options.Interface {
 	o := &driver_options.Options{}
 	o.SetName(driver_options.Name)
-	o.SetNewMigrationHTTPClient(func() *http.Client {
+	o.SetNewMigrationHTTPClient(httplib.GetMigrationClient)
-		return httplib.GetMigrationClient()
-	})
 	return o
 }

services/migrations/onedev.go

@@ -5,7 +5,6 @@ package migrations
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"net/http"
 	"net/url"
@@ -14,6 +13,7 @@ import (
 	"time"
 
 	"forgejo.org/modules/httplib"
+	"forgejo.org/modules/json"
 	"forgejo.org/modules/log"
 	base "forgejo.org/modules/migration"
 	"forgejo.org/modules/structs"