Fix beaconmock

Author: KaloyanTanev

app/eth2wrap/synthproposer_test.go

@@ -252,10 +252,31 @@ func TestSynthProposer(t *testing.T) {
 					},
 				}, nil
 			}
-			cached := bmock.CachedValidatorsFunc
+			cachedValidators := bmock.CachedValidatorsFunc
 			bmock.CachedValidatorsFunc = func(ctx context.Context) (eth2wrap.ActiveValidators, eth2wrap.CompleteValidators, error) {
 				activeVals++
-				return cached(ctx)
+				return cachedValidators(ctx)
+			}
+			bmock.CachedProposerDutiesFunc = func(ctx context.Context, epoch eth2p0.Epoch) ([]*eth2v1.ProposerDuty, error) {
+				duties, err := bmock.ProposerDuties(ctx, &eth2api.ProposerDutiesOpts{Epoch: epoch})
+				if err != nil {
+					return nil, err
+				}
+				return duties.Data, nil
+			}
+			bmock.CachedAttesterDutiesFunc = func(ctx context.Context, epoch eth2p0.Epoch) ([]*eth2v1.AttesterDuty, error) {
+				duties, err := bmock.AttesterDuties(ctx, &eth2api.AttesterDutiesOpts{Epoch: epoch})
+				if err != nil {
+					return nil, err
+				}
+				return duties.Data, nil
+			}
+			bmock.CachedSyncDutiesFunc = func(ctx context.Context, epoch eth2p0.Epoch) ([]*eth2v1.SyncCommitteeDuty, error) {
+				duties, err := bmock.SyncCommitteeDuties(ctx, &eth2api.SyncCommitteeDutiesOpts{Epoch: epoch})
+				if err != nil {
+					return nil, err
+				}
+				return duties.Data, nil
 			}
 			bmock.SignedBeaconBlockFunc = func(ctx context.Context, blockID string) (*eth2spec.VersionedSignedBeaconBlock, error) {
 				resp := test.versionedSignedBlock

testutil/beaconmock/beaconmock_fuzz.go

@@ -98,13 +98,19 @@ func WithBeaconMockFuzzer() Option {
 
 			return duties, nil
 		}
+		mock.CachedAttesterDutiesFunc = func(ctx context.Context, epoch eth2p0.Epoch) ([]*eth2v1.AttesterDuty, error) {
+			return mock.AttesterDutiesFunc(ctx, epoch, []eth2p0.ValidatorIndex{})
+		}
 
 		mock.ProposerDutiesFunc = func(context.Context, eth2p0.Epoch, []eth2p0.ValidatorIndex) ([]*eth2v1.ProposerDuty, error) {
 			var duties []*eth2v1.ProposerDuty
 			fuzz.New().Fuzz(&duties)
 
 			return duties, nil
 		}
+		mock.CachedProposerDutiesFunc = func(ctx context.Context, epoch eth2p0.Epoch) ([]*eth2v1.ProposerDuty, error) {
+			return mock.ProposerDutiesFunc(ctx, epoch, []eth2p0.ValidatorIndex{})
+		}
 
 		mock.AttestationDataFunc = func(context.Context, eth2p0.Slot, eth2p0.CommitteeIndex) (*eth2p0.AttestationData, error) {
 			var attData *eth2p0.AttestationData
@@ -173,6 +179,9 @@ func WithBeaconMockFuzzer() Option {
 
 			return duties, nil
 		}
+		mock.CachedSyncDutiesFunc = func(ctx context.Context, epoch eth2p0.Epoch) ([]*eth2v1.SyncCommitteeDuty, error) {
+			return mock.SyncCommitteeDutiesFunc(ctx, epoch, []eth2p0.ValidatorIndex{})
+		}
 
 		mock.SyncCommitteeContributionFunc = func(context.Context, eth2p0.Slot, uint64, eth2p0.Root) (*altair.SyncCommitteeContribution, error) {
 			var contribution *altair.SyncCommitteeContribution

testutil/beaconmock/options.go

@@ -390,6 +390,9 @@ func WithDeterministicAttesterDuties(factor int) Option {
 
 			return resp, nil
 		}
+		mock.CachedAttesterDutiesFunc = func(ctx context.Context, epoch eth2p0.Epoch) ([]*eth2v1.AttesterDuty, error) {
+			return mock.AttesterDutiesFunc(ctx, epoch, []eth2p0.ValidatorIndex{})
+		}
 	}
 }
 
@@ -447,6 +450,9 @@ func WithNoProposerDuties() Option {
 		mock.ProposerDutiesFunc = func(context.Context, eth2p0.Epoch, []eth2p0.ValidatorIndex) ([]*eth2v1.ProposerDuty, error) {
 			return nil, nil
 		}
+		mock.CachedProposerDutiesFunc = func(ctx context.Context, epoch eth2p0.Epoch) ([]*eth2v1.ProposerDuty, error) {
+			return mock.ProposerDutiesFunc(ctx, epoch, []eth2p0.ValidatorIndex{})
+		}
 	}
 }
 
