diff --git a/endtoend/evaluators/slashing.go b/endtoend/evaluators/slashing.go index 222667f4a7..8ccb4574fa 100644 --- a/endtoend/evaluators/slashing.go +++ b/endtoend/evaluators/slashing.go @@ -6,7 +6,7 @@ import ( ptypes "github.com/gogo/protobuf/types" "github.com/pkg/errors" - "github.com/prysmaticlabs/eth2-types" + types "github.com/prysmaticlabs/eth2-types" eth "github.com/prysmaticlabs/ethereumapis/eth/v1alpha1" "github.com/prysmaticlabs/go-bitfield" corehelpers "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" diff --git a/proto/beacon/db/finalized_block_root_container.pb.go b/proto/beacon/db/finalized_block_root_container.pb.go index 98ec9bb4c0..923aa4a011 100755 --- a/proto/beacon/db/finalized_block_root_container.pb.go +++ b/proto/beacon/db/finalized_block_root_container.pb.go @@ -5,10 +5,11 @@ package db import ( fmt "fmt" - proto "github.com/gogo/protobuf/proto" io "io" math "math" math_bits "math/bits" + + proto "github.com/gogo/protobuf/proto" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/proto/beacon/db/powchain.pb.go b/proto/beacon/db/powchain.pb.go index fa3a47a4f1..ee4e762cb7 100755 --- a/proto/beacon/db/powchain.pb.go +++ b/proto/beacon/db/powchain.pb.go @@ -5,12 +5,13 @@ package db import ( fmt "fmt" - proto "github.com/gogo/protobuf/proto" - v1alpha1 "github.com/prysmaticlabs/ethereumapis/eth/v1alpha1" - v1 "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" io "io" math "math" math_bits "math/bits" + + proto "github.com/gogo/protobuf/proto" + v1alpha1 "github.com/prysmaticlabs/ethereumapis/eth/v1alpha1" + v1 "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/proto/beacon/p2p/v1/messages.pb.go b/proto/beacon/p2p/v1/messages.pb.go index 297dbef65c..d3122e9068 100755 --- a/proto/beacon/p2p/v1/messages.pb.go +++ b/proto/beacon/p2p/v1/messages.pb.go @@ -5,13 +5,14 @@ package ethereum_beacon_p2p_v1 import ( fmt "fmt" + io "io" + math "math" + math_bits "math/bits" + _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" github_com_prysmaticlabs_eth2_types "github.com/prysmaticlabs/eth2-types" github_com_prysmaticlabs_go_bitfield "github.com/prysmaticlabs/go-bitfield" - io "io" - math "math" - math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/proto/beacon/p2p/v1/types.pb.go b/proto/beacon/p2p/v1/types.pb.go index faf14bf55f..84f9defca3 100755 --- a/proto/beacon/p2p/v1/types.pb.go +++ b/proto/beacon/p2p/v1/types.pb.go @@ -5,14 +5,15 @@ package ethereum_beacon_p2p_v1 import ( fmt "fmt" + io "io" + math "math" + math_bits "math/bits" + _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" github_com_prysmaticlabs_eth2_types "github.com/prysmaticlabs/eth2-types" v1alpha1 "github.com/prysmaticlabs/ethereumapis/eth/v1alpha1" github_com_prysmaticlabs_go_bitfield "github.com/prysmaticlabs/go-bitfield" - io "io" - math "math" - math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/proto/beacon/rpc/v1/debug.pb.go b/proto/beacon/rpc/v1/debug.pb.go index c89009d2e0..1fcb1ce7da 100755 --- a/proto/beacon/rpc/v1/debug.pb.go +++ b/proto/beacon/rpc/v1/debug.pb.go @@ -7,6 +7,10 @@ import ( context "context" encoding_binary "encoding/binary" fmt "fmt" + io "io" + math "math" + math_bits "math/bits" + _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" types "github.com/gogo/protobuf/types" @@ -17,9 +21,6 @@ import ( grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" - io "io" - math "math" - math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/proto/beacon/rpc/v1/health.pb.go b/proto/beacon/rpc/v1/health.pb.go index ebebd94eb9..4c95f8a5b7 100755 --- a/proto/beacon/rpc/v1/health.pb.go +++ b/proto/beacon/rpc/v1/health.pb.go @@ -6,15 +6,16 @@ package ethereum_beacon_rpc_v1 import ( context "context" fmt "fmt" + io "io" + math "math" + math_bits "math/bits" + proto "github.com/gogo/protobuf/proto" types "github.com/gogo/protobuf/types" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" - io "io" - math "math" - math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/proto/beacon/rpc/v1_gateway/debug.pb.go b/proto/beacon/rpc/v1_gateway/debug.pb.go index f1ba3197d9..2687f2ea7f 100755 --- a/proto/beacon/rpc/v1_gateway/debug.pb.go +++ b/proto/beacon/rpc/v1_gateway/debug.pb.go @@ -8,6 +8,9 @@ package ethereum_beacon_rpc_v1 import ( context "context" + reflect "reflect" + sync "sync" + _ "github.com/gogo/protobuf/gogoproto" proto "github.com/golang/protobuf/proto" empty "github.com/golang/protobuf/ptypes/empty" @@ -19,8 +22,6 @@ import ( status "google.golang.org/grpc/status" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( diff --git a/proto/beacon/rpc/v1_gateway/debug.pb.gw.go b/proto/beacon/rpc/v1_gateway/debug.pb.gw.go index 08d6dd8f84..115d2aec40 100755 --- a/proto/beacon/rpc/v1_gateway/debug.pb.gw.go +++ b/proto/beacon/rpc/v1_gateway/debug.pb.gw.go @@ -18,7 +18,7 @@ import ( "github.com/golang/protobuf/ptypes/empty" "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/grpc-ecosystem/grpc-gateway/utilities" - "github.com/prysmaticlabs/ethereumapis/eth/v1alpha1" + eth "github.com/prysmaticlabs/ethereumapis/eth/v1alpha1" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/grpclog" diff --git a/proto/beacon/rpc/v1_gateway/health.pb.go b/proto/beacon/rpc/v1_gateway/health.pb.go index 8b035cfa62..55a05d0146 100755 --- a/proto/beacon/rpc/v1_gateway/health.pb.go +++ b/proto/beacon/rpc/v1_gateway/health.pb.go @@ -8,6 +8,9 @@ package ethereum_beacon_rpc_v1 import ( context "context" + reflect "reflect" + sync "sync" + proto "github.com/golang/protobuf/proto" empty "github.com/golang/protobuf/ptypes/empty" _ "google.golang.org/genproto/googleapis/api/annotations" @@ -16,8 +19,6 @@ import ( status "google.golang.org/grpc/status" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( diff --git a/proto/validator/accounts/v2/keymanager.pb.go b/proto/validator/accounts/v2/keymanager.pb.go index 4ab50f5515..09c5c83ae5 100755 --- a/proto/validator/accounts/v2/keymanager.pb.go +++ b/proto/validator/accounts/v2/keymanager.pb.go @@ -6,6 +6,10 @@ package ethereum_validator_accounts_v2 import ( context "context" fmt "fmt" + io "io" + math "math" + math_bits "math/bits" + _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" types "github.com/gogo/protobuf/types" @@ -15,9 +19,6 @@ import ( grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" - io "io" - math "math" - math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/proto/validator/accounts/v2/web_api.pb.go b/proto/validator/accounts/v2/web_api.pb.go index 89c90e55d6..6fbcf6b500 100755 --- a/proto/validator/accounts/v2/web_api.pb.go +++ b/proto/validator/accounts/v2/web_api.pb.go @@ -6,6 +6,10 @@ package ethereum_validator_accounts_v2 import ( context "context" fmt "fmt" + io "io" + math "math" + math_bits "math/bits" + proto "github.com/gogo/protobuf/proto" types "github.com/gogo/protobuf/types" v1alpha1 "github.com/prysmaticlabs/ethereumapis/eth/v1alpha1" @@ -14,9 +18,6 @@ import ( grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" - io "io" - math "math" - math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/proto/validator/accounts/v2_gateway/keymanager.pb.go b/proto/validator/accounts/v2_gateway/keymanager.pb.go index 07322debcf..0534c29515 100755 --- a/proto/validator/accounts/v2_gateway/keymanager.pb.go +++ b/proto/validator/accounts/v2_gateway/keymanager.pb.go @@ -8,6 +8,9 @@ package ethereum_validator_accounts_v2 import ( context "context" + reflect "reflect" + sync "sync" + _ "github.com/gogo/protobuf/gogoproto" proto "github.com/golang/protobuf/proto" empty "github.com/golang/protobuf/ptypes/empty" @@ -18,8 +21,6 @@ import ( status "google.golang.org/grpc/status" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( diff --git a/proto/validator/accounts/v2_gateway/web_api.pb.go b/proto/validator/accounts/v2_gateway/web_api.pb.go index 9d353f8038..8a4e1ce83d 100755 --- a/proto/validator/accounts/v2_gateway/web_api.pb.go +++ b/proto/validator/accounts/v2_gateway/web_api.pb.go @@ -8,6 +8,9 @@ package ethereum_validator_accounts_v2 import ( context "context" + reflect "reflect" + sync "sync" + proto "github.com/golang/protobuf/proto" empty "github.com/golang/protobuf/ptypes/empty" v1alpha1 "github.com/prysmaticlabs/ethereumapis/eth/v1alpha1" @@ -18,8 +21,6 @@ import ( status "google.golang.org/grpc/status" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( diff --git a/proto/validator/accounts/v2_gateway/web_api.pb.gw.go b/proto/validator/accounts/v2_gateway/web_api.pb.gw.go index fad194dfc7..4bee64d21d 100755 --- a/proto/validator/accounts/v2_gateway/web_api.pb.gw.go +++ b/proto/validator/accounts/v2_gateway/web_api.pb.gw.go @@ -18,7 +18,7 @@ import ( "github.com/golang/protobuf/ptypes/empty" "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/grpc-ecosystem/grpc-gateway/utilities" - "github.com/prysmaticlabs/ethereumapis/eth/v1alpha1" + eth "github.com/prysmaticlabs/ethereumapis/eth/v1alpha1" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/grpclog" diff --git a/validator/accounts/accounts_list.go b/validator/accounts/accounts_list.go index 456a212ad5..78bd940111 100644 --- a/validator/accounts/accounts_list.go +++ b/validator/accounts/accounts_list.go @@ -3,13 +3,13 @@ package accounts import ( "context" "fmt" - ethpb "github.com/prysmaticlabs/ethereumapis/eth/v1alpha1" "math" "path/filepath" "strings" "github.com/logrusorgru/aurora" "github.com/pkg/errors" + ethpb "github.com/prysmaticlabs/ethereumapis/eth/v1alpha1" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/petnames" "github.com/prysmaticlabs/prysm/validator/accounts/iface" diff --git a/validator/accounts/accounts_list_test.go b/validator/accounts/accounts_list_test.go index 9a69a7cb0a..ff7b6ab1d2 100644 --- a/validator/accounts/accounts_list_test.go +++ b/validator/accounts/accounts_list_test.go @@ -3,10 +3,6 @@ package accounts import ( "context" "fmt" - "github.com/golang/mock/gomock" - types "github.com/prysmaticlabs/eth2-types" - ethpb "github.com/prysmaticlabs/ethereumapis/eth/v1alpha1" - "github.com/prysmaticlabs/prysm/shared/mock" "io/ioutil" "math" "os" @@ -14,11 +10,15 @@ import ( "strings" "testing" + "github.com/golang/mock/gomock" "github.com/google/uuid" + types "github.com/prysmaticlabs/eth2-types" + ethpb "github.com/prysmaticlabs/ethereumapis/eth/v1alpha1" validatorpb "github.com/prysmaticlabs/prysm/proto/validator/accounts/v2" "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/bytesutil" "github.com/prysmaticlabs/prysm/shared/event" + "github.com/prysmaticlabs/prysm/shared/mock" "github.com/prysmaticlabs/prysm/shared/petnames" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require"