updated code.

1. Resolved merge conflicts.
2. Resolved go linting issues.

cmd/adapter/main.go

@@ -25,12 +25,12 @@ type Config struct {
 	Log           log.Config            `yaml:"log"`
 	PluginManager *plugin.ManagerConfig `yaml:"pluginManager"`
 	Modules       []module.Config       `yaml:"modules"`
-	HTTP          timeouts              `yaml:"http"` // Nest http config
+	HTTP          timeouts              `yaml:"http"`
 }
 
 type timeouts struct {
-	Port    string        `yaml:"port"`
-	Timeout timeoutConfig `yaml:"timeout"`
+	Port     string        `yaml:"port"`
+	Timeouts timeoutConfig `yaml:"timeout"`
 }
 
 type timeoutConfig struct {
@@ -138,9 +138,9 @@ func run(ctx context.Context, configPath string) error {
 	httpServer := &http.Server{
 		Addr:         net.JoinHostPort("", cfg.HTTP.Port),
 		Handler:      srv,
-		ReadTimeout:  cfg.HTTP.Timeout.Read * time.Second, // Use timeouts from config
-		WriteTimeout: cfg.HTTP.Timeout.Write * time.Second,
-		IdleTimeout:  cfg.HTTP.Timeout.Idle * time.Second,
+		ReadTimeout:  cfg.HTTP.Timeouts.Read * time.Second,
+		WriteTimeout: cfg.HTTP.Timeouts.Write * time.Second,
+		IdleTimeout:  cfg.HTTP.Timeouts.Idle * time.Second,
 	}
 
 	// Start HTTP server.

cmd/adapter/main_test.go

@@ -366,7 +366,7 @@ func TestNewServerSuccess(t *testing.T) {
 				Modules: tt.modules,
 				HTTP: timeouts{
 					Port: "8080",
-					Timeout: timeoutConfig{
+					Timeouts: timeoutConfig{
 						Read:  5,
 						Write: 5,
 						Idle:  10,
@@ -411,7 +411,7 @@ func TestNewServerFailure(t *testing.T) {
 				Modules: tt.modules,
 				HTTP: timeouts{
 					Port: "8080",
-					Timeout: timeoutConfig{
+					Timeouts: timeoutConfig{
 						Read:  5,
 						Write: 5,
 						Idle:  10,