diff --git a/WORKSPACE b/WORKSPACE index 92922883a02e..d02e9d1a2f56 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -1305,12 +1305,8 @@ go_repository( go_repository( name = "com_github_prysmaticlabs_ethereumapis", - commit = "6607cc86ddb7c78acfe3b1f0dfb115489a96d46d", + commit = "349b301bbe44b8bea8c2bf2afe8c2e4e8630168a", importpath = "github.com/prysmaticlabs/ethereumapis", - patch_args = ["-p1"], - patches = [ - "//third_party:com_github_prysmaticlabs_ethereumapis-tags.patch", - ], ) go_repository( diff --git a/beacon-chain/rpc/validator/assignments.go b/beacon-chain/rpc/validator/assignments.go index fcb685620f6d..9e7e195e17cc 100644 --- a/beacon-chain/rpc/validator/assignments.go +++ b/beacon-chain/rpc/validator/assignments.go @@ -85,3 +85,8 @@ func (vs *Server) GetDuties(ctx context.Context, req *ethpb.DutiesRequest) (*eth Duties: validatorAssignments, }, nil } + +// StreamDuties -- +func (vs *Server) StreamDuties(stream ethpb.BeaconNodeValidator_StreamDutiesServer) error { + return status.Error(codes.Unimplemented, "unimplemented") +} \ No newline at end of file diff --git a/proto/beacon/p2p/v1/BUILD.bazel b/proto/beacon/p2p/v1/BUILD.bazel index 600ca0d2ee66..3f6d7a8d4d43 100644 --- a/proto/beacon/p2p/v1/BUILD.bazel +++ b/proto/beacon/p2p/v1/BUILD.bazel @@ -4,7 +4,7 @@ load("@rules_proto//proto:defs.bzl", "proto_library") load("@io_bazel_rules_go//go:def.bzl", "go_library") load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library") load("//proto:ssz_proto_library.bzl", "ssz_proto_files") -load("//tools:ssz.bzl", "SSZ_DEPS", "ssz_gen_marshal") +load("@com_github_prysmaticlabs_ethereumapis//tools:ssz.bzl", "SSZ_DEPS", "ssz_gen_marshal") go_proto_library( name = "v1_go_proto", diff --git a/third_party/com_github_prysmaticlabs_ethereumapis-tags.patch b/third_party/com_github_prysmaticlabs_ethereumapis-tags.patch deleted file mode 100644 index aacc057e9979..000000000000 --- a/third_party/com_github_prysmaticlabs_ethereumapis-tags.patch +++ /dev/null @@ -1,571 +0,0 @@ -diff --git a/eth/v1alpha1/BUILD.bazel b/eth/v1alpha1/BUILD.bazel -index c0fbe31..1211829 100644 ---- a/eth/v1alpha1/BUILD.bazel -+++ b/eth/v1alpha1/BUILD.bazel -@@ -4,6 +4,7 @@ - - load("@rules_proto//proto:defs.bzl", "proto_library") - load("@rules_java//java:defs.bzl", "java_proto_library") -+load("@prysm//tools:ssz.bzl", "SSZ_DEPS", "ssz_gen_marshal") - - ############################################################################## - # Go -@@ -25,7 +26,6 @@ proto_library( - "beacon_chain.proto", - "node.proto", - "validator.proto", -- ":generated_swagger_proto", - ], - visibility = ["//visibility:public"], - deps = [ -@@ -33,6 +33,7 @@ proto_library( - "@com_google_protobuf//:any_proto", - "@com_google_protobuf//:timestamp_proto", - "@go_googleapis//google/api:annotations_proto", -+ "@gogo_special_proto//github.com/gogo/protobuf/gogoproto", - "@grpc_ecosystem_grpc_gateway//protoc-gen-swagger/options:options_proto", - ], - ) -@@ -48,11 +49,46 @@ java_proto_library( - - go_proto_library( - name = "go_proto", -- compilers = ["@io_bazel_rules_go//proto:go_grpc"], -+ compilers = ["@prysm//:grpc_proto_compiler"], - importpath = "github.com/prysmaticlabs/ethereumapis/eth/v1alpha1", - proto = ":proto", - visibility = ["//visibility:public"], - deps = [ -+ "@com_github_prysmaticlabs_go_bitfield//:go_default_library", -+ "@go_googleapis//google/api:annotations_go_proto", -+ ], -+) -+ -+ssz_gen_marshal( -+ name = "ssz_generated_files", -+ go_proto = ":go_proto", -+ objs = [ -+ "Attestation", -+ "BeaconBlock", -+ "SignedBeaconBlock", -+ "Validator", -+ "BeaconBlockHeader", -+ "AttesterSlashing", -+ "VoluntaryExit", -+ "Deposit", -+ "ProposerSlashing", -+ ], -+) -+ -+go_proto_library( -+ name = "go_grpc_gateway_library", -+ compilers = [ -+ "@prysm//:grpc_nogogo_proto_compiler", -+ "@grpc_ecosystem_grpc_gateway//protoc-gen-grpc-gateway:go_gen_grpc_gateway", -+ ], -+ importpath = "github.com/prysmaticlabs/ethereumapis/eth/v1alpha1_gateway", -+ proto = ":proto", -+ visibility = ["//visibility:public"], -+ deps = [ -+ "@com_github_gogo_protobuf//gogoproto:go_default_library", -+ "@com_github_golang_protobuf//descriptor:go_default_library", -+ "@com_github_golang_protobuf//ptypes/empty:go_default_library", -+ "@com_github_prysmaticlabs_go_bitfield//:go_default_library", - "@go_googleapis//google/api:annotations_go_proto", - "@grpc_ecosystem_grpc_gateway//protoc-gen-swagger/options:options_go_proto", - ], -@@ -60,9 +96,11 @@ go_proto_library( - - go_library( - name = "go_default_library", -+ srcs = [":ssz_generated_files"], - embed = [":go_proto"], - importpath = "github.com/prysmaticlabs/ethereumapis/eth/v1alpha1", - visibility = ["//visibility:public"], -+ deps = SSZ_DEPS, - ) - - protoc_gen_swagger( -diff --git a/eth/v1alpha1/attestation.proto b/eth/v1alpha1/attestation.proto -index 3eee6f2..afbca04 100644 ---- a/eth/v1alpha1/attestation.proto -+++ b/eth/v1alpha1/attestation.proto -@@ -15,6 +15,8 @@ syntax = "proto3"; - - package ethereum.eth.v1alpha1; - -+import "github.com/gogo/protobuf/gogoproto/gogo.proto"; -+ - option csharp_namespace = "Ethereum.Eth.v1alpha1"; - option go_package = "github.com/prysmaticlabs/ethereumapis/eth/v1alpha1;eth"; - option java_multiple_files = true; -@@ -25,12 +27,12 @@ option php_namespace = "Ethereum\\Eth\\v1alpha1"; - message Attestation { - // A bitfield representation of validator indices that have voted exactly - // the same vote and have been aggregated into this attestation. -- bytes aggregation_bits = 1; -+ bytes aggregation_bits = 1 [(gogoproto.moretags) = "ssz-max:\"2048\"", (gogoproto.casttype) = "github.com/prysmaticlabs/go-bitfield.Bitlist"]; - - AttestationData data = 2; - - // 96 byte BLS aggregate signature. -- bytes signature = 3; -+ bytes signature = 3 [(gogoproto.moretags) = "ssz-size:\"96\""]; - } - - message AggregateAttestationAndProof { -@@ -41,7 +43,7 @@ message AggregateAttestationAndProof { - Attestation aggregate = 3; - - // 96 byte selection proof signed by the aggregator, which is the signature of the slot to aggregate. -- bytes selection_proof = 2; -+ bytes selection_proof = 2 [(gogoproto.moretags) = "ssz-size:\"96\""]; - } - - message SignedAggregateAttestationAndProof { -@@ -49,7 +51,7 @@ message SignedAggregateAttestationAndProof { - AggregateAttestationAndProof message = 1; - - // 96 byte BLS aggregate signature signed by the aggregator over the message. -- bytes signature = 2; -+ bytes signature = 2 [(gogoproto.moretags) = "ssz-size:\"96\""]; - } - - message AttestationData { -@@ -63,7 +65,7 @@ message AttestationData { - uint64 committee_index = 2; - - // 32 byte root of the LMD GHOST block vote. -- bytes beacon_block_root = 3; -+ bytes beacon_block_root = 3 [(gogoproto.moretags) = "ssz-size:\"32\""]; - - // The most recent justified checkpoint in the beacon state - Checkpoint source = 4; -@@ -99,5 +101,5 @@ message Checkpoint { - uint64 epoch = 1; - - // Block root of the checkpoint references. -- bytes root = 2; -+ bytes root = 2 [(gogoproto.moretags) = "ssz-size:\"32\""]; - } -diff --git a/eth/v1alpha1/beacon_block.proto b/eth/v1alpha1/beacon_block.proto -index ece6613..f396a77 100644 ---- a/eth/v1alpha1/beacon_block.proto -+++ b/eth/v1alpha1/beacon_block.proto -@@ -15,6 +15,7 @@ syntax = "proto3"; - - package ethereum.eth.v1alpha1; - -+import "github.com/gogo/protobuf/gogoproto/gogo.proto"; - import "eth/v1alpha1/attestation.proto"; - - option csharp_namespace = "Ethereum.Eth.v1alpha1"; -@@ -33,10 +34,10 @@ message BeaconBlock { - uint64 proposer_index = 2; - - // 32 byte root of the parent block. -- bytes parent_root = 3; -+ bytes parent_root = 3 [(gogoproto.moretags) = "ssz-size:\"32\""]; - - // 32 byte root of the resulting state after processing this block. -- bytes state_root = 4; -+ bytes state_root = 4 [(gogoproto.moretags) = "ssz-size:\"32\""]; - - // The block body itself. - BeaconBlockBody body = 5; -@@ -48,38 +49,38 @@ message SignedBeaconBlock { - BeaconBlock block = 1; - - // 96 byte BLS signature from the validator that produced this block. -- bytes signature = 2; -+ bytes signature = 2 [(gogoproto.moretags) = "ssz-size:\"96\""]; - } - - // The block body of an Ethereum 2.0 beacon block. - message BeaconBlockBody { - // The validators RANDAO reveal 96 byte value. -- bytes randao_reveal = 1; -+ bytes randao_reveal = 1 [(gogoproto.moretags) = "ssz-size:\"96\""]; - - // A reference to the Ethereum 1.x chain. - Eth1Data eth1_data = 2; - - // 32 byte field of arbitrary data. This field may contain any data and - // is not used for anything other than a fun message. -- bytes graffiti = 3; -+ bytes graffiti = 3 [(gogoproto.moretags) = "ssz-size:\"32\""]; - - // Block operations - // Refer to spec constants at https://github.com/ethereum/eth2.0-specs/blob/dev/specs/core/0_beacon-chain.md#max-operations-per-block - - // At most MAX_PROPOSER_SLASHINGS. -- repeated ProposerSlashing proposer_slashings = 4; -+ repeated ProposerSlashing proposer_slashings = 4 [(gogoproto.moretags) = "ssz-max:\"16\""]; - - // At most MAX_ATTESTER_SLASHINGS. -- repeated AttesterSlashing attester_slashings = 5; -+ repeated AttesterSlashing attester_slashings = 5 [(gogoproto.moretags) = "ssz-max:\"1\""]; - - // At most MAX_ATTESTATIONS. -- repeated Attestation attestations = 6; -+ repeated Attestation attestations = 6 [(gogoproto.moretags) = "ssz-max:\"128\""]; - - // At most MAX_DEPOSITS. -- repeated Deposit deposits = 7; -+ repeated Deposit deposits = 7 [(gogoproto.moretags) = "ssz-max:\"16\""]; - - // At most MAX_VOLUNTARY_EXITS. -- repeated SignedVoluntaryExit voluntary_exits = 8; -+ repeated SignedVoluntaryExit voluntary_exits = 8 [(gogoproto.moretags) = "ssz-max:\"16\""]; - } - - // Proposer slashings are proofs that a slashable offense has been committed by -@@ -106,20 +107,20 @@ message AttesterSlashing { - message Deposit { - message Data { - // 48 byte BLS public key of the validator. -- bytes public_key = 1; -+ bytes public_key = 1 [(gogoproto.moretags) = "ssz-size:\"48\" spec-name:\"pubkey\""]; - - // A 32 byte hash of the withdrawal address public key. -- bytes withdrawal_credentials = 2; -+ bytes withdrawal_credentials = 2 [(gogoproto.moretags) = "ssz-size:\"32\""]; - - // Deposit amount in gwei. - uint64 amount = 3; - - // 96 byte signature from the validators public key. -- bytes signature = 4; -+ bytes signature = 4 [(gogoproto.moretags) = "ssz-size:\"96\""]; - } - - // 32 byte roots in the deposit tree branch. -- repeated bytes proof = 1; -+ repeated bytes proof = 1 [(gogoproto.moretags) = "ssz-size:\"33,32\""]; - - Data data = 2; - } -@@ -141,14 +142,14 @@ message SignedVoluntaryExit { - VoluntaryExit exit = 1; - - // Validator's 96 byte signature -- bytes signature = 2; -+ bytes signature = 2 [(gogoproto.moretags) = "ssz-size:\"96\""]; - } - - // Eth1Data represents references to the Ethereum 1.x deposit contract. - message Eth1Data { - // The 32 byte deposit tree root for the last deposit included in this - // block. -- bytes deposit_root = 1; -+ bytes deposit_root = 1 [(gogoproto.moretags) = "ssz-size:\"32\""]; - - // The total number of deposits included in the beacon chain since genesis - // including the deposits in this block. -@@ -156,7 +157,7 @@ message Eth1Data { - - // The 32 byte block hash of the Ethereum 1.x block considered for deposit - // inclusion. -- bytes block_hash = 3; -+ bytes block_hash = 3 [(gogoproto.moretags) = "ssz-size:\"32\""]; - } - - // A beacon block header is essentially a beacon block with only a reference to -@@ -171,13 +172,13 @@ message BeaconBlockHeader { - uint64 proposer_index = 2; - - // 32 byte merkle tree root of the parent ssz encoded block. -- bytes parent_root = 3; -+ bytes parent_root = 3 [(gogoproto.moretags) = "ssz-size:\"32\""]; - - // 32 byte merkle tree root of the resulting ssz encoded state after processing this block. -- bytes state_root = 4; -+ bytes state_root = 4 [(gogoproto.moretags) = "ssz-size:\"32\""]; - - // 32 byte merkle tree root of the ssz encoded block body. -- bytes body_root = 5; -+ bytes body_root = 5 [(gogoproto.moretags) = "ssz-size:\"32\""]; - } - - message SignedBeaconBlockHeader { -@@ -185,14 +186,14 @@ message SignedBeaconBlockHeader { - BeaconBlockHeader header = 1; - - // 96 byte BLS signature from the validator that produced this block header. -- bytes signature = 2; -+ bytes signature = 2 [(gogoproto.moretags) = "ssz-size:\"96\""]; - } - - message IndexedAttestation { -- repeated uint64 attesting_indices = 1; -+ repeated uint64 attesting_indices = 1 [(gogoproto.moretags) = "ssz-max:\"2048\""]; - - AttestationData data = 2; - - // 96 bytes aggregate signature. -- bytes signature = 3; -+ bytes signature = 3 [(gogoproto.moretags) = "ssz-size:\"96\""]; - } -diff --git a/eth/v1alpha1/beacon_chain.proto b/eth/v1alpha1/beacon_chain.proto -index 6a7940d..b44835e 100644 ---- a/eth/v1alpha1/beacon_chain.proto -+++ b/eth/v1alpha1/beacon_chain.proto -@@ -15,6 +15,7 @@ syntax = "proto3"; - - package ethereum.eth.v1alpha1; - -+import "github.com/gogo/protobuf/gogoproto/gogo.proto"; - import "google/api/annotations.proto"; - import "google/protobuf/empty.proto"; - import "google/protobuf/any.proto"; -@@ -398,7 +399,7 @@ message ChainHead { - uint64 head_epoch = 2; - - // 32 byte merkle tree root of the canonical head block in the beacon node. -- bytes head_block_root = 3; -+ bytes head_block_root = 3 [(gogoproto.moretags) = "ssz-size:\"32\""]; - - // Most recent slot that contains the finalized block. - uint64 finalized_slot = 4; -@@ -407,7 +408,7 @@ message ChainHead { - uint64 finalized_epoch = 5; - - // Most recent 32 byte finalized block root. -- bytes finalized_block_root = 6; -+ bytes finalized_block_root = 6 [(gogoproto.moretags) = "ssz-size:\"32\""]; - - // Most recent slot that contains the justified block. - uint64 justified_slot = 7; -@@ -416,7 +417,7 @@ message ChainHead { - uint64 justified_epoch = 8; - - // Most recent 32 byte justified block root. -- bytes justified_block_root = 9; -+ bytes justified_block_root = 9 [(gogoproto.moretags) = "ssz-size:\"32\""]; - - // Most recent slot that contains the previous justified block. - uint64 previous_justified_slot = 10; -@@ -425,7 +426,7 @@ message ChainHead { - uint64 previous_justified_epoch = 11; - - // Previous 32 byte justified block root. -- bytes previous_justified_block_root = 12; -+ bytes previous_justified_block_root = 12 [(gogoproto.moretags) = "ssz-size:\"32\""]; - } - - message ListCommitteesRequest { -@@ -470,8 +471,7 @@ message ListValidatorBalancesRequest { - - // Validator 48 byte BLS public keys to filter validators for the given - // epoch. -- repeated bytes public_keys = 3; -- -+ repeated bytes public_keys = 3 [(gogoproto.moretags) = "ssz-size:\"?,48\""]; - // Validator indices to filter validators for the given epoch. - repeated uint64 indices = 4; - -@@ -491,7 +491,7 @@ message ValidatorBalances { - - message Balance { - // Validator's 48 byte BLS public key. -- bytes public_key = 1; -+ bytes public_key = 1 [(gogoproto.moretags) = "ssz-size:\"48\""]; - - // Validator's index in the validator set. - uint64 index = 2; -@@ -548,7 +548,7 @@ message GetValidatorRequest { - uint64 index = 1; - - // 48 byte validator public key. -- bytes public_key = 2; -+ bytes public_key = 2 [(gogoproto.moretags) = "ssz-size:\"48\""]; - } - } - -@@ -590,26 +590,25 @@ message ActiveSetChanges { - uint64 epoch = 1; - - // 48 byte validator public keys that have been activated in the given epoch. -- repeated bytes activated_public_keys = 2; -+ repeated bytes activated_public_keys = 2 [(gogoproto.moretags) = "ssz-size:\"?,48\""]; - - // Indices of validators activated in the given epoch. - repeated uint64 activated_indices = 3; - -- // 48 byte validator public keys that have been voluntarily exited in this -- // epoch. -- repeated bytes exited_public_keys = 4; -+ // 48 byte validator public keys that have been voluntarily exited in the given epoch. -+ repeated bytes exited_public_keys = 4 [(gogoproto.moretags) = "ssz-size:\"?,48\""]; - - // Indices of validators exited in the given epoch. - repeated uint64 exited_indices = 5; - -- // 48 byte validator public keys that have been slashed in this epoch. -- repeated bytes slashed_public_keys = 6; -+ // 48 byte validator public keys that have been slashed in the given epoch. -+ repeated bytes slashed_public_keys = 6 [(gogoproto.moretags) = "ssz-size:\"?,48\""]; - - // Indices of validators slashed in the given epoch. - repeated uint64 slashed_indices = 7; - - // 48 byte validator public keys that have been involuntarily ejected in this epoch. -- repeated bytes ejected_public_keys = 8; -+ repeated bytes ejected_public_keys = 8 [(gogoproto.moretags) = "ssz-size:\"?,48\""]; - - // Indices of validators ejected in the given epoch. - repeated uint64 ejected_indices = 9; -@@ -659,11 +658,11 @@ message ValidatorQueue { - - // Ordered list of 48 byte public keys awaiting activation. 0th index is the - // next key to be processed. -- repeated bytes activation_public_keys = 2; -+ repeated bytes activation_public_keys = 2 [(gogoproto.moretags) = "ssz-size:\"?,48\""]; - - // Ordered list of public keys awaiting exit. 0th index is the next key to - // be processed. -- repeated bytes exit_public_keys = 3; -+ repeated bytes exit_public_keys = 3 [(gogoproto.moretags) = "ssz-size:\"?,48\""]; - } - - message ListValidatorAssignmentsRequest { -@@ -675,8 +674,7 @@ message ListValidatorAssignmentsRequest { - bool genesis = 2; - } - // 48 byte validator public keys to filter assignments for the given epoch. -- repeated bytes public_keys = 3; -- -+ repeated bytes public_keys = 3 [(gogoproto.moretags) = "ssz-size:\"?,48\""]; - // Validator indicies to filter assignments for the given epoch. - repeated uint64 indices = 4; - -@@ -710,7 +708,7 @@ message ValidatorAssignments { - repeated uint64 proposer_slots = 4; - - // 48 byte BLS public key. -- bytes public_key = 5; -+ bytes public_key = 5 [(gogoproto.moretags) = "ssz-size:\"48\""]; - } - - // The epoch for which this set of validator assignments is valid. -diff --git a/eth/v1alpha1/validator.proto b/eth/v1alpha1/validator.proto -index 19fc019..2db4a55 100644 ---- a/eth/v1alpha1/validator.proto -+++ b/eth/v1alpha1/validator.proto -@@ -15,6 +15,7 @@ syntax = "proto3"; - - package ethereum.eth.v1alpha1; - -+import "github.com/gogo/protobuf/gogoproto/gogo.proto"; - import "google/api/annotations.proto"; - import "google/protobuf/empty.proto"; - import "eth/v1alpha1/beacon_block.proto"; -@@ -221,7 +222,7 @@ message DomainResponse { - - message ValidatorActivationRequest { - // A list of 48 byte validator public keys. -- repeated bytes public_keys = 1; -+ repeated bytes public_keys = 1 [(gogoproto.moretags) = "ssz-size:\"?,48\""]; - } - - message ValidatorActivationResponse { -@@ -257,7 +258,7 @@ message SyncedResponse { - - message ValidatorIndexRequest { - // A 48 byte validator public key. -- bytes public_key = 1; -+ bytes public_key = 1 [(gogoproto.moretags) = "ssz-size:\"48\""]; - } - - message ValidatorIndexResponse { -@@ -267,7 +268,7 @@ message ValidatorIndexResponse { - - message ValidatorStatusRequest { - // A 48 byte validator public key. -- bytes public_key = 1; -+ bytes public_key = 1 [(gogoproto.moretags) = "ssz-size:\"48\""]; - } - - enum ValidatorStatus { -@@ -305,7 +306,7 @@ message DutiesRequest { - uint64 epoch = 1; - - // Array of byte encoded BLS public keys. -- repeated bytes public_keys = 2; -+ repeated bytes public_keys = 2 [(gogoproto.moretags) = "ssz-size:\"?,48\""]; - } - - message DutiesResponse { -@@ -324,7 +325,7 @@ message DutiesResponse { - repeated uint64 proposer_slots = 4; - - // 48 byte BLS public key for the validator who's assigned to perform a duty. -- bytes public_key = 5; -+ bytes public_key = 5 [(gogoproto.moretags) = "ssz-size:\"48\""]; - - // The current status of the validator assigned to perform the duty. - ValidatorStatus status = 6; -@@ -339,15 +340,16 @@ message BlockRequest { - uint64 slot = 1; - - // Validator's 32 byte randao reveal secret of the current epoch. -- bytes randao_reveal = 2; -+ bytes randao_reveal = 2 [(gogoproto.moretags) = "ssz-size:\"48\""]; - - // Validator's 32 byte graffiti message for the new block. -- bytes graffiti = 3; -+ bytes graffiti = 3 [(gogoproto.moretags) = "ssz-size:\"32\""]; -+ - } - - message ProposeResponse { - // The block root of the successfully proposed beacon block. -- bytes block_root = 1; -+ bytes block_root = 1 [(gogoproto.moretags) = "ssz-size:\"32\""]; - } - - message AttestationDataRequest { -@@ -360,7 +362,7 @@ message AttestationDataRequest { - - message AttestResponse { - // The root of the attestation data successfully submitted to the beacon node. -- bytes attestation_data_root = 1; -+ bytes attestation_data_root = 1 [(gogoproto.moretags) = "ssz-size:\"32\""]; - } - - message AggregateSelectionRequest { -@@ -369,10 +371,10 @@ message AggregateSelectionRequest { - // Committee index of the validator at the given slot. - uint64 committee_index = 2; - // 48 byte public key of the validator. -- bytes public_key = 3; -+ bytes public_key = 3 [(gogoproto.moretags) = "ssz-size:\"48\" spec-name:\"pubkey\""]; - // 96 byte signature of the validator on the slot. This is used as proof that the validator is - // an aggregator for the given slot. -- bytes slot_signature = 4; -+ bytes slot_signature = 4 [(gogoproto.moretags) = "ssz-size:\"96\""]; - } - - message AggregateSelectionResponse { -@@ -387,7 +389,7 @@ message SignedAggregateSubmitRequest { - - message SignedAggregateSubmitResponse { - // The 32 byte hash tree root of the aggregated attestation data. -- bytes attestation_data_root = 1; -+ bytes attestation_data_root = 1 [(gogoproto.moretags) = "ssz-size:\"32\""]; - } - - message CommitteeSubnetsSubscribeRequest { -@@ -405,10 +407,10 @@ message CommitteeSubnetsSubscribeRequest { - // An Ethereum 2.0 validator. - message Validator { - // 48 byte BLS public key used for the validator's activities. -- bytes public_key = 1; -+ bytes public_key = 1 [(gogoproto.moretags) = "ssz-size:\"48\" spec-name:\"pubkey\""]; - - // 32 byte hash of the withdrawal destination public key. -- bytes withdrawal_credentials = 2; -+ bytes withdrawal_credentials = 2 [(gogoproto.moretags) = "ssz-size:\"32\""]; - - // The validators current effective balance in gwei. - uint64 effective_balance = 3; diff --git a/tools/ssz.bzl b/tools/ssz.bzl deleted file mode 100644 index 9a6d4b86ce20..000000000000 --- a/tools/ssz.bzl +++ /dev/null @@ -1,86 +0,0 @@ -load( - "@io_bazel_rules_go//go:def.bzl", - "GoLibrary", - "GoSource", -) - -def _ssz_go_proto_library_impl(ctx): - if ctx.attr.go_proto != None: - go_proto = ctx.attr.go_proto - input_files = go_proto[OutputGroupInfo].go_generated_srcs.to_list() - package_path = input_files[0].dirname - elif hasattr(ctx.attr, "srcs") and len(ctx.attr.srcs) > 0: - package_path = ctx.attr.srcs[0].files.to_list()[0].dirname - input_files = ctx.attr.srcs[0].files.to_list() - else: - fail("Must have go_proto or srcs") - - # Run the tool. - output = ctx.outputs.out - args = [ - "--output=%s" % output.path, - "--path=%s" % package_path, - ] - if hasattr(ctx.attr, "includes") and len(ctx.attr.includes) > 0: - incs = [] - for include in ctx.attr.includes: - incs.append(include[GoSource].srcs[0].dirname) - input_files += include[GoSource].srcs - args.append("--include=%s" % ",".join(incs)) - - if len(ctx.attr.objs) > 0: - args += ["--objs=%s" % ",".join(ctx.attr.objs)] - - ctx.actions.run( - executable = ctx.executable.sszgen, - progress_message = "Generating ssz marshal and unmarshal functions", - inputs = input_files, - arguments = args, - outputs = [output], - ) - -""" -A rule that uses the generated pb.go files from a go_proto_library target to generate SSZ marshal -and unmarshal functions as pointer receivers on the specified objects. To use this rule, provide a -go_proto_library target and specify the structs to generate methods in the "objs" field. Lastly, -include your new target as a source for the go_library that embeds the go_proto_library. - -Example: -go_proto_library( - name = "example_go_proto", - ... -) - -ssz_gen_marshal( - name = "ssz_generated_sources", - go_proto = ":example_go_proto", - objs = [ # omit this field to generate for all structs in the package. - "AddressBook", - "Person", - ], -) - -go_library( - name = "go_default_library", - srcs = [":ssz_generated_sources"], - embed = [":example_go_proto"], - deps = SSZ_DEPS, -) -""" -ssz_gen_marshal = rule( - implementation = _ssz_go_proto_library_impl, - attrs = { - "srcs": attr.label_list(allow_files = True), - "go_proto": attr.label(providers = [GoLibrary]), - "sszgen": attr.label( - default = Label("@com_github_ferranbt_fastssz//sszgen:sszgen"), - executable = True, - cfg = "host", - ), - "objs": attr.string_list(), - "includes": attr.label_list(providers = [GoLibrary]), - }, - outputs = {"out": "generated.ssz.go"}, -) - -SSZ_DEPS = ["@com_github_ferranbt_fastssz//:go_default_library"] diff --git a/validator/internal/beacon_node_validator_service_mock.go b/validator/internal/beacon_node_validator_service_mock.go index 6b519595cfa8..7d8ac7ac2324 100644 --- a/validator/internal/beacon_node_validator_service_mock.go +++ b/validator/internal/beacon_node_validator_service_mock.go @@ -1,44 +1,43 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/prysmaticlabs/ethereumapis/eth/v1alpha1 (interfaces: BeaconNodeValidatorClient,BeaconNodeValidator_WaitForSyncedClient,BeaconNodeValidator_WaitForActivationClient,BeaconNodeValidator_WaitForChainStartClient) +// Source: github.com/prysmaticlabs/ethereumapis/eth/v1alpha1 (interfaces: BeaconNodeValidatorClient,BeaconNodeValidator_WaitForSyncedClient,BeaconNodeValidator_WaitForChainStartClient,BeaconNodeValidator_WaitForActivationClient) // Package internal is a generated GoMock package. package internal import ( context "context" - reflect "reflect" - - ptypes "github.com/gogo/protobuf/types" + types "github.com/gogo/protobuf/types" gomock "github.com/golang/mock/gomock" eth "github.com/prysmaticlabs/ethereumapis/eth/v1alpha1" grpc "google.golang.org/grpc" metadata "google.golang.org/grpc/metadata" + reflect "reflect" ) -// MockBeaconNodeValidatorClient is a mock of BeaconNodeValidatorClient interface. +// MockBeaconNodeValidatorClient is a mock of BeaconNodeValidatorClient interface type MockBeaconNodeValidatorClient struct { ctrl *gomock.Controller recorder *MockBeaconNodeValidatorClientMockRecorder } -// MockBeaconNodeValidatorClientMockRecorder is the mock recorder for MockBeaconNodeValidatorClient. +// MockBeaconNodeValidatorClientMockRecorder is the mock recorder for MockBeaconNodeValidatorClient type MockBeaconNodeValidatorClientMockRecorder struct { mock *MockBeaconNodeValidatorClient } -// NewMockBeaconNodeValidatorClient creates a new mock instance. +// NewMockBeaconNodeValidatorClient creates a new mock instance func NewMockBeaconNodeValidatorClient(ctrl *gomock.Controller) *MockBeaconNodeValidatorClient { mock := &MockBeaconNodeValidatorClient{ctrl: ctrl} mock.recorder = &MockBeaconNodeValidatorClientMockRecorder{mock} return mock } -// EXPECT returns an object that allows the caller to indicate expected use. +// EXPECT returns an object that allows the caller to indicate expected use func (m *MockBeaconNodeValidatorClient) EXPECT() *MockBeaconNodeValidatorClientMockRecorder { return m.recorder } -// DomainData mocks base method. +// DomainData mocks base method func (m *MockBeaconNodeValidatorClient) DomainData(arg0 context.Context, arg1 *eth.DomainRequest, arg2 ...grpc.CallOption) (*eth.DomainResponse, error) { m.ctrl.T.Helper() varargs := []interface{}{arg0, arg1} @@ -51,14 +50,14 @@ func (m *MockBeaconNodeValidatorClient) DomainData(arg0 context.Context, arg1 *e return ret0, ret1 } -// DomainData indicates an expected call of DomainData. +// DomainData indicates an expected call of DomainData func (mr *MockBeaconNodeValidatorClientMockRecorder) DomainData(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() varargs := append([]interface{}{arg0, arg1}, arg2...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DomainData", reflect.TypeOf((*MockBeaconNodeValidatorClient)(nil).DomainData), varargs...) } -// GetAttestationData mocks base method. +// GetAttestationData mocks base method func (m *MockBeaconNodeValidatorClient) GetAttestationData(arg0 context.Context, arg1 *eth.AttestationDataRequest, arg2 ...grpc.CallOption) (*eth.AttestationData, error) { m.ctrl.T.Helper() varargs := []interface{}{arg0, arg1} @@ -71,14 +70,14 @@ func (m *MockBeaconNodeValidatorClient) GetAttestationData(arg0 context.Context, return ret0, ret1 } -// GetAttestationData indicates an expected call of GetAttestationData. +// GetAttestationData indicates an expected call of GetAttestationData func (mr *MockBeaconNodeValidatorClientMockRecorder) GetAttestationData(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() varargs := append([]interface{}{arg0, arg1}, arg2...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAttestationData", reflect.TypeOf((*MockBeaconNodeValidatorClient)(nil).GetAttestationData), varargs...) } -// GetBlock mocks base method. +// GetBlock mocks base method func (m *MockBeaconNodeValidatorClient) GetBlock(arg0 context.Context, arg1 *eth.BlockRequest, arg2 ...grpc.CallOption) (*eth.BeaconBlock, error) { m.ctrl.T.Helper() varargs := []interface{}{arg0, arg1} @@ -91,14 +90,14 @@ func (m *MockBeaconNodeValidatorClient) GetBlock(arg0 context.Context, arg1 *eth return ret0, ret1 } -// GetBlock indicates an expected call of GetBlock. +// GetBlock indicates an expected call of GetBlock func (mr *MockBeaconNodeValidatorClientMockRecorder) GetBlock(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() varargs := append([]interface{}{arg0, arg1}, arg2...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetBlock", reflect.TypeOf((*MockBeaconNodeValidatorClient)(nil).GetBlock), varargs...) } -// GetDuties mocks base method. +// GetDuties mocks base method func (m *MockBeaconNodeValidatorClient) GetDuties(arg0 context.Context, arg1 *eth.DutiesRequest, arg2 ...grpc.CallOption) (*eth.DutiesResponse, error) { m.ctrl.T.Helper() varargs := []interface{}{arg0, arg1} @@ -111,14 +110,14 @@ func (m *MockBeaconNodeValidatorClient) GetDuties(arg0 context.Context, arg1 *et return ret0, ret1 } -// GetDuties indicates an expected call of GetDuties. +// GetDuties indicates an expected call of GetDuties func (mr *MockBeaconNodeValidatorClientMockRecorder) GetDuties(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() varargs := append([]interface{}{arg0, arg1}, arg2...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetDuties", reflect.TypeOf((*MockBeaconNodeValidatorClient)(nil).GetDuties), varargs...) } -// ProposeAttestation mocks base method. +// ProposeAttestation mocks base method func (m *MockBeaconNodeValidatorClient) ProposeAttestation(arg0 context.Context, arg1 *eth.Attestation, arg2 ...grpc.CallOption) (*eth.AttestResponse, error) { m.ctrl.T.Helper() varargs := []interface{}{arg0, arg1} @@ -131,14 +130,14 @@ func (m *MockBeaconNodeValidatorClient) ProposeAttestation(arg0 context.Context, return ret0, ret1 } -// ProposeAttestation indicates an expected call of ProposeAttestation. +// ProposeAttestation indicates an expected call of ProposeAttestation func (mr *MockBeaconNodeValidatorClientMockRecorder) ProposeAttestation(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() varargs := append([]interface{}{arg0, arg1}, arg2...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ProposeAttestation", reflect.TypeOf((*MockBeaconNodeValidatorClient)(nil).ProposeAttestation), varargs...) } -// ProposeBlock mocks base method. +// ProposeBlock mocks base method func (m *MockBeaconNodeValidatorClient) ProposeBlock(arg0 context.Context, arg1 *eth.SignedBeaconBlock, arg2 ...grpc.CallOption) (*eth.ProposeResponse, error) { m.ctrl.T.Helper() varargs := []interface{}{arg0, arg1} @@ -151,34 +150,54 @@ func (m *MockBeaconNodeValidatorClient) ProposeBlock(arg0 context.Context, arg1 return ret0, ret1 } -// ProposeBlock indicates an expected call of ProposeBlock. +// ProposeBlock indicates an expected call of ProposeBlock func (mr *MockBeaconNodeValidatorClientMockRecorder) ProposeBlock(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() varargs := append([]interface{}{arg0, arg1}, arg2...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ProposeBlock", reflect.TypeOf((*MockBeaconNodeValidatorClient)(nil).ProposeBlock), varargs...) } -// ProposeExit mocks base method. -func (m *MockBeaconNodeValidatorClient) ProposeExit(arg0 context.Context, arg1 *eth.SignedVoluntaryExit, arg2 ...grpc.CallOption) (*ptypes.Empty, error) { +// ProposeExit mocks base method +func (m *MockBeaconNodeValidatorClient) ProposeExit(arg0 context.Context, arg1 *eth.SignedVoluntaryExit, arg2 ...grpc.CallOption) (*types.Empty, error) { m.ctrl.T.Helper() varargs := []interface{}{arg0, arg1} for _, a := range arg2 { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "ProposeExit", varargs...) - ret0, _ := ret[0].(*ptypes.Empty) + ret0, _ := ret[0].(*types.Empty) ret1, _ := ret[1].(error) return ret0, ret1 } -// ProposeExit indicates an expected call of ProposeExit. +// ProposeExit indicates an expected call of ProposeExit func (mr *MockBeaconNodeValidatorClientMockRecorder) ProposeExit(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() varargs := append([]interface{}{arg0, arg1}, arg2...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ProposeExit", reflect.TypeOf((*MockBeaconNodeValidatorClient)(nil).ProposeExit), varargs...) } -// SubmitAggregateSelectionProof mocks base method. +// StreamDuties mocks base method +func (m *MockBeaconNodeValidatorClient) StreamDuties(arg0 context.Context, arg1 ...grpc.CallOption) (eth.BeaconNodeValidator_StreamDutiesClient, error) { + m.ctrl.T.Helper() + varargs := []interface{}{arg0} + for _, a := range arg1 { + varargs = append(varargs, a) + } + ret := m.ctrl.Call(m, "StreamDuties", varargs...) + ret0, _ := ret[0].(eth.BeaconNodeValidator_StreamDutiesClient) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// StreamDuties indicates an expected call of StreamDuties +func (mr *MockBeaconNodeValidatorClientMockRecorder) StreamDuties(arg0 interface{}, arg1 ...interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + varargs := append([]interface{}{arg0}, arg1...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "StreamDuties", reflect.TypeOf((*MockBeaconNodeValidatorClient)(nil).StreamDuties), varargs...) +} + +// SubmitAggregateSelectionProof mocks base method func (m *MockBeaconNodeValidatorClient) SubmitAggregateSelectionProof(arg0 context.Context, arg1 *eth.AggregateSelectionRequest, arg2 ...grpc.CallOption) (*eth.AggregateSelectionResponse, error) { m.ctrl.T.Helper() varargs := []interface{}{arg0, arg1} @@ -191,14 +210,14 @@ func (m *MockBeaconNodeValidatorClient) SubmitAggregateSelectionProof(arg0 conte return ret0, ret1 } -// SubmitAggregateSelectionProof indicates an expected call of SubmitAggregateSelectionProof. +// SubmitAggregateSelectionProof indicates an expected call of SubmitAggregateSelectionProof func (mr *MockBeaconNodeValidatorClientMockRecorder) SubmitAggregateSelectionProof(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() varargs := append([]interface{}{arg0, arg1}, arg2...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SubmitAggregateSelectionProof", reflect.TypeOf((*MockBeaconNodeValidatorClient)(nil).SubmitAggregateSelectionProof), varargs...) } -// SubmitSignedAggregateSelectionProof mocks base method. +// SubmitSignedAggregateSelectionProof mocks base method func (m *MockBeaconNodeValidatorClient) SubmitSignedAggregateSelectionProof(arg0 context.Context, arg1 *eth.SignedAggregateSubmitRequest, arg2 ...grpc.CallOption) (*eth.SignedAggregateSubmitResponse, error) { m.ctrl.T.Helper() varargs := []interface{}{arg0, arg1} @@ -211,34 +230,34 @@ func (m *MockBeaconNodeValidatorClient) SubmitSignedAggregateSelectionProof(arg0 return ret0, ret1 } -// SubmitSignedAggregateSelectionProof indicates an expected call of SubmitSignedAggregateSelectionProof. +// SubmitSignedAggregateSelectionProof indicates an expected call of SubmitSignedAggregateSelectionProof func (mr *MockBeaconNodeValidatorClientMockRecorder) SubmitSignedAggregateSelectionProof(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() varargs := append([]interface{}{arg0, arg1}, arg2...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SubmitSignedAggregateSelectionProof", reflect.TypeOf((*MockBeaconNodeValidatorClient)(nil).SubmitSignedAggregateSelectionProof), varargs...) } -// SubscribeCommitteeSubnets mocks base method. -func (m *MockBeaconNodeValidatorClient) SubscribeCommitteeSubnets(arg0 context.Context, arg1 *eth.CommitteeSubnetsSubscribeRequest, arg2 ...grpc.CallOption) (*ptypes.Empty, error) { +// SubscribeCommitteeSubnets mocks base method +func (m *MockBeaconNodeValidatorClient) SubscribeCommitteeSubnets(arg0 context.Context, arg1 *eth.CommitteeSubnetsSubscribeRequest, arg2 ...grpc.CallOption) (*types.Empty, error) { m.ctrl.T.Helper() varargs := []interface{}{arg0, arg1} for _, a := range arg2 { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "SubscribeCommitteeSubnets", varargs...) - ret0, _ := ret[0].(*ptypes.Empty) + ret0, _ := ret[0].(*types.Empty) ret1, _ := ret[1].(error) return ret0, ret1 } -// SubscribeCommitteeSubnets indicates an expected call of SubscribeCommitteeSubnets. +// SubscribeCommitteeSubnets indicates an expected call of SubscribeCommitteeSubnets func (mr *MockBeaconNodeValidatorClientMockRecorder) SubscribeCommitteeSubnets(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() varargs := append([]interface{}{arg0, arg1}, arg2...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SubscribeCommitteeSubnets", reflect.TypeOf((*MockBeaconNodeValidatorClient)(nil).SubscribeCommitteeSubnets), varargs...) } -// ValidatorIndex mocks base method. +// ValidatorIndex mocks base method func (m *MockBeaconNodeValidatorClient) ValidatorIndex(arg0 context.Context, arg1 *eth.ValidatorIndexRequest, arg2 ...grpc.CallOption) (*eth.ValidatorIndexResponse, error) { m.ctrl.T.Helper() varargs := []interface{}{arg0, arg1} @@ -251,14 +270,14 @@ func (m *MockBeaconNodeValidatorClient) ValidatorIndex(arg0 context.Context, arg return ret0, ret1 } -// ValidatorIndex indicates an expected call of ValidatorIndex. +// ValidatorIndex indicates an expected call of ValidatorIndex func (mr *MockBeaconNodeValidatorClientMockRecorder) ValidatorIndex(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() varargs := append([]interface{}{arg0, arg1}, arg2...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ValidatorIndex", reflect.TypeOf((*MockBeaconNodeValidatorClient)(nil).ValidatorIndex), varargs...) } -// ValidatorStatus mocks base method. +// ValidatorStatus mocks base method func (m *MockBeaconNodeValidatorClient) ValidatorStatus(arg0 context.Context, arg1 *eth.ValidatorStatusRequest, arg2 ...grpc.CallOption) (*eth.ValidatorStatusResponse, error) { m.ctrl.T.Helper() varargs := []interface{}{arg0, arg1} @@ -271,14 +290,14 @@ func (m *MockBeaconNodeValidatorClient) ValidatorStatus(arg0 context.Context, ar return ret0, ret1 } -// ValidatorStatus indicates an expected call of ValidatorStatus. +// ValidatorStatus indicates an expected call of ValidatorStatus func (mr *MockBeaconNodeValidatorClientMockRecorder) ValidatorStatus(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() varargs := append([]interface{}{arg0, arg1}, arg2...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ValidatorStatus", reflect.TypeOf((*MockBeaconNodeValidatorClient)(nil).ValidatorStatus), varargs...) } -// WaitForActivation mocks base method. +// WaitForActivation mocks base method func (m *MockBeaconNodeValidatorClient) WaitForActivation(arg0 context.Context, arg1 *eth.ValidatorActivationRequest, arg2 ...grpc.CallOption) (eth.BeaconNodeValidator_WaitForActivationClient, error) { m.ctrl.T.Helper() varargs := []interface{}{arg0, arg1} @@ -291,15 +310,15 @@ func (m *MockBeaconNodeValidatorClient) WaitForActivation(arg0 context.Context, return ret0, ret1 } -// WaitForActivation indicates an expected call of WaitForActivation. +// WaitForActivation indicates an expected call of WaitForActivation func (mr *MockBeaconNodeValidatorClientMockRecorder) WaitForActivation(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() varargs := append([]interface{}{arg0, arg1}, arg2...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "WaitForActivation", reflect.TypeOf((*MockBeaconNodeValidatorClient)(nil).WaitForActivation), varargs...) } -// WaitForChainStart mocks base method. -func (m *MockBeaconNodeValidatorClient) WaitForChainStart(arg0 context.Context, arg1 *ptypes.Empty, arg2 ...grpc.CallOption) (eth.BeaconNodeValidator_WaitForChainStartClient, error) { +// WaitForChainStart mocks base method +func (m *MockBeaconNodeValidatorClient) WaitForChainStart(arg0 context.Context, arg1 *types.Empty, arg2 ...grpc.CallOption) (eth.BeaconNodeValidator_WaitForChainStartClient, error) { m.ctrl.T.Helper() varargs := []interface{}{arg0, arg1} for _, a := range arg2 { @@ -311,15 +330,15 @@ func (m *MockBeaconNodeValidatorClient) WaitForChainStart(arg0 context.Context, return ret0, ret1 } -// WaitForChainStart indicates an expected call of WaitForChainStart. +// WaitForChainStart indicates an expected call of WaitForChainStart func (mr *MockBeaconNodeValidatorClientMockRecorder) WaitForChainStart(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() varargs := append([]interface{}{arg0, arg1}, arg2...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "WaitForChainStart", reflect.TypeOf((*MockBeaconNodeValidatorClient)(nil).WaitForChainStart), varargs...) } -// WaitForSynced mocks base method. -func (m *MockBeaconNodeValidatorClient) WaitForSynced(arg0 context.Context, arg1 *ptypes.Empty, arg2 ...grpc.CallOption) (eth.BeaconNodeValidator_WaitForSyncedClient, error) { +// WaitForSynced mocks base method +func (m *MockBeaconNodeValidatorClient) WaitForSynced(arg0 context.Context, arg1 *types.Empty, arg2 ...grpc.CallOption) (eth.BeaconNodeValidator_WaitForSyncedClient, error) { m.ctrl.T.Helper() varargs := []interface{}{arg0, arg1} for _, a := range arg2 { @@ -331,37 +350,37 @@ func (m *MockBeaconNodeValidatorClient) WaitForSynced(arg0 context.Context, arg1 return ret0, ret1 } -// WaitForSynced indicates an expected call of WaitForSynced. +// WaitForSynced indicates an expected call of WaitForSynced func (mr *MockBeaconNodeValidatorClientMockRecorder) WaitForSynced(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() varargs := append([]interface{}{arg0, arg1}, arg2...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "WaitForSynced", reflect.TypeOf((*MockBeaconNodeValidatorClient)(nil).WaitForSynced), varargs...) } -// MockBeaconNodeValidator_WaitForSyncedClient is a mock of BeaconNodeValidator_WaitForSyncedClient interface. +// MockBeaconNodeValidator_WaitForSyncedClient is a mock of BeaconNodeValidator_WaitForSyncedClient interface type MockBeaconNodeValidator_WaitForSyncedClient struct { ctrl *gomock.Controller recorder *MockBeaconNodeValidator_WaitForSyncedClientMockRecorder } -// MockBeaconNodeValidator_WaitForSyncedClientMockRecorder is the mock recorder for MockBeaconNodeValidator_WaitForSyncedClient. +// MockBeaconNodeValidator_WaitForSyncedClientMockRecorder is the mock recorder for MockBeaconNodeValidator_WaitForSyncedClient type MockBeaconNodeValidator_WaitForSyncedClientMockRecorder struct { mock *MockBeaconNodeValidator_WaitForSyncedClient } -// NewMockBeaconNodeValidator_WaitForSyncedClient creates a new mock instance. +// NewMockBeaconNodeValidator_WaitForSyncedClient creates a new mock instance func NewMockBeaconNodeValidator_WaitForSyncedClient(ctrl *gomock.Controller) *MockBeaconNodeValidator_WaitForSyncedClient { mock := &MockBeaconNodeValidator_WaitForSyncedClient{ctrl: ctrl} mock.recorder = &MockBeaconNodeValidator_WaitForSyncedClientMockRecorder{mock} return mock } -// EXPECT returns an object that allows the caller to indicate expected use. +// EXPECT returns an object that allows the caller to indicate expected use func (m *MockBeaconNodeValidator_WaitForSyncedClient) EXPECT() *MockBeaconNodeValidator_WaitForSyncedClientMockRecorder { return m.recorder } -// CloseSend mocks base method. +// CloseSend mocks base method func (m *MockBeaconNodeValidator_WaitForSyncedClient) CloseSend() error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "CloseSend") @@ -369,13 +388,13 @@ func (m *MockBeaconNodeValidator_WaitForSyncedClient) CloseSend() error { return ret0 } -// CloseSend indicates an expected call of CloseSend. +// CloseSend indicates an expected call of CloseSend func (mr *MockBeaconNodeValidator_WaitForSyncedClientMockRecorder) CloseSend() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CloseSend", reflect.TypeOf((*MockBeaconNodeValidator_WaitForSyncedClient)(nil).CloseSend)) } -// Context mocks base method. +// Context mocks base method func (m *MockBeaconNodeValidator_WaitForSyncedClient) Context() context.Context { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Context") @@ -383,13 +402,13 @@ func (m *MockBeaconNodeValidator_WaitForSyncedClient) Context() context.Context return ret0 } -// Context indicates an expected call of Context. +// Context indicates an expected call of Context func (mr *MockBeaconNodeValidator_WaitForSyncedClientMockRecorder) Context() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Context", reflect.TypeOf((*MockBeaconNodeValidator_WaitForSyncedClient)(nil).Context)) } -// Header mocks base method. +// Header mocks base method func (m *MockBeaconNodeValidator_WaitForSyncedClient) Header() (metadata.MD, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Header") @@ -398,13 +417,13 @@ func (m *MockBeaconNodeValidator_WaitForSyncedClient) Header() (metadata.MD, err return ret0, ret1 } -// Header indicates an expected call of Header. +// Header indicates an expected call of Header func (mr *MockBeaconNodeValidator_WaitForSyncedClientMockRecorder) Header() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Header", reflect.TypeOf((*MockBeaconNodeValidator_WaitForSyncedClient)(nil).Header)) } -// Recv mocks base method. +// Recv mocks base method func (m *MockBeaconNodeValidator_WaitForSyncedClient) Recv() (*eth.SyncedResponse, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Recv") @@ -413,13 +432,13 @@ func (m *MockBeaconNodeValidator_WaitForSyncedClient) Recv() (*eth.SyncedRespons return ret0, ret1 } -// Recv indicates an expected call of Recv. +// Recv indicates an expected call of Recv func (mr *MockBeaconNodeValidator_WaitForSyncedClientMockRecorder) Recv() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Recv", reflect.TypeOf((*MockBeaconNodeValidator_WaitForSyncedClient)(nil).Recv)) } -// RecvMsg mocks base method. +// RecvMsg mocks base method func (m *MockBeaconNodeValidator_WaitForSyncedClient) RecvMsg(arg0 interface{}) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "RecvMsg", arg0) @@ -427,13 +446,13 @@ func (m *MockBeaconNodeValidator_WaitForSyncedClient) RecvMsg(arg0 interface{}) return ret0 } -// RecvMsg indicates an expected call of RecvMsg. +// RecvMsg indicates an expected call of RecvMsg func (mr *MockBeaconNodeValidator_WaitForSyncedClientMockRecorder) RecvMsg(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RecvMsg", reflect.TypeOf((*MockBeaconNodeValidator_WaitForSyncedClient)(nil).RecvMsg), arg0) } -// SendMsg mocks base method. +// SendMsg mocks base method func (m *MockBeaconNodeValidator_WaitForSyncedClient) SendMsg(arg0 interface{}) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "SendMsg", arg0) @@ -441,13 +460,13 @@ func (m *MockBeaconNodeValidator_WaitForSyncedClient) SendMsg(arg0 interface{}) return ret0 } -// SendMsg indicates an expected call of SendMsg. +// SendMsg indicates an expected call of SendMsg func (mr *MockBeaconNodeValidator_WaitForSyncedClientMockRecorder) SendMsg(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SendMsg", reflect.TypeOf((*MockBeaconNodeValidator_WaitForSyncedClient)(nil).SendMsg), arg0) } -// Trailer mocks base method. +// Trailer mocks base method func (m *MockBeaconNodeValidator_WaitForSyncedClient) Trailer() metadata.MD { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Trailer") @@ -455,65 +474,65 @@ func (m *MockBeaconNodeValidator_WaitForSyncedClient) Trailer() metadata.MD { return ret0 } -// Trailer indicates an expected call of Trailer. +// Trailer indicates an expected call of Trailer func (mr *MockBeaconNodeValidator_WaitForSyncedClientMockRecorder) Trailer() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Trailer", reflect.TypeOf((*MockBeaconNodeValidator_WaitForSyncedClient)(nil).Trailer)) } -// MockBeaconNodeValidator_WaitForActivationClient is a mock of BeaconNodeValidator_WaitForActivationClient interface. -type MockBeaconNodeValidator_WaitForActivationClient struct { +// MockBeaconNodeValidator_WaitForChainStartClient is a mock of BeaconNodeValidator_WaitForChainStartClient interface +type MockBeaconNodeValidator_WaitForChainStartClient struct { ctrl *gomock.Controller - recorder *MockBeaconNodeValidator_WaitForActivationClientMockRecorder + recorder *MockBeaconNodeValidator_WaitForChainStartClientMockRecorder } -// MockBeaconNodeValidator_WaitForActivationClientMockRecorder is the mock recorder for MockBeaconNodeValidator_WaitForActivationClient. -type MockBeaconNodeValidator_WaitForActivationClientMockRecorder struct { - mock *MockBeaconNodeValidator_WaitForActivationClient +// MockBeaconNodeValidator_WaitForChainStartClientMockRecorder is the mock recorder for MockBeaconNodeValidator_WaitForChainStartClient +type MockBeaconNodeValidator_WaitForChainStartClientMockRecorder struct { + mock *MockBeaconNodeValidator_WaitForChainStartClient } -// NewMockBeaconNodeValidator_WaitForActivationClient creates a new mock instance. -func NewMockBeaconNodeValidator_WaitForActivationClient(ctrl *gomock.Controller) *MockBeaconNodeValidator_WaitForActivationClient { - mock := &MockBeaconNodeValidator_WaitForActivationClient{ctrl: ctrl} - mock.recorder = &MockBeaconNodeValidator_WaitForActivationClientMockRecorder{mock} +// NewMockBeaconNodeValidator_WaitForChainStartClient creates a new mock instance +func NewMockBeaconNodeValidator_WaitForChainStartClient(ctrl *gomock.Controller) *MockBeaconNodeValidator_WaitForChainStartClient { + mock := &MockBeaconNodeValidator_WaitForChainStartClient{ctrl: ctrl} + mock.recorder = &MockBeaconNodeValidator_WaitForChainStartClientMockRecorder{mock} return mock } -// EXPECT returns an object that allows the caller to indicate expected use. -func (m *MockBeaconNodeValidator_WaitForActivationClient) EXPECT() *MockBeaconNodeValidator_WaitForActivationClientMockRecorder { +// EXPECT returns an object that allows the caller to indicate expected use +func (m *MockBeaconNodeValidator_WaitForChainStartClient) EXPECT() *MockBeaconNodeValidator_WaitForChainStartClientMockRecorder { return m.recorder } -// CloseSend mocks base method. -func (m *MockBeaconNodeValidator_WaitForActivationClient) CloseSend() error { +// CloseSend mocks base method +func (m *MockBeaconNodeValidator_WaitForChainStartClient) CloseSend() error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "CloseSend") ret0, _ := ret[0].(error) return ret0 } -// CloseSend indicates an expected call of CloseSend. -func (mr *MockBeaconNodeValidator_WaitForActivationClientMockRecorder) CloseSend() *gomock.Call { +// CloseSend indicates an expected call of CloseSend +func (mr *MockBeaconNodeValidator_WaitForChainStartClientMockRecorder) CloseSend() *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CloseSend", reflect.TypeOf((*MockBeaconNodeValidator_WaitForActivationClient)(nil).CloseSend)) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CloseSend", reflect.TypeOf((*MockBeaconNodeValidator_WaitForChainStartClient)(nil).CloseSend)) } -// Context mocks base method. -func (m *MockBeaconNodeValidator_WaitForActivationClient) Context() context.Context { +// Context mocks base method +func (m *MockBeaconNodeValidator_WaitForChainStartClient) Context() context.Context { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Context") ret0, _ := ret[0].(context.Context) return ret0 } -// Context indicates an expected call of Context. -func (mr *MockBeaconNodeValidator_WaitForActivationClientMockRecorder) Context() *gomock.Call { +// Context indicates an expected call of Context +func (mr *MockBeaconNodeValidator_WaitForChainStartClientMockRecorder) Context() *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Context", reflect.TypeOf((*MockBeaconNodeValidator_WaitForActivationClient)(nil).Context)) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Context", reflect.TypeOf((*MockBeaconNodeValidator_WaitForChainStartClient)(nil).Context)) } -// Header mocks base method. -func (m *MockBeaconNodeValidator_WaitForActivationClient) Header() (metadata.MD, error) { +// Header mocks base method +func (m *MockBeaconNodeValidator_WaitForChainStartClient) Header() (metadata.MD, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Header") ret0, _ := ret[0].(metadata.MD) @@ -521,122 +540,122 @@ func (m *MockBeaconNodeValidator_WaitForActivationClient) Header() (metadata.MD, return ret0, ret1 } -// Header indicates an expected call of Header. -func (mr *MockBeaconNodeValidator_WaitForActivationClientMockRecorder) Header() *gomock.Call { +// Header indicates an expected call of Header +func (mr *MockBeaconNodeValidator_WaitForChainStartClientMockRecorder) Header() *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Header", reflect.TypeOf((*MockBeaconNodeValidator_WaitForActivationClient)(nil).Header)) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Header", reflect.TypeOf((*MockBeaconNodeValidator_WaitForChainStartClient)(nil).Header)) } -// Recv mocks base method. -func (m *MockBeaconNodeValidator_WaitForActivationClient) Recv() (*eth.ValidatorActivationResponse, error) { +// Recv mocks base method +func (m *MockBeaconNodeValidator_WaitForChainStartClient) Recv() (*eth.ChainStartResponse, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Recv") - ret0, _ := ret[0].(*eth.ValidatorActivationResponse) + ret0, _ := ret[0].(*eth.ChainStartResponse) ret1, _ := ret[1].(error) return ret0, ret1 } -// Recv indicates an expected call of Recv. -func (mr *MockBeaconNodeValidator_WaitForActivationClientMockRecorder) Recv() *gomock.Call { +// Recv indicates an expected call of Recv +func (mr *MockBeaconNodeValidator_WaitForChainStartClientMockRecorder) Recv() *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Recv", reflect.TypeOf((*MockBeaconNodeValidator_WaitForActivationClient)(nil).Recv)) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Recv", reflect.TypeOf((*MockBeaconNodeValidator_WaitForChainStartClient)(nil).Recv)) } -// RecvMsg mocks base method. -func (m *MockBeaconNodeValidator_WaitForActivationClient) RecvMsg(arg0 interface{}) error { +// RecvMsg mocks base method +func (m *MockBeaconNodeValidator_WaitForChainStartClient) RecvMsg(arg0 interface{}) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "RecvMsg", arg0) ret0, _ := ret[0].(error) return ret0 } -// RecvMsg indicates an expected call of RecvMsg. -func (mr *MockBeaconNodeValidator_WaitForActivationClientMockRecorder) RecvMsg(arg0 interface{}) *gomock.Call { +// RecvMsg indicates an expected call of RecvMsg +func (mr *MockBeaconNodeValidator_WaitForChainStartClientMockRecorder) RecvMsg(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RecvMsg", reflect.TypeOf((*MockBeaconNodeValidator_WaitForActivationClient)(nil).RecvMsg), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RecvMsg", reflect.TypeOf((*MockBeaconNodeValidator_WaitForChainStartClient)(nil).RecvMsg), arg0) } -// SendMsg mocks base method. -func (m *MockBeaconNodeValidator_WaitForActivationClient) SendMsg(arg0 interface{}) error { +// SendMsg mocks base method +func (m *MockBeaconNodeValidator_WaitForChainStartClient) SendMsg(arg0 interface{}) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "SendMsg", arg0) ret0, _ := ret[0].(error) return ret0 } -// SendMsg indicates an expected call of SendMsg. -func (mr *MockBeaconNodeValidator_WaitForActivationClientMockRecorder) SendMsg(arg0 interface{}) *gomock.Call { +// SendMsg indicates an expected call of SendMsg +func (mr *MockBeaconNodeValidator_WaitForChainStartClientMockRecorder) SendMsg(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SendMsg", reflect.TypeOf((*MockBeaconNodeValidator_WaitForActivationClient)(nil).SendMsg), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SendMsg", reflect.TypeOf((*MockBeaconNodeValidator_WaitForChainStartClient)(nil).SendMsg), arg0) } -// Trailer mocks base method. -func (m *MockBeaconNodeValidator_WaitForActivationClient) Trailer() metadata.MD { +// Trailer mocks base method +func (m *MockBeaconNodeValidator_WaitForChainStartClient) Trailer() metadata.MD { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Trailer") ret0, _ := ret[0].(metadata.MD) return ret0 } -// Trailer indicates an expected call of Trailer. -func (mr *MockBeaconNodeValidator_WaitForActivationClientMockRecorder) Trailer() *gomock.Call { +// Trailer indicates an expected call of Trailer +func (mr *MockBeaconNodeValidator_WaitForChainStartClientMockRecorder) Trailer() *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Trailer", reflect.TypeOf((*MockBeaconNodeValidator_WaitForActivationClient)(nil).Trailer)) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Trailer", reflect.TypeOf((*MockBeaconNodeValidator_WaitForChainStartClient)(nil).Trailer)) } -// MockBeaconNodeValidator_WaitForChainStartClient is a mock of BeaconNodeValidator_WaitForChainStartClient interface. -type MockBeaconNodeValidator_WaitForChainStartClient struct { +// MockBeaconNodeValidator_WaitForActivationClient is a mock of BeaconNodeValidator_WaitForActivationClient interface +type MockBeaconNodeValidator_WaitForActivationClient struct { ctrl *gomock.Controller - recorder *MockBeaconNodeValidator_WaitForChainStartClientMockRecorder + recorder *MockBeaconNodeValidator_WaitForActivationClientMockRecorder } -// MockBeaconNodeValidator_WaitForChainStartClientMockRecorder is the mock recorder for MockBeaconNodeValidator_WaitForChainStartClient. -type MockBeaconNodeValidator_WaitForChainStartClientMockRecorder struct { - mock *MockBeaconNodeValidator_WaitForChainStartClient +// MockBeaconNodeValidator_WaitForActivationClientMockRecorder is the mock recorder for MockBeaconNodeValidator_WaitForActivationClient +type MockBeaconNodeValidator_WaitForActivationClientMockRecorder struct { + mock *MockBeaconNodeValidator_WaitForActivationClient } -// NewMockBeaconNodeValidator_WaitForChainStartClient creates a new mock instance. -func NewMockBeaconNodeValidator_WaitForChainStartClient(ctrl *gomock.Controller) *MockBeaconNodeValidator_WaitForChainStartClient { - mock := &MockBeaconNodeValidator_WaitForChainStartClient{ctrl: ctrl} - mock.recorder = &MockBeaconNodeValidator_WaitForChainStartClientMockRecorder{mock} +// NewMockBeaconNodeValidator_WaitForActivationClient creates a new mock instance +func NewMockBeaconNodeValidator_WaitForActivationClient(ctrl *gomock.Controller) *MockBeaconNodeValidator_WaitForActivationClient { + mock := &MockBeaconNodeValidator_WaitForActivationClient{ctrl: ctrl} + mock.recorder = &MockBeaconNodeValidator_WaitForActivationClientMockRecorder{mock} return mock } -// EXPECT returns an object that allows the caller to indicate expected use. -func (m *MockBeaconNodeValidator_WaitForChainStartClient) EXPECT() *MockBeaconNodeValidator_WaitForChainStartClientMockRecorder { +// EXPECT returns an object that allows the caller to indicate expected use +func (m *MockBeaconNodeValidator_WaitForActivationClient) EXPECT() *MockBeaconNodeValidator_WaitForActivationClientMockRecorder { return m.recorder } -// CloseSend mocks base method. -func (m *MockBeaconNodeValidator_WaitForChainStartClient) CloseSend() error { +// CloseSend mocks base method +func (m *MockBeaconNodeValidator_WaitForActivationClient) CloseSend() error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "CloseSend") ret0, _ := ret[0].(error) return ret0 } -// CloseSend indicates an expected call of CloseSend. -func (mr *MockBeaconNodeValidator_WaitForChainStartClientMockRecorder) CloseSend() *gomock.Call { +// CloseSend indicates an expected call of CloseSend +func (mr *MockBeaconNodeValidator_WaitForActivationClientMockRecorder) CloseSend() *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CloseSend", reflect.TypeOf((*MockBeaconNodeValidator_WaitForChainStartClient)(nil).CloseSend)) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CloseSend", reflect.TypeOf((*MockBeaconNodeValidator_WaitForActivationClient)(nil).CloseSend)) } -// Context mocks base method. -func (m *MockBeaconNodeValidator_WaitForChainStartClient) Context() context.Context { +// Context mocks base method +func (m *MockBeaconNodeValidator_WaitForActivationClient) Context() context.Context { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Context") ret0, _ := ret[0].(context.Context) return ret0 } -// Context indicates an expected call of Context. -func (mr *MockBeaconNodeValidator_WaitForChainStartClientMockRecorder) Context() *gomock.Call { +// Context indicates an expected call of Context +func (mr *MockBeaconNodeValidator_WaitForActivationClientMockRecorder) Context() *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Context", reflect.TypeOf((*MockBeaconNodeValidator_WaitForChainStartClient)(nil).Context)) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Context", reflect.TypeOf((*MockBeaconNodeValidator_WaitForActivationClient)(nil).Context)) } -// Header mocks base method. -func (m *MockBeaconNodeValidator_WaitForChainStartClient) Header() (metadata.MD, error) { +// Header mocks base method +func (m *MockBeaconNodeValidator_WaitForActivationClient) Header() (metadata.MD, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Header") ret0, _ := ret[0].(metadata.MD) @@ -644,65 +663,65 @@ func (m *MockBeaconNodeValidator_WaitForChainStartClient) Header() (metadata.MD, return ret0, ret1 } -// Header indicates an expected call of Header. -func (mr *MockBeaconNodeValidator_WaitForChainStartClientMockRecorder) Header() *gomock.Call { +// Header indicates an expected call of Header +func (mr *MockBeaconNodeValidator_WaitForActivationClientMockRecorder) Header() *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Header", reflect.TypeOf((*MockBeaconNodeValidator_WaitForChainStartClient)(nil).Header)) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Header", reflect.TypeOf((*MockBeaconNodeValidator_WaitForActivationClient)(nil).Header)) } -// Recv mocks base method. -func (m *MockBeaconNodeValidator_WaitForChainStartClient) Recv() (*eth.ChainStartResponse, error) { +// Recv mocks base method +func (m *MockBeaconNodeValidator_WaitForActivationClient) Recv() (*eth.ValidatorActivationResponse, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Recv") - ret0, _ := ret[0].(*eth.ChainStartResponse) + ret0, _ := ret[0].(*eth.ValidatorActivationResponse) ret1, _ := ret[1].(error) return ret0, ret1 } -// Recv indicates an expected call of Recv. -func (mr *MockBeaconNodeValidator_WaitForChainStartClientMockRecorder) Recv() *gomock.Call { +// Recv indicates an expected call of Recv +func (mr *MockBeaconNodeValidator_WaitForActivationClientMockRecorder) Recv() *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Recv", reflect.TypeOf((*MockBeaconNodeValidator_WaitForChainStartClient)(nil).Recv)) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Recv", reflect.TypeOf((*MockBeaconNodeValidator_WaitForActivationClient)(nil).Recv)) } -// RecvMsg mocks base method. -func (m *MockBeaconNodeValidator_WaitForChainStartClient) RecvMsg(arg0 interface{}) error { +// RecvMsg mocks base method +func (m *MockBeaconNodeValidator_WaitForActivationClient) RecvMsg(arg0 interface{}) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "RecvMsg", arg0) ret0, _ := ret[0].(error) return ret0 } -// RecvMsg indicates an expected call of RecvMsg. -func (mr *MockBeaconNodeValidator_WaitForChainStartClientMockRecorder) RecvMsg(arg0 interface{}) *gomock.Call { +// RecvMsg indicates an expected call of RecvMsg +func (mr *MockBeaconNodeValidator_WaitForActivationClientMockRecorder) RecvMsg(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RecvMsg", reflect.TypeOf((*MockBeaconNodeValidator_WaitForChainStartClient)(nil).RecvMsg), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RecvMsg", reflect.TypeOf((*MockBeaconNodeValidator_WaitForActivationClient)(nil).RecvMsg), arg0) } -// SendMsg mocks base method. -func (m *MockBeaconNodeValidator_WaitForChainStartClient) SendMsg(arg0 interface{}) error { +// SendMsg mocks base method +func (m *MockBeaconNodeValidator_WaitForActivationClient) SendMsg(arg0 interface{}) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "SendMsg", arg0) ret0, _ := ret[0].(error) return ret0 } -// SendMsg indicates an expected call of SendMsg. -func (mr *MockBeaconNodeValidator_WaitForChainStartClientMockRecorder) SendMsg(arg0 interface{}) *gomock.Call { +// SendMsg indicates an expected call of SendMsg +func (mr *MockBeaconNodeValidator_WaitForActivationClientMockRecorder) SendMsg(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SendMsg", reflect.TypeOf((*MockBeaconNodeValidator_WaitForChainStartClient)(nil).SendMsg), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SendMsg", reflect.TypeOf((*MockBeaconNodeValidator_WaitForActivationClient)(nil).SendMsg), arg0) } -// Trailer mocks base method. -func (m *MockBeaconNodeValidator_WaitForChainStartClient) Trailer() metadata.MD { +// Trailer mocks base method +func (m *MockBeaconNodeValidator_WaitForActivationClient) Trailer() metadata.MD { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Trailer") ret0, _ := ret[0].(metadata.MD) return ret0 } -// Trailer indicates an expected call of Trailer. -func (mr *MockBeaconNodeValidator_WaitForChainStartClientMockRecorder) Trailer() *gomock.Call { +// Trailer indicates an expected call of Trailer +func (mr *MockBeaconNodeValidator_WaitForActivationClientMockRecorder) Trailer() *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Trailer", reflect.TypeOf((*MockBeaconNodeValidator_WaitForChainStartClient)(nil).Trailer)) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Trailer", reflect.TypeOf((*MockBeaconNodeValidator_WaitForActivationClient)(nil).Trailer)) }