Eliminate Proto V2 Namespace (#9297)

* get rid of v2 in prysm codebase

* replace block2

* builds

* terence comments

* gazelle
This commit is contained in:
Raul Jordan
2021-07-28 16:23:44 -05:00
committed by GitHub
parent 21c79f4dfa
commit 9145310647
481 changed files with 750 additions and 44895 deletions

View File

@@ -17,7 +17,6 @@ go_library(
visibility = ["//validator:__subpackages__"],
deps = [
"//proto/prysm/v1alpha1:go_default_library",
"//proto/prysm/v2:go_default_library",
"//shared/bls:go_default_library",
"//shared/cmd:go_default_library",
"//shared/event:go_default_library",
@@ -80,7 +79,6 @@ go_test(
deps = [
"//cmd/validator/flags:go_default_library",
"//proto/prysm/v1alpha1:go_default_library",
"//proto/prysm/v2:go_default_library",
"//shared/bls:go_default_library",
"//shared/bytesutil:go_default_library",
"//shared/event:go_default_library",

View File

@@ -7,7 +7,7 @@ import (
"encoding/json"
"fmt"
pb "github.com/prysmaticlabs/prysm/proto/prysm/v2"
pb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1"
"github.com/prysmaticlabs/prysm/shared/bls"
"github.com/prysmaticlabs/prysm/shared/cmd"
"github.com/prysmaticlabs/prysm/shared/pagination"

View File

@@ -14,7 +14,7 @@ import (
"github.com/golang/mock/gomock"
"github.com/prysmaticlabs/prysm/cmd/validator/flags"
ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1"
pb "github.com/prysmaticlabs/prysm/proto/prysm/v2"
pb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1"
"github.com/prysmaticlabs/prysm/shared/bytesutil"
"github.com/prysmaticlabs/prysm/shared/mock"
"github.com/prysmaticlabs/prysm/shared/testutil/assert"

View File

@@ -8,7 +8,7 @@ import (
"github.com/form3tech-oss/jwt-go"
"github.com/golang/protobuf/ptypes/empty"
"github.com/pkg/errors"
pb "github.com/prysmaticlabs/prysm/proto/prysm/v2"
pb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1"
"github.com/prysmaticlabs/prysm/shared/fileutil"
"github.com/prysmaticlabs/prysm/shared/promptutil"
"github.com/prysmaticlabs/prysm/shared/timeutils"

View File

@@ -8,7 +8,7 @@ import (
"github.com/form3tech-oss/jwt-go"
"github.com/golang/protobuf/ptypes/empty"
pb "github.com/prysmaticlabs/prysm/proto/prysm/v2"
pb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1"
"github.com/prysmaticlabs/prysm/shared/event"
"github.com/prysmaticlabs/prysm/shared/fileutil"
"github.com/prysmaticlabs/prysm/shared/testutil/assert"

View File

@@ -11,7 +11,7 @@ import (
grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus"
"github.com/pkg/errors"
ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1"
pb "github.com/prysmaticlabs/prysm/proto/prysm/v2"
pb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1"
"github.com/prysmaticlabs/prysm/shared/grpcutils"
"github.com/prysmaticlabs/prysm/validator/client"
"google.golang.org/grpc"

View File

@@ -9,7 +9,7 @@ import (
"github.com/golang/protobuf/ptypes/empty"
"github.com/pkg/errors"
ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1"
pb "github.com/prysmaticlabs/prysm/proto/prysm/v2"
pb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1"
"github.com/prysmaticlabs/prysm/shared/mock"
"github.com/prysmaticlabs/prysm/shared/testutil/assert"
"github.com/prysmaticlabs/prysm/shared/testutil/require"

View File

@@ -5,7 +5,7 @@ import (
"time"
"github.com/pkg/errors"
pb "github.com/prysmaticlabs/prysm/proto/prysm/v2"
pb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1"
"github.com/prysmaticlabs/prysm/shared/version"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"

View File

@@ -7,7 +7,7 @@ import (
"github.com/golang/protobuf/ptypes/empty"
ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1"
pb "github.com/prysmaticlabs/prysm/proto/prysm/v2"
pb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1"
"github.com/prysmaticlabs/prysm/shared/testutil/require"
"github.com/prysmaticlabs/prysm/validator/client"
"google.golang.org/protobuf/types/known/timestamppb"

View File

@@ -12,7 +12,7 @@ import (
grpc_opentracing "github.com/grpc-ecosystem/go-grpc-middleware/tracing/opentracing"
grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus"
ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1"
pb "github.com/prysmaticlabs/prysm/proto/prysm/v2"
pb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1"
"github.com/prysmaticlabs/prysm/shared/event"
"github.com/prysmaticlabs/prysm/shared/logutil"
"github.com/prysmaticlabs/prysm/shared/rand"

View File

@@ -1,7 +1,7 @@
package rpc
import (
pb "github.com/prysmaticlabs/prysm/proto/prysm/v2"
pb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1"
)
var _ pb.AuthServer = (*Server)(nil)

View File

@@ -7,7 +7,7 @@ import (
"github.com/golang/protobuf/ptypes/empty"
"github.com/pkg/errors"
pb "github.com/prysmaticlabs/prysm/proto/prysm/v2"
pb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1"
slashing "github.com/prysmaticlabs/prysm/validator/slashing-protection/local/standard-protection-format"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"

View File

@@ -6,7 +6,7 @@ import (
"testing"
"github.com/golang/protobuf/ptypes/empty"
pb "github.com/prysmaticlabs/prysm/proto/prysm/v2"
pb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1"
"github.com/prysmaticlabs/prysm/shared/testutil/require"
"github.com/prysmaticlabs/prysm/validator/accounts"
"github.com/prysmaticlabs/prysm/validator/accounts/wallet"

View File

@@ -10,7 +10,7 @@ import (
"github.com/golang/protobuf/ptypes/empty"
"github.com/pkg/errors"
pb "github.com/prysmaticlabs/prysm/proto/prysm/v2"
pb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1"
"github.com/prysmaticlabs/prysm/shared/featureconfig"
"github.com/prysmaticlabs/prysm/shared/fileutil"
"github.com/prysmaticlabs/prysm/shared/promptutil"

View File

@@ -10,7 +10,7 @@ import (
"github.com/golang/protobuf/ptypes/empty"
"github.com/google/uuid"
pb "github.com/prysmaticlabs/prysm/proto/prysm/v2"
pb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1"
"github.com/prysmaticlabs/prysm/shared/bls"
"github.com/prysmaticlabs/prysm/shared/event"
"github.com/prysmaticlabs/prysm/shared/featureconfig"