From 8f0008c45ad903a87967ef6cee4f1f415cc47567 Mon Sep 17 00:00:00 2001 From: Raul Jordan Date: Thu, 16 Sep 2021 14:55:51 -0500 Subject: [PATCH] Move Related Packages Into API/ Pkg (#9619) * begin on api pkg * build * build Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com> --- {shared => api}/gateway/BUILD.bazel | 6 +++--- {shared => api}/gateway/api_middleware.go | 0 {shared => api}/gateway/api_middleware_processing.go | 6 +++--- .../gateway/api_middleware_processing_test.go | 10 +++++----- {shared => api}/gateway/api_middleware_structs.go | 0 {shared => api}/gateway/gateway.go | 0 {shared => api}/gateway/gateway_test.go | 0 {shared => api}/gateway/log.go | 0 {shared => api}/gateway/param_handling.go | 0 {shared => api}/gateway/param_handling_test.go | 0 {shared/grpcutils => api/grpc}/BUILD.bazel | 2 +- {shared/grpcutils => api/grpc}/grpcutils.go | 2 +- {shared/grpcutils => api/grpc}/grpcutils_test.go | 2 +- {shared/grpcutils => api/grpc}/parameters.go | 2 +- {shared => api}/pagination/BUILD.bazel | 2 +- {shared => api}/pagination/pagination.go | 0 {shared => api}/pagination/pagination_test.go | 2 +- beacon-chain/gateway/BUILD.bazel | 2 +- beacon-chain/gateway/helpers.go | 2 +- beacon-chain/node/BUILD.bazel | 2 +- beacon-chain/node/node.go | 2 +- beacon-chain/rpc/apimiddleware/BUILD.bazel | 8 ++++---- beacon-chain/rpc/apimiddleware/custom_handlers.go | 6 +++--- beacon-chain/rpc/apimiddleware/custom_handlers_test.go | 8 ++++---- beacon-chain/rpc/apimiddleware/custom_hooks.go | 2 +- beacon-chain/rpc/apimiddleware/custom_hooks_test.go | 2 +- beacon-chain/rpc/apimiddleware/endpoint_factory.go | 2 +- beacon-chain/rpc/apimiddleware/structs.go | 2 +- beacon-chain/rpc/eth/beacon/BUILD.bazel | 4 ++-- beacon-chain/rpc/eth/beacon/pool.go | 4 ++-- beacon-chain/rpc/eth/beacon/pool_test.go | 4 ++-- beacon-chain/rpc/eth/beacon/sync_committee.go | 4 ++-- beacon-chain/rpc/eth/beacon/sync_committee_test.go | 4 ++-- beacon-chain/rpc/eth/node/BUILD.bazel | 4 ++-- beacon-chain/rpc/eth/node/node.go | 4 ++-- beacon-chain/rpc/eth/node/node_test.go | 4 ++-- beacon-chain/rpc/prysm/v1alpha1/beacon/BUILD.bazel | 2 +- beacon-chain/rpc/prysm/v1alpha1/beacon/assignments.go | 2 +- beacon-chain/rpc/prysm/v1alpha1/beacon/attestations.go | 2 +- beacon-chain/rpc/prysm/v1alpha1/beacon/blocks.go | 2 +- beacon-chain/rpc/prysm/v1alpha1/beacon/validators.go | 2 +- beacon-chain/server/BUILD.bazel | 2 +- beacon-chain/server/main.go | 2 +- cmd/beacon-chain/flags/BUILD.bazel | 2 +- validator/accounts/BUILD.bazel | 2 +- validator/accounts/accounts_exit.go | 4 ++-- validator/client/BUILD.bazel | 2 +- validator/client/service.go | 8 ++++---- validator/node/BUILD.bazel | 2 +- validator/node/node.go | 2 +- validator/rpc/BUILD.bazel | 4 ++-- validator/rpc/accounts.go | 2 +- validator/rpc/beacon.go | 4 ++-- validator/slashing-protection/BUILD.bazel | 2 +- validator/slashing-protection/slasher_client.go | 6 +++--- validator/web/BUILD.bazel | 2 +- 56 files changed, 80 insertions(+), 80 deletions(-) rename {shared => api}/gateway/BUILD.bazel (91%) rename {shared => api}/gateway/api_middleware.go (100%) rename {shared => api}/gateway/api_middleware_processing.go (98%) rename {shared => api}/gateway/api_middleware_processing_test.go (97%) rename {shared => api}/gateway/api_middleware_structs.go (100%) rename {shared => api}/gateway/gateway.go (100%) rename {shared => api}/gateway/gateway_test.go (100%) rename {shared => api}/gateway/log.go (100%) rename {shared => api}/gateway/param_handling.go (100%) rename {shared => api}/gateway/param_handling_test.go (100%) rename {shared/grpcutils => api/grpc}/BUILD.bazel (93%) rename {shared/grpcutils => api/grpc}/grpcutils.go (99%) rename {shared/grpcutils => api/grpc}/grpcutils_test.go (99%) rename {shared/grpcutils => api/grpc}/parameters.go (95%) rename {shared => api}/pagination/BUILD.bazel (88%) rename {shared => api}/pagination/pagination.go (100%) rename {shared => api}/pagination/pagination_test.go (97%) diff --git a/shared/gateway/BUILD.bazel b/api/gateway/BUILD.bazel similarity index 91% rename from shared/gateway/BUILD.bazel rename to api/gateway/BUILD.bazel index 4cde9249cc..d91982df49 100644 --- a/shared/gateway/BUILD.bazel +++ b/api/gateway/BUILD.bazel @@ -10,15 +10,15 @@ go_library( "log.go", "param_handling.go", ], - importpath = "github.com/prysmaticlabs/prysm/shared/gateway", + importpath = "github.com/prysmaticlabs/prysm/api/gateway", visibility = [ "//beacon-chain:__subpackages__", "//validator:__subpackages__", ], deps = [ + "//api/grpc:go_default_library", "//shared:go_default_library", "//shared/bytesutil:go_default_library", - "//shared/grpcutils:go_default_library", "@com_github_ethereum_go_ethereum//common/hexutil:go_default_library", "@com_github_gorilla_mux//:go_default_library", "@com_github_grpc_ecosystem_grpc_gateway_v2//runtime:go_default_library", @@ -41,8 +41,8 @@ go_test( ], embed = [":go_default_library"], deps = [ + "//api/grpc:go_default_library", "//cmd/beacon-chain/flags:go_default_library", - "//shared/grpcutils:go_default_library", "//shared/testutil/assert:go_default_library", "//shared/testutil/require:go_default_library", "@com_github_gorilla_mux//:go_default_library", diff --git a/shared/gateway/api_middleware.go b/api/gateway/api_middleware.go similarity index 100% rename from shared/gateway/api_middleware.go rename to api/gateway/api_middleware.go diff --git a/shared/gateway/api_middleware_processing.go b/api/gateway/api_middleware_processing.go similarity index 98% rename from shared/gateway/api_middleware_processing.go rename to api/gateway/api_middleware_processing.go index f05148b215..3190f39c62 100644 --- a/shared/gateway/api_middleware_processing.go +++ b/api/gateway/api_middleware_processing.go @@ -15,7 +15,7 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/shared/grpcutils" + "github.com/prysmaticlabs/prysm/api/grpc" "github.com/wealdtech/go-bytesutil" ) @@ -159,7 +159,7 @@ func WriteMiddlewareResponseHeadersAndBody(grpcResp *http.Response, responseJson for h, vs := range grpcResp.Header { // We don't want to expose any gRPC metadata in the HTTP response, so we skip forwarding metadata headers. if strings.HasPrefix(h, "Grpc-Metadata") { - if h == "Grpc-Metadata-"+grpcutils.HttpCodeMetadataKey { + if h == "Grpc-Metadata-"+grpc.HttpCodeMetadataKey { statusCodeHeader = vs[0] } } else { @@ -193,7 +193,7 @@ func WriteMiddlewareResponseHeadersAndBody(grpcResp *http.Response, responseJson func WriteError(w http.ResponseWriter, errJson ErrorJson, responseHeader http.Header) { // Include custom error in the error JSON. if responseHeader != nil { - customError, ok := responseHeader["Grpc-Metadata-"+grpcutils.CustomErrorMetadataKey] + customError, ok := responseHeader["Grpc-Metadata-"+grpc.CustomErrorMetadataKey] if ok { // Assume header has only one value and read the 0 index. if err := json.Unmarshal([]byte(customError[0]), errJson); err != nil { diff --git a/shared/gateway/api_middleware_processing_test.go b/api/gateway/api_middleware_processing_test.go similarity index 97% rename from shared/gateway/api_middleware_processing_test.go rename to api/gateway/api_middleware_processing_test.go index dbf96d1006..99b8a2bec5 100644 --- a/shared/gateway/api_middleware_processing_test.go +++ b/api/gateway/api_middleware_processing_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "github.com/prysmaticlabs/prysm/shared/grpcutils" + "github.com/prysmaticlabs/prysm/api/grpc" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" "github.com/sirupsen/logrus/hooks/test" @@ -265,7 +265,7 @@ func TestWriteMiddlewareResponseHeadersAndBody(t *testing.T) { response := &http.Response{ Header: http.Header{ "Foo": []string{"foo"}, - "Grpc-Metadata-" + grpcutils.HttpCodeMetadataKey: []string{"204"}, + "Grpc-Metadata-" + grpc.HttpCodeMetadataKey: []string{"204"}, }, } container := defaultResponseContainer() @@ -309,7 +309,7 @@ func TestWriteMiddlewareResponseHeadersAndBody(t *testing.T) { } // Set invalid status code. - response.Header["Grpc-Metadata-"+grpcutils.HttpCodeMetadataKey] = []string{"invalid"} + response.Header["Grpc-Metadata-"+grpc.HttpCodeMetadataKey] = []string{"invalid"} container := defaultResponseContainer() responseJson, err := json.Marshal(container) @@ -375,7 +375,7 @@ func TestWriteMiddlewareResponseHeadersAndBody(t *testing.T) { func TestWriteError(t *testing.T) { t.Run("ok", func(t *testing.T) { responseHeader := http.Header{ - "Grpc-Metadata-" + grpcutils.CustomErrorMetadataKey: []string{"{\"CustomField\":\"bar\"}"}, + "Grpc-Metadata-" + grpc.CustomErrorMetadataKey: []string{"{\"CustomField\":\"bar\"}"}, } errJson := &testErrorJson{ Message: "foo", @@ -405,7 +405,7 @@ func TestWriteError(t *testing.T) { logHook := test.NewGlobal() responseHeader := http.Header{ - "Grpc-Metadata-" + grpcutils.CustomErrorMetadataKey: []string{"invalid"}, + "Grpc-Metadata-" + grpc.CustomErrorMetadataKey: []string{"invalid"}, } WriteError(httptest.NewRecorder(), &testErrorJson{}, responseHeader) diff --git a/shared/gateway/api_middleware_structs.go b/api/gateway/api_middleware_structs.go similarity index 100% rename from shared/gateway/api_middleware_structs.go rename to api/gateway/api_middleware_structs.go diff --git a/shared/gateway/gateway.go b/api/gateway/gateway.go similarity index 100% rename from shared/gateway/gateway.go rename to api/gateway/gateway.go diff --git a/shared/gateway/gateway_test.go b/api/gateway/gateway_test.go similarity index 100% rename from shared/gateway/gateway_test.go rename to api/gateway/gateway_test.go diff --git a/shared/gateway/log.go b/api/gateway/log.go similarity index 100% rename from shared/gateway/log.go rename to api/gateway/log.go diff --git a/shared/gateway/param_handling.go b/api/gateway/param_handling.go similarity index 100% rename from shared/gateway/param_handling.go rename to api/gateway/param_handling.go diff --git a/shared/gateway/param_handling_test.go b/api/gateway/param_handling_test.go similarity index 100% rename from shared/gateway/param_handling_test.go rename to api/gateway/param_handling_test.go diff --git a/shared/grpcutils/BUILD.bazel b/api/grpc/BUILD.bazel similarity index 93% rename from shared/grpcutils/BUILD.bazel rename to api/grpc/BUILD.bazel index 21d1f7566d..9322151117 100644 --- a/shared/grpcutils/BUILD.bazel +++ b/api/grpc/BUILD.bazel @@ -6,7 +6,7 @@ go_library( "grpcutils.go", "parameters.go", ], - importpath = "github.com/prysmaticlabs/prysm/shared/grpcutils", + importpath = "github.com/prysmaticlabs/prysm/api/grpc", visibility = ["//visibility:public"], deps = [ "@com_github_sirupsen_logrus//:go_default_library", diff --git a/shared/grpcutils/grpcutils.go b/api/grpc/grpcutils.go similarity index 99% rename from shared/grpcutils/grpcutils.go rename to api/grpc/grpcutils.go index d6808c8b5e..53378b6c1a 100644 --- a/shared/grpcutils/grpcutils.go +++ b/api/grpc/grpcutils.go @@ -1,4 +1,4 @@ -package grpcutils +package grpc import ( "context" diff --git a/shared/grpcutils/grpcutils_test.go b/api/grpc/grpcutils_test.go similarity index 99% rename from shared/grpcutils/grpcutils_test.go rename to api/grpc/grpcutils_test.go index 99125b781b..f8cf4a5354 100644 --- a/shared/grpcutils/grpcutils_test.go +++ b/api/grpc/grpcutils_test.go @@ -1,4 +1,4 @@ -package grpcutils +package grpc import ( "context" diff --git a/shared/grpcutils/parameters.go b/api/grpc/parameters.go similarity index 95% rename from shared/grpcutils/parameters.go rename to api/grpc/parameters.go index feeb0660bd..326c21f527 100644 --- a/shared/grpcutils/parameters.go +++ b/api/grpc/parameters.go @@ -1,4 +1,4 @@ -package grpcutils +package grpc // CustomErrorMetadataKey is the name of the metadata key storing additional error information. // Metadata value is expected to be a byte-encoded JSON object. diff --git a/shared/pagination/BUILD.bazel b/api/pagination/BUILD.bazel similarity index 88% rename from shared/pagination/BUILD.bazel rename to api/pagination/BUILD.bazel index 3e71df0250..94cfe41f0d 100644 --- a/shared/pagination/BUILD.bazel +++ b/api/pagination/BUILD.bazel @@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["pagination.go"], - importpath = "github.com/prysmaticlabs/prysm/shared/pagination", + importpath = "github.com/prysmaticlabs/prysm/api/pagination", visibility = ["//visibility:public"], deps = [ "//shared/params:go_default_library", diff --git a/shared/pagination/pagination.go b/api/pagination/pagination.go similarity index 100% rename from shared/pagination/pagination.go rename to api/pagination/pagination.go diff --git a/shared/pagination/pagination_test.go b/api/pagination/pagination_test.go similarity index 97% rename from shared/pagination/pagination_test.go rename to api/pagination/pagination_test.go index 573fa4137e..7f33f8743c 100644 --- a/shared/pagination/pagination_test.go +++ b/api/pagination/pagination_test.go @@ -3,7 +3,7 @@ package pagination_test import ( "testing" - "github.com/prysmaticlabs/prysm/shared/pagination" + "github.com/prysmaticlabs/prysm/api/pagination" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" ) diff --git a/beacon-chain/gateway/BUILD.bazel b/beacon-chain/gateway/BUILD.bazel index 102d7bf212..1d08e58335 100644 --- a/beacon-chain/gateway/BUILD.bazel +++ b/beacon-chain/gateway/BUILD.bazel @@ -6,9 +6,9 @@ go_library( importpath = "github.com/prysmaticlabs/prysm/beacon-chain/gateway", visibility = ["//beacon-chain:__subpackages__"], deps = [ + "//api/gateway:go_default_library", "//proto/eth/service:go_default_library", "//proto/prysm/v1alpha1:go_default_library", - "//shared/gateway:go_default_library", "@com_github_grpc_ecosystem_grpc_gateway_v2//runtime:go_default_library", "@org_golang_google_protobuf//encoding/protojson:go_default_library", ], diff --git a/beacon-chain/gateway/helpers.go b/beacon-chain/gateway/helpers.go index bcf546d0b5..c948e2c7dc 100644 --- a/beacon-chain/gateway/helpers.go +++ b/beacon-chain/gateway/helpers.go @@ -2,9 +2,9 @@ package gateway import ( gwruntime "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" + "github.com/prysmaticlabs/prysm/api/gateway" ethpbservice "github.com/prysmaticlabs/prysm/proto/eth/service" ethpbalpha "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/shared/gateway" "google.golang.org/protobuf/encoding/protojson" ) diff --git a/beacon-chain/node/BUILD.bazel b/beacon-chain/node/BUILD.bazel index 8eb710ab07..e6412b1cf6 100644 --- a/beacon-chain/node/BUILD.bazel +++ b/beacon-chain/node/BUILD.bazel @@ -14,6 +14,7 @@ go_library( "//cmd/beacon-chain:__subpackages__", ], deps = [ + "//api/gateway:go_default_library", "//beacon-chain/blockchain:go_default_library", "//beacon-chain/cache/depositcache:go_default_library", "//beacon-chain/core/helpers:go_default_library", @@ -47,7 +48,6 @@ go_library( "//shared:go_default_library", "//shared/cmd:go_default_library", "//shared/event:go_default_library", - "//shared/gateway:go_default_library", "//shared/params:go_default_library", "@com_github_ethereum_go_ethereum//common:go_default_library", "@com_github_pkg_errors//:go_default_library", diff --git a/beacon-chain/node/node.go b/beacon-chain/node/node.go index 90417b3e75..a87c6b897d 100644 --- a/beacon-chain/node/node.go +++ b/beacon-chain/node/node.go @@ -16,6 +16,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/pkg/errors" + "github.com/prysmaticlabs/prysm/api/gateway" "github.com/prysmaticlabs/prysm/beacon-chain/blockchain" "github.com/prysmaticlabs/prysm/beacon-chain/cache/depositcache" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" @@ -48,7 +49,6 @@ import ( "github.com/prysmaticlabs/prysm/shared" "github.com/prysmaticlabs/prysm/shared/cmd" "github.com/prysmaticlabs/prysm/shared/event" - "github.com/prysmaticlabs/prysm/shared/gateway" "github.com/prysmaticlabs/prysm/shared/params" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" diff --git a/beacon-chain/rpc/apimiddleware/BUILD.bazel b/beacon-chain/rpc/apimiddleware/BUILD.bazel index e2b865f5d8..86ec5eb9ad 100644 --- a/beacon-chain/rpc/apimiddleware/BUILD.bazel +++ b/beacon-chain/rpc/apimiddleware/BUILD.bazel @@ -12,11 +12,11 @@ go_library( importpath = "github.com/prysmaticlabs/prysm/beacon-chain/rpc/apimiddleware", visibility = ["//beacon-chain:__subpackages__"], deps = [ + "//api/gateway:go_default_library", + "//api/grpc:go_default_library", "//beacon-chain/rpc/eth/events:go_default_library", "//proto/eth/v2:go_default_library", "//shared/bytesutil:go_default_library", - "//shared/gateway:go_default_library", - "//shared/grpcutils:go_default_library", "@com_github_ethereum_go_ethereum//common/hexutil:go_default_library", "@com_github_pkg_errors//:go_default_library", "@com_github_r3labs_sse//:go_default_library", @@ -32,11 +32,11 @@ go_test( ], embed = [":go_default_library"], deps = [ + "//api/gateway:go_default_library", + "//api/grpc:go_default_library", "//beacon-chain/rpc/eth/events:go_default_library", "//proto/eth/v2:go_default_library", "//shared/bytesutil:go_default_library", - "//shared/gateway:go_default_library", - "//shared/grpcutils:go_default_library", "//shared/testutil/assert:go_default_library", "//shared/testutil/require:go_default_library", "@com_github_gogo_protobuf//types:go_default_library", diff --git a/beacon-chain/rpc/apimiddleware/custom_handlers.go b/beacon-chain/rpc/apimiddleware/custom_handlers.go index 9f136bfa8f..2597e19ef2 100644 --- a/beacon-chain/rpc/apimiddleware/custom_handlers.go +++ b/beacon-chain/rpc/apimiddleware/custom_handlers.go @@ -11,9 +11,9 @@ import ( "strconv" "strings" + "github.com/prysmaticlabs/prysm/api/gateway" + "github.com/prysmaticlabs/prysm/api/grpc" "github.com/prysmaticlabs/prysm/beacon-chain/rpc/eth/events" - "github.com/prysmaticlabs/prysm/shared/gateway" - "github.com/prysmaticlabs/prysm/shared/grpcutils" "github.com/r3labs/sse" ) @@ -130,7 +130,7 @@ func writeSSZResponseHeaderAndBody(grpcResp *http.Response, w http.ResponseWrite for h, vs := range grpcResp.Header { // We don't want to expose any gRPC metadata in the HTTP response, so we skip forwarding metadata headers. if strings.HasPrefix(h, "Grpc-Metadata") { - if h == "Grpc-Metadata-"+grpcutils.HttpCodeMetadataKey { + if h == "Grpc-Metadata-"+grpc.HttpCodeMetadataKey { statusCodeHeader = vs[0] } } else { diff --git a/beacon-chain/rpc/apimiddleware/custom_handlers_test.go b/beacon-chain/rpc/apimiddleware/custom_handlers_test.go index 9f6a53aa34..63c616ccb2 100644 --- a/beacon-chain/rpc/apimiddleware/custom_handlers_test.go +++ b/beacon-chain/rpc/apimiddleware/custom_handlers_test.go @@ -10,9 +10,9 @@ import ( "testing" "time" + "github.com/prysmaticlabs/prysm/api/gateway" + "github.com/prysmaticlabs/prysm/api/grpc" "github.com/prysmaticlabs/prysm/beacon-chain/rpc/eth/events" - "github.com/prysmaticlabs/prysm/shared/gateway" - "github.com/prysmaticlabs/prysm/shared/grpcutils" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" "github.com/r3labs/sse" @@ -82,7 +82,7 @@ func TestWriteSSZResponseHeaderAndBody(t *testing.T) { response := &http.Response{ Header: http.Header{ "Foo": []string{"foo"}, - "Grpc-Metadata-" + grpcutils.HttpCodeMetadataKey: []string{"204"}, + "Grpc-Metadata-" + grpc.HttpCodeMetadataKey: []string{"204"}, }, } responseSsz := []byte("ssz") @@ -128,7 +128,7 @@ func TestWriteSSZResponseHeaderAndBody(t *testing.T) { response := &http.Response{ Header: http.Header{ "Foo": []string{"foo"}, - "Grpc-Metadata-" + grpcutils.HttpCodeMetadataKey: []string{"invalid"}, + "Grpc-Metadata-" + grpc.HttpCodeMetadataKey: []string{"invalid"}, }, } responseSsz := []byte("ssz") diff --git a/beacon-chain/rpc/apimiddleware/custom_hooks.go b/beacon-chain/rpc/apimiddleware/custom_hooks.go index 42d919d188..34519e52f5 100644 --- a/beacon-chain/rpc/apimiddleware/custom_hooks.go +++ b/beacon-chain/rpc/apimiddleware/custom_hooks.go @@ -9,9 +9,9 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/pkg/errors" + "github.com/prysmaticlabs/prysm/api/gateway" ethpbv2 "github.com/prysmaticlabs/prysm/proto/eth/v2" "github.com/prysmaticlabs/prysm/shared/bytesutil" - "github.com/prysmaticlabs/prysm/shared/gateway" ) // https://ethereum.github.io/beacon-apis/#/Beacon/submitPoolAttestations expects posting a top-level array. diff --git a/beacon-chain/rpc/apimiddleware/custom_hooks_test.go b/beacon-chain/rpc/apimiddleware/custom_hooks_test.go index 74bd7a62c8..5b49f18bfb 100644 --- a/beacon-chain/rpc/apimiddleware/custom_hooks_test.go +++ b/beacon-chain/rpc/apimiddleware/custom_hooks_test.go @@ -9,9 +9,9 @@ import ( "testing" "github.com/gogo/protobuf/types" + "github.com/prysmaticlabs/prysm/api/gateway" ethpbv2 "github.com/prysmaticlabs/prysm/proto/eth/v2" "github.com/prysmaticlabs/prysm/shared/bytesutil" - "github.com/prysmaticlabs/prysm/shared/gateway" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" ) diff --git a/beacon-chain/rpc/apimiddleware/endpoint_factory.go b/beacon-chain/rpc/apimiddleware/endpoint_factory.go index ce47e7b461..753cb11397 100644 --- a/beacon-chain/rpc/apimiddleware/endpoint_factory.go +++ b/beacon-chain/rpc/apimiddleware/endpoint_factory.go @@ -2,7 +2,7 @@ package apimiddleware import ( "github.com/pkg/errors" - "github.com/prysmaticlabs/prysm/shared/gateway" + "github.com/prysmaticlabs/prysm/api/gateway" ) // BeaconEndpointFactory creates endpoints used for running beacon chain API calls through the API Middleware. diff --git a/beacon-chain/rpc/apimiddleware/structs.go b/beacon-chain/rpc/apimiddleware/structs.go index a57dfaa5e6..006e48a54d 100644 --- a/beacon-chain/rpc/apimiddleware/structs.go +++ b/beacon-chain/rpc/apimiddleware/structs.go @@ -1,6 +1,6 @@ package apimiddleware -import "github.com/prysmaticlabs/prysm/shared/gateway" +import "github.com/prysmaticlabs/prysm/api/gateway" // genesisResponseJson is used in /beacon/genesis API endpoint. type genesisResponseJson struct { diff --git a/beacon-chain/rpc/eth/beacon/BUILD.bazel b/beacon-chain/rpc/eth/beacon/BUILD.bazel index af3aeda8ec..8b388b458a 100644 --- a/beacon-chain/rpc/eth/beacon/BUILD.bazel +++ b/beacon-chain/rpc/eth/beacon/BUILD.bazel @@ -15,6 +15,7 @@ go_library( importpath = "github.com/prysmaticlabs/prysm/beacon-chain/rpc/eth/beacon", visibility = ["//beacon-chain:__subpackages__"], deps = [ + "//api/grpc:go_default_library", "//beacon-chain/blockchain:go_default_library", "//beacon-chain/core:go_default_library", "//beacon-chain/core/altair:go_default_library", @@ -44,7 +45,6 @@ go_library( "//proto/prysm/v1alpha1/block:go_default_library", "//proto/prysm/v1alpha1/wrapper:go_default_library", "//shared/bytesutil:go_default_library", - "//shared/grpcutils:go_default_library", "//shared/p2putils:go_default_library", "//shared/params:go_default_library", "@com_github_ethereum_go_ethereum//common/hexutil:go_default_library", @@ -74,6 +74,7 @@ go_test( ], embed = [":go_default_library"], deps = [ + "//api/grpc:go_default_library", "//beacon-chain/blockchain/testing:go_default_library", "//beacon-chain/core:go_default_library", "//beacon-chain/core/helpers:go_default_library", @@ -99,7 +100,6 @@ go_test( "//proto/prysm/v1alpha1/block:go_default_library", "//proto/prysm/v1alpha1/wrapper:go_default_library", "//shared/bytesutil:go_default_library", - "//shared/grpcutils:go_default_library", "//shared/params:go_default_library", "//shared/testutil:go_default_library", "//shared/testutil/assert:go_default_library", diff --git a/beacon-chain/rpc/eth/beacon/pool.go b/beacon-chain/rpc/eth/beacon/pool.go index c2e0847ff4..01c8570cbf 100644 --- a/beacon-chain/rpc/eth/beacon/pool.go +++ b/beacon-chain/rpc/eth/beacon/pool.go @@ -3,6 +3,7 @@ package beacon import ( "context" + "github.com/prysmaticlabs/prysm/api/grpc" "github.com/prysmaticlabs/prysm/beacon-chain/core" "github.com/prysmaticlabs/prysm/beacon-chain/core/blocks" "github.com/prysmaticlabs/prysm/beacon-chain/core/feed" @@ -14,7 +15,6 @@ import ( ethpbv1 "github.com/prysmaticlabs/prysm/proto/eth/v1" "github.com/prysmaticlabs/prysm/proto/migration" ethpbalpha "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/shared/grpcutils" "go.opencensus.io/trace" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" @@ -118,7 +118,7 @@ func (bs *Server) SubmitAttestations(ctx context.Context, req *ethpbv1.SubmitAtt if len(attFailures) > 0 { failuresContainer := &helpers.IndexedVerificationFailure{Failures: attFailures} - err := grpcutils.AppendCustomErrorHeader(ctx, failuresContainer) + err := grpc.AppendCustomErrorHeader(ctx, failuresContainer) if err != nil { return nil, status.Errorf( codes.InvalidArgument, diff --git a/beacon-chain/rpc/eth/beacon/pool_test.go b/beacon-chain/rpc/eth/beacon/pool_test.go index 07fac897ed..c66885bf72 100644 --- a/beacon-chain/rpc/eth/beacon/pool_test.go +++ b/beacon-chain/rpc/eth/beacon/pool_test.go @@ -9,6 +9,7 @@ import ( "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" eth2types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/go-bitfield" + grpcutil "github.com/prysmaticlabs/prysm/api/grpc" chainMock "github.com/prysmaticlabs/prysm/beacon-chain/blockchain/testing" notifiermock "github.com/prysmaticlabs/prysm/beacon-chain/blockchain/testing" "github.com/prysmaticlabs/prysm/beacon-chain/core" @@ -22,7 +23,6 @@ import ( "github.com/prysmaticlabs/prysm/proto/migration" ethpb_v1alpha1 "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" - "github.com/prysmaticlabs/prysm/shared/grpcutils" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/assert" @@ -972,7 +972,7 @@ func TestServer_SubmitAttestations_InvalidAttestationGRPCHeader(t *testing.T) { sts, ok := grpc.ServerTransportStreamFromContext(ctx).(*runtime.ServerTransportStream) require.Equal(t, true, ok, "type assertion failed") md := sts.Header() - v, ok := md[strings.ToLower(grpcutils.CustomErrorMetadataKey)] + v, ok := md[strings.ToLower(grpcutil.CustomErrorMetadataKey)] require.Equal(t, true, ok, "could not retrieve custom error metadata value") assert.DeepEqual( t, diff --git a/beacon-chain/rpc/eth/beacon/sync_committee.go b/beacon-chain/rpc/eth/beacon/sync_committee.go index ceae21d835..8687221249 100644 --- a/beacon-chain/rpc/eth/beacon/sync_committee.go +++ b/beacon-chain/rpc/eth/beacon/sync_committee.go @@ -7,6 +7,7 @@ import ( "github.com/golang/protobuf/ptypes/empty" "github.com/pkg/errors" types "github.com/prysmaticlabs/eth2-types" + "github.com/prysmaticlabs/prysm/api/grpc" "github.com/prysmaticlabs/prysm/beacon-chain/core/altair" "github.com/prysmaticlabs/prysm/beacon-chain/rpc/eth/helpers" "github.com/prysmaticlabs/prysm/beacon-chain/state" @@ -14,7 +15,6 @@ import ( ethpbv2 "github.com/prysmaticlabs/prysm/proto/eth/v2" ethpbalpha "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" - "github.com/prysmaticlabs/prysm/shared/grpcutils" "github.com/prysmaticlabs/prysm/shared/params" "go.opencensus.io/trace" "google.golang.org/grpc/codes" @@ -135,7 +135,7 @@ func (bs *Server) SubmitPoolSyncCommitteeSignatures(ctx context.Context, req *et if len(msgFailures) > 0 { failuresContainer := &helpers.IndexedVerificationFailure{Failures: msgFailures} - err := grpcutils.AppendCustomErrorHeader(ctx, failuresContainer) + err := grpc.AppendCustomErrorHeader(ctx, failuresContainer) if err != nil { return nil, status.Errorf( codes.InvalidArgument, diff --git a/beacon-chain/rpc/eth/beacon/sync_committee_test.go b/beacon-chain/rpc/eth/beacon/sync_committee_test.go index 46af6fe2db..3c16ce5922 100644 --- a/beacon-chain/rpc/eth/beacon/sync_committee_test.go +++ b/beacon-chain/rpc/eth/beacon/sync_committee_test.go @@ -7,6 +7,7 @@ import ( "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" types "github.com/prysmaticlabs/eth2-types" + grpcutil "github.com/prysmaticlabs/prysm/api/grpc" mock "github.com/prysmaticlabs/prysm/beacon-chain/blockchain/testing" "github.com/prysmaticlabs/prysm/beacon-chain/operations/synccommittee" mockp2p "github.com/prysmaticlabs/prysm/beacon-chain/p2p/testing" @@ -15,7 +16,6 @@ import ( ethpbv2 "github.com/prysmaticlabs/prysm/proto/eth/v2" ethpbalpha "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" - "github.com/prysmaticlabs/prysm/shared/grpcutils" "github.com/prysmaticlabs/prysm/shared/params" sharedtestutil "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/assert" @@ -193,7 +193,7 @@ func TestSubmitPoolSyncCommitteeSignatures(t *testing.T) { sts, ok := grpc.ServerTransportStreamFromContext(ctx).(*runtime.ServerTransportStream) require.Equal(t, true, ok, "type assertion failed") md := sts.Header() - v, ok := md[strings.ToLower(grpcutils.CustomErrorMetadataKey)] + v, ok := md[strings.ToLower(grpcutil.CustomErrorMetadataKey)] require.Equal(t, true, ok, "could not retrieve custom error metadata value") assert.DeepEqual( t, diff --git a/beacon-chain/rpc/eth/node/BUILD.bazel b/beacon-chain/rpc/eth/node/BUILD.bazel index d24a67860a..7e741e7bcd 100644 --- a/beacon-chain/rpc/eth/node/BUILD.bazel +++ b/beacon-chain/rpc/eth/node/BUILD.bazel @@ -9,6 +9,7 @@ go_library( importpath = "github.com/prysmaticlabs/prysm/beacon-chain/rpc/eth/node", visibility = ["//beacon-chain:__subpackages__"], deps = [ + "//api/grpc:go_default_library", "//beacon-chain/blockchain:go_default_library", "//beacon-chain/db:go_default_library", "//beacon-chain/p2p:go_default_library", @@ -19,7 +20,6 @@ go_library( "//proto/migration:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//runtime/version:go_default_library", - "//shared/grpcutils:go_default_library", "@com_github_libp2p_go_libp2p_core//peer:go_default_library", "@com_github_pkg_errors//:go_default_library", "@io_opencensus_go//trace:go_default_library", @@ -39,6 +39,7 @@ go_test( ], embed = [":go_default_library"], deps = [ + "//api/grpc:go_default_library", "//beacon-chain/blockchain/testing:go_default_library", "//beacon-chain/p2p:go_default_library", "//beacon-chain/p2p/peers:go_default_library", @@ -49,7 +50,6 @@ go_test( "//proto/prysm/v1alpha1:go_default_library", "//proto/prysm/v1alpha1/wrapper:go_default_library", "//runtime/version:go_default_library", - "//shared/grpcutils:go_default_library", "//shared/testutil:go_default_library", "//shared/testutil/assert:go_default_library", "//shared/testutil/require:go_default_library", diff --git a/beacon-chain/rpc/eth/node/node.go b/beacon-chain/rpc/eth/node/node.go index 50b5e7334c..e034ec63da 100644 --- a/beacon-chain/rpc/eth/node/node.go +++ b/beacon-chain/rpc/eth/node/node.go @@ -10,6 +10,7 @@ import ( "github.com/libp2p/go-libp2p-core/peer" "github.com/pkg/errors" + grpcutil "github.com/prysmaticlabs/prysm/api/grpc" "github.com/prysmaticlabs/prysm/beacon-chain/p2p" "github.com/prysmaticlabs/prysm/beacon-chain/p2p/peers" "github.com/prysmaticlabs/prysm/beacon-chain/p2p/peers/peerdata" @@ -17,7 +18,6 @@ import ( "github.com/prysmaticlabs/prysm/proto/migration" eth "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/runtime/version" - "github.com/prysmaticlabs/prysm/shared/grpcutils" "go.opencensus.io/trace" "google.golang.org/grpc" "google.golang.org/grpc/codes" @@ -291,7 +291,7 @@ func (ns *Server) GetHealth(ctx context.Context, _ *emptypb.Empty) (*emptypb.Emp return &emptypb.Empty{}, nil } if ns.SyncChecker.Syncing() || ns.SyncChecker.Initialized() { - if err := grpc.SetHeader(ctx, metadata.Pairs(grpcutils.HttpCodeMetadataKey, strconv.Itoa(http.StatusPartialContent))); err != nil { + if err := grpc.SetHeader(ctx, metadata.Pairs(grpcutil.HttpCodeMetadataKey, strconv.Itoa(http.StatusPartialContent))); err != nil { // We return a positive result because failing to set a non-gRPC related header should not cause the gRPC call to fail. return &emptypb.Empty{}, nil } diff --git a/beacon-chain/rpc/eth/node/node_test.go b/beacon-chain/rpc/eth/node/node_test.go index 8223268956..dfc7d9f8cf 100644 --- a/beacon-chain/rpc/eth/node/node_test.go +++ b/beacon-chain/rpc/eth/node/node_test.go @@ -18,6 +18,7 @@ import ( ma "github.com/multiformats/go-multiaddr" types "github.com/prysmaticlabs/eth2-types" "github.com/prysmaticlabs/go-bitfield" + grpcutil "github.com/prysmaticlabs/prysm/api/grpc" mock "github.com/prysmaticlabs/prysm/beacon-chain/blockchain/testing" "github.com/prysmaticlabs/prysm/beacon-chain/p2p" "github.com/prysmaticlabs/prysm/beacon-chain/p2p/peers" @@ -27,7 +28,6 @@ import ( pb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/wrapper" "github.com/prysmaticlabs/prysm/runtime/version" - "github.com/prysmaticlabs/prysm/shared/grpcutils" "github.com/prysmaticlabs/prysm/shared/testutil" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" @@ -66,7 +66,7 @@ func TestGetHealth(t *testing.T) { require.NoError(t, err) stream, ok := grpc.ServerTransportStreamFromContext(ctx).(*grpcruntime.ServerTransportStream) require.Equal(t, true, ok, "type assertion failed") - assert.Equal(t, stream.Header()[strings.ToLower(grpcutils.HttpCodeMetadataKey)][0], strconv.Itoa(http.StatusPartialContent)) + assert.Equal(t, stream.Header()[strings.ToLower(grpcutil.HttpCodeMetadataKey)][0], strconv.Itoa(http.StatusPartialContent)) checker.IsSynced = true _, err = s.GetHealth(ctx, &emptypb.Empty{}) require.NoError(t, err) diff --git a/beacon-chain/rpc/prysm/v1alpha1/beacon/BUILD.bazel b/beacon-chain/rpc/prysm/v1alpha1/beacon/BUILD.bazel index 4698de0e5e..ec1c59eb91 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/beacon/BUILD.bazel +++ b/beacon-chain/rpc/prysm/v1alpha1/beacon/BUILD.bazel @@ -17,6 +17,7 @@ go_library( importpath = "github.com/prysmaticlabs/prysm/beacon-chain/rpc/prysm/v1alpha1/beacon", visibility = ["//beacon-chain:__subpackages__"], deps = [ + "//api/pagination:go_default_library", "//beacon-chain/blockchain:go_default_library", "//beacon-chain/cache/depositcache:go_default_library", "//beacon-chain/core:go_default_library", @@ -49,7 +50,6 @@ go_library( "//shared/bytesutil:go_default_library", "//shared/cmd:go_default_library", "//shared/event:go_default_library", - "//shared/pagination:go_default_library", "//shared/params:go_default_library", "//time/slots:go_default_library", "@com_github_patrickmn_go_cache//:go_default_library", diff --git a/beacon-chain/rpc/prysm/v1alpha1/beacon/assignments.go b/beacon-chain/rpc/prysm/v1alpha1/beacon/assignments.go index ca4a5e7a64..496c3ddd5d 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/beacon/assignments.go +++ b/beacon-chain/rpc/prysm/v1alpha1/beacon/assignments.go @@ -5,12 +5,12 @@ import ( "strconv" types "github.com/prysmaticlabs/eth2-types" + "github.com/prysmaticlabs/prysm/api/pagination" "github.com/prysmaticlabs/prysm/beacon-chain/core" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/cmd" - "github.com/prysmaticlabs/prysm/shared/pagination" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/beacon-chain/rpc/prysm/v1alpha1/beacon/attestations.go b/beacon-chain/rpc/prysm/v1alpha1/beacon/attestations.go index 2f9f48d503..31ffd5e7d1 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/beacon/attestations.go +++ b/beacon-chain/rpc/prysm/v1alpha1/beacon/attestations.go @@ -6,6 +6,7 @@ import ( "strconv" "strings" + "github.com/prysmaticlabs/prysm/api/pagination" "github.com/prysmaticlabs/prysm/beacon-chain/core" "github.com/prysmaticlabs/prysm/beacon-chain/core/feed" "github.com/prysmaticlabs/prysm/beacon-chain/core/feed/operation" @@ -17,7 +18,6 @@ import ( "github.com/prysmaticlabs/prysm/shared/attestationutil" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/cmd" - "github.com/prysmaticlabs/prysm/shared/pagination" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/time/slots" "google.golang.org/grpc/codes" diff --git a/beacon-chain/rpc/prysm/v1alpha1/beacon/blocks.go b/beacon-chain/rpc/prysm/v1alpha1/beacon/blocks.go index 963cf61c9f..09cee3a5c4 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/beacon/blocks.go +++ b/beacon-chain/rpc/prysm/v1alpha1/beacon/blocks.go @@ -4,6 +4,7 @@ import ( "context" "strconv" + "github.com/prysmaticlabs/prysm/api/pagination" "github.com/prysmaticlabs/prysm/beacon-chain/core" "github.com/prysmaticlabs/prysm/beacon-chain/core/blocks" "github.com/prysmaticlabs/prysm/beacon-chain/core/feed" @@ -17,7 +18,6 @@ import ( "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/cmd" "github.com/prysmaticlabs/prysm/shared/event" - "github.com/prysmaticlabs/prysm/shared/pagination" "github.com/prysmaticlabs/prysm/shared/params" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/beacon-chain/rpc/prysm/v1alpha1/beacon/validators.go b/beacon-chain/rpc/prysm/v1alpha1/beacon/validators.go index ebc09e233b..8aaed7bd41 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/beacon/validators.go +++ b/beacon-chain/rpc/prysm/v1alpha1/beacon/validators.go @@ -7,6 +7,7 @@ import ( "time" types "github.com/prysmaticlabs/eth2-types" + "github.com/prysmaticlabs/prysm/api/pagination" "github.com/prysmaticlabs/prysm/beacon-chain/core" "github.com/prysmaticlabs/prysm/beacon-chain/core/altair" "github.com/prysmaticlabs/prysm/beacon-chain/core/epoch/precompute" @@ -18,7 +19,6 @@ import ( "github.com/prysmaticlabs/prysm/runtime/version" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/cmd" - "github.com/prysmaticlabs/prysm/shared/pagination" "github.com/prysmaticlabs/prysm/shared/params" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/beacon-chain/server/BUILD.bazel b/beacon-chain/server/BUILD.bazel index 5dbebcdf85..50516fe054 100644 --- a/beacon-chain/server/BUILD.bazel +++ b/beacon-chain/server/BUILD.bazel @@ -10,10 +10,10 @@ go_library( importpath = "github.com/prysmaticlabs/prysm/beacon-chain/server", visibility = ["//visibility:private"], deps = [ + "//api/gateway:go_default_library", "//beacon-chain/gateway:go_default_library", "//beacon-chain/rpc/apimiddleware:go_default_library", "//runtime/maxprocs:go_default_library", - "//shared/gateway:go_default_library", "@com_github_joonix_log//:go_default_library", "@com_github_sirupsen_logrus//:go_default_library", ], diff --git a/beacon-chain/server/main.go b/beacon-chain/server/main.go index aed87aa8a6..77644192a9 100644 --- a/beacon-chain/server/main.go +++ b/beacon-chain/server/main.go @@ -10,10 +10,10 @@ import ( "strings" joonix "github.com/joonix/log" + "github.com/prysmaticlabs/prysm/api/gateway" beaconGateway "github.com/prysmaticlabs/prysm/beacon-chain/gateway" "github.com/prysmaticlabs/prysm/beacon-chain/rpc/apimiddleware" _ "github.com/prysmaticlabs/prysm/runtime/maxprocs" - "github.com/prysmaticlabs/prysm/shared/gateway" "github.com/sirupsen/logrus" ) diff --git a/cmd/beacon-chain/flags/BUILD.bazel b/cmd/beacon-chain/flags/BUILD.bazel index c4f5d95a9f..a1a66dc0bf 100644 --- a/cmd/beacon-chain/flags/BUILD.bazel +++ b/cmd/beacon-chain/flags/BUILD.bazel @@ -10,9 +10,9 @@ go_library( ], importpath = "github.com/prysmaticlabs/prysm/cmd/beacon-chain/flags", visibility = [ + "//api/gateway:__pkg__", "//beacon-chain:__subpackages__", "//cmd/beacon-chain:__subpackages__", - "//shared/gateway:__pkg__", "//testing/endtoend:__subpackages__", ], deps = [ diff --git a/validator/accounts/BUILD.bazel b/validator/accounts/BUILD.bazel index 933459d8b5..1a6f440139 100644 --- a/validator/accounts/BUILD.bazel +++ b/validator/accounts/BUILD.bazel @@ -23,6 +23,7 @@ go_library( "//validator:__subpackages__", ], deps = [ + "//api/grpc:go_default_library", "//beacon-chain/core/blocks:go_default_library", "//cmd/validator/flags:go_default_library", "//crypto/bls:go_default_library", @@ -30,7 +31,6 @@ go_library( "//shared/bytesutil:go_default_library", "//shared/cmd:go_default_library", "//shared/fileutil:go_default_library", - "//shared/grpcutils:go_default_library", "//shared/params:go_default_library", "//shared/petnames:go_default_library", "//shared/promptutil:go_default_library", diff --git a/validator/accounts/accounts_exit.go b/validator/accounts/accounts_exit.go index 2fe071d36e..656af149cf 100644 --- a/validator/accounts/accounts_exit.go +++ b/validator/accounts/accounts_exit.go @@ -9,12 +9,12 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/pkg/errors" + grpcutil "github.com/prysmaticlabs/prysm/api/grpc" "github.com/prysmaticlabs/prysm/beacon-chain/core/blocks" "github.com/prysmaticlabs/prysm/cmd/validator/flags" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/cmd" - "github.com/prysmaticlabs/prysm/shared/grpcutils" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/promptutil" "github.com/prysmaticlabs/prysm/validator/accounts/iface" @@ -239,7 +239,7 @@ func prepareClients(cliCtx *cli.Context) (*ethpb.BeaconNodeValidatorClient, *eth } grpcHeaders := strings.Split(cliCtx.String(flags.GrpcHeadersFlag.Name), ",") - cliCtx.Context = grpcutils.AppendHeaders(cliCtx.Context, grpcHeaders) + cliCtx.Context = grpcutil.AppendHeaders(cliCtx.Context, grpcHeaders) conn, err := grpc.DialContext(cliCtx.Context, cliCtx.String(flags.BeaconRPCProviderFlag.Name), dialOpts...) if err != nil { diff --git a/validator/client/BUILD.bazel b/validator/client/BUILD.bazel index 8ab288c691..d31ac93914 100644 --- a/validator/client/BUILD.bazel +++ b/validator/client/BUILD.bazel @@ -21,6 +21,7 @@ go_library( importpath = "github.com/prysmaticlabs/prysm/validator/client", visibility = ["//validator:__subpackages__"], deps = [ + "//api/grpc:go_default_library", "//beacon-chain/core:go_default_library", "//beacon-chain/core/altair:go_default_library", "//beacon-chain/core/helpers:go_default_library", @@ -38,7 +39,6 @@ go_library( "//shared/blockutil:go_default_library", "//shared/bytesutil:go_default_library", "//shared/event:go_default_library", - "//shared/grpcutils:go_default_library", "//shared/mathutil:go_default_library", "//shared/mputil:go_default_library", "//shared/params:go_default_library", diff --git a/validator/client/service.go b/validator/client/service.go index 554e615dd5..0fe92a6701 100644 --- a/validator/client/service.go +++ b/validator/client/service.go @@ -13,12 +13,12 @@ import ( grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus" "github.com/pkg/errors" types "github.com/prysmaticlabs/eth2-types" + grpcutil "github.com/prysmaticlabs/prysm/api/grpc" lruwrpr "github.com/prysmaticlabs/prysm/cache/lru" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/block" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/event" - "github.com/prysmaticlabs/prysm/shared/grpcutils" "github.com/prysmaticlabs/prysm/shared/params" accountsiface "github.com/prysmaticlabs/prysm/validator/accounts/iface" "github.com/prysmaticlabs/prysm/validator/accounts/wallet" @@ -135,7 +135,7 @@ func (v *ValidatorService) Start() { return } - v.ctx = grpcutils.AppendHeaders(v.ctx, v.grpcHeaders) + v.ctx = grpcutil.AppendHeaders(v.ctx, v.grpcHeaders) conn, err := grpc.DialContext(v.ctx, v.endpoint, dialOpts...) if err != nil { @@ -302,10 +302,10 @@ func ConstructDialOptions( grpc_opentracing.UnaryClientInterceptor(), grpc_prometheus.UnaryClientInterceptor, grpc_retry.UnaryClientInterceptor(), - grpcutils.LogRequests, + grpcutil.LogRequests, )), grpc.WithChainStreamInterceptor( - grpcutils.LogStream, + grpcutil.LogStream, grpc_opentracing.StreamClientInterceptor(), grpc_prometheus.StreamClientInterceptor, grpc_retry.StreamClientInterceptor(), diff --git a/validator/node/BUILD.bazel b/validator/node/BUILD.bazel index 0102d0226c..489e9d1a6c 100644 --- a/validator/node/BUILD.bazel +++ b/validator/node/BUILD.bazel @@ -28,6 +28,7 @@ go_library( "//validator:__subpackages__", ], deps = [ + "//api/gateway:go_default_library", "//cmd/validator/flags:go_default_library", "//config/features:go_default_library", "//monitoring/backup:go_default_library", @@ -42,7 +43,6 @@ go_library( "//shared/cmd:go_default_library", "//shared/event:go_default_library", "//shared/fileutil:go_default_library", - "//shared/gateway:go_default_library", "//shared/params:go_default_library", "//validator/accounts/iface:go_default_library", "//validator/accounts/wallet:go_default_library", diff --git a/validator/node/node.go b/validator/node/node.go index 1ac4b32f4a..988c1249f1 100644 --- a/validator/node/node.go +++ b/validator/node/node.go @@ -16,6 +16,7 @@ import ( gwruntime "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "github.com/pkg/errors" + "github.com/prysmaticlabs/prysm/api/gateway" "github.com/prysmaticlabs/prysm/cmd/validator/flags" "github.com/prysmaticlabs/prysm/config/features" "github.com/prysmaticlabs/prysm/monitoring/backup" @@ -30,7 +31,6 @@ import ( "github.com/prysmaticlabs/prysm/shared/cmd" "github.com/prysmaticlabs/prysm/shared/event" "github.com/prysmaticlabs/prysm/shared/fileutil" - "github.com/prysmaticlabs/prysm/shared/gateway" "github.com/prysmaticlabs/prysm/shared/params" accountsiface "github.com/prysmaticlabs/prysm/validator/accounts/iface" "github.com/prysmaticlabs/prysm/validator/accounts/wallet" diff --git a/validator/rpc/BUILD.bazel b/validator/rpc/BUILD.bazel index c7327526da..ae57444c09 100644 --- a/validator/rpc/BUILD.bazel +++ b/validator/rpc/BUILD.bazel @@ -16,6 +16,8 @@ go_library( importpath = "github.com/prysmaticlabs/prysm/validator/rpc", visibility = ["//validator:__subpackages__"], deps = [ + "//api/grpc:go_default_library", + "//api/pagination:go_default_library", "//config/features:go_default_library", "//crypto/bls:go_default_library", "//crypto/rand:go_default_library", @@ -26,9 +28,7 @@ go_library( "//shared/cmd:go_default_library", "//shared/event:go_default_library", "//shared/fileutil:go_default_library", - "//shared/grpcutils:go_default_library", "//shared/logutil:go_default_library", - "//shared/pagination:go_default_library", "//shared/petnames:go_default_library", "//shared/promptutil:go_default_library", "//time:go_default_library", diff --git a/validator/rpc/accounts.go b/validator/rpc/accounts.go index d10e7f1d70..debe0b1351 100644 --- a/validator/rpc/accounts.go +++ b/validator/rpc/accounts.go @@ -7,10 +7,10 @@ import ( "encoding/json" "fmt" + "github.com/prysmaticlabs/prysm/api/pagination" "github.com/prysmaticlabs/prysm/crypto/bls" pb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/validator-client" "github.com/prysmaticlabs/prysm/shared/cmd" - "github.com/prysmaticlabs/prysm/shared/pagination" "github.com/prysmaticlabs/prysm/shared/petnames" "github.com/prysmaticlabs/prysm/validator/accounts" "github.com/prysmaticlabs/prysm/validator/keymanager" diff --git a/validator/rpc/beacon.go b/validator/rpc/beacon.go index 9c5eab339d..e373880335 100644 --- a/validator/rpc/beacon.go +++ b/validator/rpc/beacon.go @@ -10,10 +10,10 @@ import ( grpc_opentracing "github.com/grpc-ecosystem/go-grpc-middleware/tracing/opentracing" grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus" "github.com/pkg/errors" + grpcutil "github.com/prysmaticlabs/prysm/api/grpc" ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" pb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" validatorpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/validator-client" - "github.com/prysmaticlabs/prysm/shared/grpcutils" "github.com/prysmaticlabs/prysm/validator/client" "google.golang.org/grpc" "google.golang.org/protobuf/types/known/emptypb" @@ -37,7 +37,7 @@ func (s *Server) registerBeaconClient() error { return errors.New("no dial options for beacon chain gRPC client") } - s.ctx = grpcutils.AppendHeaders(s.ctx, s.clientGrpcHeaders) + s.ctx = grpcutil.AppendHeaders(s.ctx, s.clientGrpcHeaders) conn, err := grpc.DialContext(s.ctx, s.beaconClientEndpoint, dialOpts...) if err != nil { diff --git a/validator/slashing-protection/BUILD.bazel b/validator/slashing-protection/BUILD.bazel index aeebfadd51..62aa2e1185 100644 --- a/validator/slashing-protection/BUILD.bazel +++ b/validator/slashing-protection/BUILD.bazel @@ -15,11 +15,11 @@ go_library( "//validator:__subpackages__", ], deps = [ + "//api/grpc:go_default_library", "//cmd/validator/flags:go_default_library", "//proto/prysm/v1alpha1:go_default_library", "//shared/cmd:go_default_library", "//shared/fileutil:go_default_library", - "//shared/grpcutils:go_default_library", "//validator/accounts/prompt:go_default_library", "//validator/db/kv:go_default_library", "//validator/slashing-protection/local/standard-protection-format:go_default_library", diff --git a/validator/slashing-protection/slasher_client.go b/validator/slashing-protection/slasher_client.go index bcebfd9055..907fca66c7 100644 --- a/validator/slashing-protection/slasher_client.go +++ b/validator/slashing-protection/slasher_client.go @@ -11,8 +11,8 @@ import ( grpc_retry "github.com/grpc-ecosystem/go-grpc-middleware/retry" grpc_opentracing "github.com/grpc-ecosystem/go-grpc-middleware/tracing/opentracing" grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus" + grpcutil "github.com/prysmaticlabs/prysm/api/grpc" ethsl "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1" - "github.com/prysmaticlabs/prysm/shared/grpcutils" "go.opencensus.io/plugin/ocgrpc" "google.golang.org/grpc" "google.golang.org/grpc/connectivity" @@ -74,7 +74,7 @@ func (s *Service) startSlasherClient() ethsl.SlasherClient { log.Warn("You are using an insecure slasher gRPC connection! Please provide a certificate and key to use a secure connection.") } - s.ctx = grpcutils.AppendHeaders(s.ctx, s.grpcHeaders) + s.ctx = grpcutil.AppendHeaders(s.ctx, s.grpcHeaders) opts := []grpc.DialOption{ dialOpt, @@ -92,7 +92,7 @@ func (s *Service) startSlasherClient() ethsl.SlasherClient { grpc_opentracing.UnaryClientInterceptor(), grpc_prometheus.UnaryClientInterceptor, grpc_retry.UnaryClientInterceptor(), - grpcutils.LogRequests, + grpcutil.LogRequests, )), } conn, err := grpc.DialContext(s.ctx, s.cfg.Endpoint, opts...) diff --git a/validator/web/BUILD.bazel b/validator/web/BUILD.bazel index bcc53d4610..bcc58313e6 100644 --- a/validator/web/BUILD.bazel +++ b/validator/web/BUILD.bazel @@ -13,7 +13,7 @@ go_library( ], importpath = "github.com/prysmaticlabs/prysm/validator/web", visibility = [ - "//shared/gateway:__pkg__", + "//api/gateway:__pkg__", "//validator:__subpackages__", ], deps = [