@@ -456,6 +462,9 @@ func WithNoAttesterDuties() Option {
 		mock.AttesterDutiesFunc = func(context.Context, eth2p0.Epoch, []eth2p0.ValidatorIndex) ([]*eth2v1.AttesterDuty, error) {
 			return nil, nil
 		}
+		mock.CachedAttesterDutiesFunc = func(ctx context.Context, epoch eth2p0.Epoch) ([]*eth2v1.AttesterDuty, error) {
+			return mock.AttesterDutiesFunc(ctx, epoch, []eth2p0.ValidatorIndex{})
+		}
 	}
 }
 
@@ -465,6 +474,9 @@ func WithNoSyncCommitteeDuties() Option {
 		mock.SyncCommitteeDutiesFunc = func(context.Context, eth2p0.Epoch, []eth2p0.ValidatorIndex) ([]*eth2v1.SyncCommitteeDuty, error) {
 			return nil, nil
 		}
+		mock.CachedSyncDutiesFunc = func(ctx context.Context, epoch eth2p0.Epoch) ([]*eth2v1.SyncCommitteeDuty, error) {
+			return mock.SyncCommitteeDutiesFunc(ctx, epoch, []eth2p0.ValidatorIndex{})
+		}
 	}
 }
 
@@ -506,6 +518,9 @@ func WithDeterministicSyncCommDuties(n, k int) Option {
 
 			return resp, nil
 		}
+		mock.CachedSyncDutiesFunc = func(ctx context.Context, epoch eth2p0.Epoch) ([]*eth2v1.SyncCommitteeDuty, error) {
+			return mock.SyncCommitteeDutiesFunc(ctx, epoch, []eth2p0.ValidatorIndex{})
+		}
 
 		mock.overrides = append(mock.overrides, staticOverride{
 			Endpoint: "/eth/v1/config/spec",
@@ -586,9 +601,15 @@ func defaultMock(httpMock HTTPMock, httpServer *http.Server, clock clockwork.Clo
 		ProposerDutiesFunc: func(context.Context, eth2p0.Epoch, []eth2p0.ValidatorIndex) ([]*eth2v1.ProposerDuty, error) {
 			return []*eth2v1.ProposerDuty{}, nil
 		},
+		CachedProposerDutiesFunc: func(context.Context, eth2p0.Epoch) ([]*eth2v1.ProposerDuty, error) {
+			return []*eth2v1.ProposerDuty{}, nil
+		},
 		AttesterDutiesFunc: func(context.Context, eth2p0.Epoch, []eth2p0.ValidatorIndex) ([]*eth2v1.AttesterDuty, error) {
 			return []*eth2v1.AttesterDuty{}, nil
 		},
+		CachedAttesterDutiesFunc: func(context.Context, eth2p0.Epoch) ([]*eth2v1.AttesterDuty, error) {
+			return []*eth2v1.AttesterDuty{}, nil
+		},
 		BeaconBlockAttestationsFunc: func(context.Context, *eth2api.BeaconBlockAttestationsOpts) ([]*eth2spec.VersionedAttestation, error) {
 			return []*eth2spec.VersionedAttestation{}, nil
 		},
@@ -686,6 +707,9 @@ func defaultMock(httpMock HTTPMock, httpServer *http.Server, clock clockwork.Clo
 		SyncCommitteeDutiesFunc: func(context.Context, eth2p0.Epoch, []eth2p0.ValidatorIndex) ([]*eth2v1.SyncCommitteeDuty, error) {
 			return []*eth2v1.SyncCommitteeDuty{}, nil
 		},
+		CachedSyncDutiesFunc: func(context.Context, eth2p0.Epoch) ([]*eth2v1.SyncCommitteeDuty, error) {
+			return []*eth2v1.SyncCommitteeDuty{}, nil
+		},
 		SyncCommitteeSelectionsFunc: func(_ context.Context, opts *eth2api.SyncCommitteeSelectionsOpts) ([]*eth2v1.SyncCommitteeSelection, error) {
 			return opts.Selections, nil
 		},