more local replaces + updating loopserver.Serve to loopserver.ServeNew

patrickhuie19 · patrickhuie19 · commit b252d11ec8a7 · 2025-10-07T19:26:42.000-04:00
diff --git a/capabilitywatcher/go.mod b/capabilitywatcher/go.mod
@@ -4,6 +4,8 @@ go 1.24.5
 
 toolchain go1.24.6
 
+replace github.com/smartcontractkit/capabilities/libs => ../libs
+
 require (
 	github.com/google/uuid v1.6.0
 	github.com/prometheus/client_golang v1.22.0
diff --git a/capabilitywatcher/go.sum b/capabilitywatcher/go.sum
@@ -272,8 +272,6 @@ github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp
 github.com/shopspring/decimal v1.4.0/go.mod h1:gawqmDU56v4yIKSwfBSFip1HdCCXN8/+DMd9qYNcwME=
 github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
-github.com/smartcontractkit/capabilities/libs v0.0.0-20250711131700-236a5b631ad7 h1:QPemruCphJmJMH09cO/aClkONPVqJeWcd0qJwDbmcOI=
-github.com/smartcontractkit/capabilities/libs v0.0.0-20250711131700-236a5b631ad7/go.mod h1:/zEPppsF8Q/iwWSFbZ5MoQj/BcfYXk/whR8y91PQD+0=
 github.com/smartcontractkit/chain-selectors v1.0.67 h1:gxTqP/JC40KDe3DE1SIsIKSTKTZEPyEU1YufO1admnw=
 github.com/smartcontractkit/chain-selectors v1.0.67/go.mod h1:xsKM0aN3YGcQKTPRPDDtPx2l4mlTN1Djmg0VVXV40b8=
 github.com/smartcontractkit/chainlink-common v0.9.6-0.20251007172033-a76cb023759b h1:0wwL6b6s0iRO4PHqoVnjj0KvaS014Sab+pQ/HZYuneU=
diff --git a/capabilitywatcher/main.go b/capabilitywatcher/main.go
@@ -3,8 +3,11 @@ package main
 import (
 	"github.com/smartcontractkit/capabilities/capabilitywatcher/server"
 	"github.com/smartcontractkit/capabilities/libs/loopserver"
+	"github.com/smartcontractkit/chainlink-common/pkg/loop"
 )
 
 func main() {
-	loopserver.Serve("CapabilityWatcher", server.New)
+	loopserver.ServeNew("CapabilityWatcher", func(s *loop.Server) loop.StandardCapabilities {
+		return server.New(s.Logger)
+	})
 }
diff --git a/integration_tests/go.mod b/integration_tests/go.mod
@@ -10,8 +10,6 @@ replace github.com/smartcontractkit/capabilities/http_trigger => ../http_trigger
 
 replace github.com/smartcontractkit/capabilities/chain_capabilities/evm => ../chain_capabilities/evm
 
-replace github.com/smartcontractkit/chainlink/v2 => ../../chainlink
-
 replace github.com/fbsobreira/gotron-sdk => github.com/smartcontractkit/chainlink-tron/relayer/gotron-sdk v0.0.5-0.20250422175525-b7575d96bd4d
 
 require (
diff --git a/integration_tests/go.sum b/integration_tests/go.sum
@@ -1145,6 +1145,8 @@ github.com/smartcontractkit/chainlink-tron/relayer v0.0.11-0.20250815105909-7549
 github.com/smartcontractkit/chainlink-tron/relayer v0.0.11-0.20250815105909-75499abc4335/go.mod h1:ccjEgNeqOO+bjPddnL4lUrNLzyCvGCxgBjJdhFX3wa8=
 github.com/smartcontractkit/chainlink-tron/relayer/gotron-sdk v0.0.5-0.20250422175525-b7575d96bd4d h1:qLmSOOtB/Ogn79eIDkuujOu8M5Jd747V1H7Brk/nTvo=
 github.com/smartcontractkit/chainlink-tron/relayer/gotron-sdk v0.0.5-0.20250422175525-b7575d96bd4d/go.mod h1:4WhGgCA0smBbBud5mK+jnDb2wwndMvoqaWBJ3OV/7Bw=
+github.com/smartcontractkit/chainlink/v2 v2.27.3-0.20251007205028-77fd4f160a37 h1:mZk7JGjbCFSWbjQs2r466HHZtUhL6hQYJzuV0mrurGg=
+github.com/smartcontractkit/chainlink/v2 v2.27.3-0.20251007205028-77fd4f160a37/go.mod h1:VghGkUDz46Kw6GDDr+WmFx0f8r2qLydaJIL1goOxEG4=
 github.com/smartcontractkit/cre-sdk-go v0.7.0 h1:QmCc/a6kGCmzhm0k0WFJZKxjklDedtAfvrA+vTnLcW0=
 github.com/smartcontractkit/cre-sdk-go v0.7.0/go.mod h1:qVhKhBLANrGWKav6aHqO2UM7IltiouOnUbxu8ZQlKVM=
 github.com/smartcontractkit/cre-sdk-go/capabilities/blockchain/evm v0.6.0 h1:dbWA/2RItveFYTQUSwQ4oG2yyebQMyFQLrpXwFuz8v4=
diff --git a/kvstore/main.go b/kvstore/main.go
@@ -3,8 +3,11 @@ package main
 import (
 	"github.com/smartcontractkit/capabilities/kvstore/server"
 	"github.com/smartcontractkit/capabilities/libs/loopserver"
+	"github.com/smartcontractkit/chainlink-common/pkg/loop"
 )
 
 func main() {
-	loopserver.Serve("KVStoreCapabilities", server.New)
+	loopserver.ServeNew("KVStoreCapabilities", func(s *loop.Server) loop.StandardCapabilities {
+		return server.New(s.Logger)
+	})
 }
diff --git a/loadtestwritetarget/go.mod b/loadtestwritetarget/go.mod
@@ -4,6 +4,8 @@ go 1.24.5
 
 toolchain go1.24.6
 
+replace github.com/smartcontractkit/capabilities/libs => ../libs
+
 require (
 	github.com/smartcontractkit/capabilities/libs v0.0.0-20250902122836-28fd635adf1f
 	github.com/smartcontractkit/chainlink-common v0.9.6-0.20251007172033-a76cb023759b
diff --git a/loadtestwritetarget/go.sum b/loadtestwritetarget/go.sum
@@ -287,8 +287,6 @@ github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp
 github.com/shopspring/decimal v1.4.0/go.mod h1:gawqmDU56v4yIKSwfBSFip1HdCCXN8/+DMd9qYNcwME=
 github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
-github.com/smartcontractkit/capabilities/libs v0.0.0-20250902122836-28fd635adf1f h1:EWtoA+9tYew5oBP5jHLuONwzTReFbJ23NAyS/3uLJ04=
-github.com/smartcontractkit/capabilities/libs v0.0.0-20250902122836-28fd635adf1f/go.mod h1:cnmQvDULHhvpVgvtgFcjL1y75gY+mcnPxMQh04iGnt0=
 github.com/smartcontractkit/chain-selectors v1.0.67 h1:gxTqP/JC40KDe3DE1SIsIKSTKTZEPyEU1YufO1admnw=
 github.com/smartcontractkit/chain-selectors v1.0.67/go.mod h1:xsKM0aN3YGcQKTPRPDDtPx2l4mlTN1Djmg0VVXV40b8=
 github.com/smartcontractkit/chainlink-common v0.9.6-0.20251007172033-a76cb023759b h1:0wwL6b6s0iRO4PHqoVnjj0KvaS014Sab+pQ/HZYuneU=
diff --git a/loadtestwritetarget/main.go b/loadtestwritetarget/main.go
@@ -6,6 +6,7 @@ import (
 
 	"github.com/smartcontractkit/chainlink-common/pkg/capabilities"
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
+	"github.com/smartcontractkit/chainlink-common/pkg/loop"
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
 	"github.com/smartcontractkit/chainlink-common/pkg/types/core"
 
@@ -30,8 +31,8 @@ type LoadTestWriteTargetGRPCService struct {
 }
 
 func main() {
-	loopserver.Serve(serviceName, func(lggr logger.Logger) *LoadTestWriteTargetGRPCService {
-		return &LoadTestWriteTargetGRPCService{lggr: lggr}
+	loopserver.ServeNew(serviceName, func(s *loop.Server) loop.StandardCapabilities {
+		return &LoadTestWriteTargetGRPCService{lggr: s.Logger}
 	})
 }
 
diff --git a/mock/main.go b/mock/main.go
@@ -3,8 +3,11 @@ package main
 import (
 	"github.com/smartcontractkit/capabilities/libs/loopserver"
 	"github.com/smartcontractkit/capabilities/mock/server"
+	"github.com/smartcontractkit/chainlink-common/pkg/loop"
 )
 
 func main() {
-	loopserver.Serve("MockCapability", server.New)
+	loopserver.ServeNew("MockCapability", func(s *loop.Server) loop.StandardCapabilities {
+		return server.New(s.Logger)
+	})
 }
diff --git a/p2psigner/main.go b/p2psigner/main.go
@@ -88,5 +88,7 @@ func (cs *capabilitiesServer) Initialise(ctx context.Context, dependencies core.
 }
 
 func main() {
-	loopserver.Serve("Signer", New)
+	loopserver.ServeNew("Signer", func(s *loop.Server) loop.StandardCapabilities {
+		return New(s.Logger)
+	})
 }
diff --git a/readcontract/main.go b/readcontract/main.go
@@ -39,8 +39,8 @@ type ReadContractGRPCService struct {
 }
 
 func main() {
-	loopserver.Serve(serviceName, func(lggr logger.Logger) *ReadContractGRPCService {
-		return &ReadContractGRPCService{lggr: lggr}
+	loopserver.ServeNew(serviceName, func(s *loop.Server) loop.StandardCapabilities {
+		return &ReadContractGRPCService{lggr: s.Logger}
 	})
 }
 
diff --git a/workflowevent/main.go b/workflowevent/main.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/smartcontractkit/chainlink-common/pkg/capabilities"
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
+	"github.com/smartcontractkit/chainlink-common/pkg/loop"
 	"github.com/smartcontractkit/chainlink-common/pkg/types/core"
 
 	"github.com/smartcontractkit/capabilities/libs/loopserver"
@@ -24,8 +25,8 @@ type CapabilitiesService struct {
 }
 
 func main() {
-	loopserver.Serve(serviceName, func(lggr logger.Logger) *CapabilitiesService {
-		return &CapabilitiesService{lggr: lggr}
+	loopserver.ServeNew(serviceName, func(s *loop.Server) loop.StandardCapabilities {
+		return &CapabilitiesService{lggr: s.Logger}
 	})
 }
 

Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,11 @@ package main`
`3`	`3`	`import (`
`4`	`4`	`"github.com/smartcontractkit/capabilities/capabilitywatcher/server"`
`5`	`5`	`"github.com/smartcontractkit/capabilities/libs/loopserver"`
	`6`	`+ "github.com/smartcontractkit/chainlink-common/pkg/loop"`
`6`	`7`	`)`
`7`	`8`
`8`	`9`	`func main() {`
`9`		`- loopserver.Serve("CapabilityWatcher", server.New)`
	`10`	`+ loopserver.ServeNew("CapabilityWatcher", func(s *loop.Server) loop.StandardCapabilities {`
	`11`	`+ return server.New(s.Logger)`
	`12`	`+ })`
`10`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ import (`
`6`	`6`
`7`	`7`	`"github.com/smartcontractkit/chainlink-common/pkg/capabilities"`
`8`	`8`	`"github.com/smartcontractkit/chainlink-common/pkg/logger"`
	`9`	`+ "github.com/smartcontractkit/chainlink-common/pkg/loop"`
`9`	`10`	`"github.com/smartcontractkit/chainlink-common/pkg/services"`
`10`	`11`	`"github.com/smartcontractkit/chainlink-common/pkg/types/core"`
`11`	`12`
`@@ -30,8 +31,8 @@ type LoadTestWriteTargetGRPCService struct {`
`30`	`31`	`}`
`31`	`32`
`32`	`33`	`func main() {`
`33`		`- loopserver.Serve(serviceName, func(lggr logger.Logger) *LoadTestWriteTargetGRPCService {`
`34`		`- return &LoadTestWriteTargetGRPCService{lggr: lggr}`
	`34`	`+ loopserver.ServeNew(serviceName, func(s *loop.Server) loop.StandardCapabilities {`
	`35`	`+ return &LoadTestWriteTargetGRPCService{lggr: s.Logger}`
`35`	`36`	`})`
`36`	`37`	`}`
`37`	`38`