From b45e43fb2f9facd358faa2e71f703e02d0b1b0ee Mon Sep 17 00:00:00 2001 From: Jordan Krage Date: Fri, 30 Aug 2024 16:42:07 +0200 Subject: [PATCH] switch to grpc-proxy fork; rm replace (#745) --- go.mod | 11 +++-------- go.sum | 4 ++-- .../reportingplugin/ocr2/reporting_plugin_service.go | 2 +- .../reportingplugin/ocr3/reporting_plugin_service.go | 2 +- pkg/loop/internal/relayerset/server.go | 2 +- pkg/loop/internal/reportingplugin/ccip/commit.go | 2 +- pkg/loop/internal/reportingplugin/ccip/execution.go | 2 +- pkg/loop/internal/reportingplugin/median/median.go | 2 +- pkg/loop/internal/reportingplugin/mercury/mercury.go | 2 +- 9 files changed, 12 insertions(+), 17 deletions(-) diff --git a/go.mod b/go.mod index 99c0334af..5938cd5c6 100644 --- a/go.mod +++ b/go.mod @@ -25,12 +25,12 @@ require ( github.com/jpillora/backoff v1.0.0 github.com/lib/pq v1.10.9 github.com/linkedin/goavro/v2 v2.12.0 - github.com/mwitkow/grpc-proxy v0.0.0-20230212185441-f345521cb9c9 github.com/pelletier/go-toml/v2 v2.2.0 github.com/prometheus/client_golang v1.17.0 github.com/riferrei/srclient v0.5.4 github.com/santhosh-tekuri/jsonschema/v5 v5.2.0 github.com/shopspring/decimal v1.4.0 + github.com/smartcontractkit/grpc-proxy v0.0.0-20240830132753-a7e17fec5ab7 github.com/smartcontractkit/libocr v0.0.0-20240419185742-fd3cab206b2c github.com/stretchr/testify v1.9.0 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 @@ -107,10 +107,5 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace ( - // until merged upstream: https://github.com/omissis/go-jsonschema/pull/264 - github.com/atombender/go-jsonschema => github.com/nolag/go-jsonschema v0.16.0-rtinianov - - // until merged upstream: https://github.com/mwitkow/grpc-proxy/pull/69 - github.com/mwitkow/grpc-proxy => github.com/smartcontractkit/grpc-proxy v0.0.0-20230731113816-f1be6620749f -) +// until merged upstream: https://github.com/omissis/go-jsonschema/pull/264 +replace github.com/atombender/go-jsonschema => github.com/nolag/go-jsonschema v0.16.0-rtinianov diff --git a/go.sum b/go.sum index c779dd47a..de0663e65 100644 --- a/go.sum +++ b/go.sum @@ -217,8 +217,8 @@ 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.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= -github.com/smartcontractkit/grpc-proxy v0.0.0-20230731113816-f1be6620749f h1:hgJif132UCdjo8u43i7iPN1/MFnu49hv7lFGFftCHKU= -github.com/smartcontractkit/grpc-proxy v0.0.0-20230731113816-f1be6620749f/go.mod h1:MvMXoufZAtqExNexqi4cjrNYE9MefKddKylxjS+//n0= +github.com/smartcontractkit/grpc-proxy v0.0.0-20240830132753-a7e17fec5ab7 h1:12ijqMM9tvYVEm+nR826WsrNi6zCKpwBhuApq127wHs= +github.com/smartcontractkit/grpc-proxy v0.0.0-20240830132753-a7e17fec5ab7/go.mod h1:FX7/bVdoep147QQhsOPkYsPEXhGZjeYx6lBSaSXtZOA= github.com/smartcontractkit/libocr v0.0.0-20240419185742-fd3cab206b2c h1:lIyMbTaF2H0Q71vkwZHX/Ew4KF2BxiKhqEXwF8rn+KI= github.com/smartcontractkit/libocr v0.0.0-20240419185742-fd3cab206b2c/go.mod h1:fb1ZDVXACvu4frX3APHZaEBp0xi1DIm34DcA0CwTsZM= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= diff --git a/pkg/loop/internal/core/services/reportingplugin/ocr2/reporting_plugin_service.go b/pkg/loop/internal/core/services/reportingplugin/ocr2/reporting_plugin_service.go index 49b0afff8..ca2761b1b 100644 --- a/pkg/loop/internal/core/services/reportingplugin/ocr2/reporting_plugin_service.go +++ b/pkg/loop/internal/core/services/reportingplugin/ocr2/reporting_plugin_service.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/mwitkow/grpc-proxy/proxy" + "github.com/smartcontractkit/grpc-proxy/proxy" "google.golang.org/grpc" "github.com/smartcontractkit/chainlink-common/pkg/loop/internal/core/services/keyvalue" diff --git a/pkg/loop/internal/core/services/reportingplugin/ocr3/reporting_plugin_service.go b/pkg/loop/internal/core/services/reportingplugin/ocr3/reporting_plugin_service.go index db95abe1f..54b1be0bc 100644 --- a/pkg/loop/internal/core/services/reportingplugin/ocr3/reporting_plugin_service.go +++ b/pkg/loop/internal/core/services/reportingplugin/ocr3/reporting_plugin_service.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/mwitkow/grpc-proxy/proxy" + "github.com/smartcontractkit/grpc-proxy/proxy" "google.golang.org/grpc" "github.com/smartcontractkit/chainlink-common/pkg/loop/internal/core/services/keyvalue" diff --git a/pkg/loop/internal/relayerset/server.go b/pkg/loop/internal/relayerset/server.go index 7e2ac3b7c..cb057de78 100644 --- a/pkg/loop/internal/relayerset/server.go +++ b/pkg/loop/internal/relayerset/server.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/mwitkow/grpc-proxy/proxy" + "github.com/smartcontractkit/grpc-proxy/proxy" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/pkg/loop/internal/reportingplugin/ccip/commit.go b/pkg/loop/internal/reportingplugin/ccip/commit.go index 569284f6f..7f4f0972c 100644 --- a/pkg/loop/internal/reportingplugin/ccip/commit.go +++ b/pkg/loop/internal/reportingplugin/ccip/commit.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/mwitkow/grpc-proxy/proxy" + "github.com/smartcontractkit/grpc-proxy/proxy" "google.golang.org/grpc" "github.com/smartcontractkit/chainlink-common/pkg/logger" diff --git a/pkg/loop/internal/reportingplugin/ccip/execution.go b/pkg/loop/internal/reportingplugin/ccip/execution.go index fd1bb10c3..d06fd8d39 100644 --- a/pkg/loop/internal/reportingplugin/ccip/execution.go +++ b/pkg/loop/internal/reportingplugin/ccip/execution.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/mwitkow/grpc-proxy/proxy" + "github.com/smartcontractkit/grpc-proxy/proxy" "google.golang.org/grpc" "github.com/smartcontractkit/chainlink-common/pkg/logger" diff --git a/pkg/loop/internal/reportingplugin/median/median.go b/pkg/loop/internal/reportingplugin/median/median.go index d21041814..e0f8e8462 100644 --- a/pkg/loop/internal/reportingplugin/median/median.go +++ b/pkg/loop/internal/reportingplugin/median/median.go @@ -3,7 +3,7 @@ package median import ( "context" - "github.com/mwitkow/grpc-proxy/proxy" + "github.com/smartcontractkit/grpc-proxy/proxy" "github.com/smartcontractkit/libocr/offchainreporting2/reportingplugin/median" "google.golang.org/grpc" diff --git a/pkg/loop/internal/reportingplugin/mercury/mercury.go b/pkg/loop/internal/reportingplugin/mercury/mercury.go index d2bb90dcf..d4d53cd4d 100644 --- a/pkg/loop/internal/reportingplugin/mercury/mercury.go +++ b/pkg/loop/internal/reportingplugin/mercury/mercury.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/mwitkow/grpc-proxy/proxy" + "github.com/smartcontractkit/grpc-proxy/proxy" "google.golang.org/grpc" "github.com/smartcontractkit/chainlink-common/pkg/logger"