AtHeartEngineer/prysm
1
0
Fork 0
mirror of https://github.com/OffchainLabs/prysm.git synced 2026-01-09 13:28:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

removing explicit deadlines on push proposer settings (#14285)

Browse Source 
* removing deadlines

* fixing mock interface implementation
This commit is contained in:
james-prysm
2024-07-31 13:28:50 -05:00
committed by GitHub
parent 7c69a9aa1c
commit 0ed74b3c4a
6 changed files with 9 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
validator/accounts/testing/mock.go
View File

@@ -204,7 +204,7 @@ func (*Validator) HasProposerSettings() bool {
}
// PushProposerSettings for mocking
func (_ *Validator) PushProposerSettings(_ context.Context, _ keymanager.IKeymanager, _ primitives.Slot, _ time.Time) error {
func (_ *Validator) PushProposerSettings(_ context.Context, _ keymanager.IKeymanager, _ primitives.Slot) error {
panic("implement me")
}

2
validator/client/iface/validator.go
View File

@@ -57,7 +57,7 @@ type Validator interface {
Keymanager() (keymanager.IKeymanager, error)
HandleKeyReload(ctx context.Context, currentKeys [][fieldparams.BLSPubkeyLength]byte) (bool, error)
CheckDoppelGanger(ctx context.Context) error
PushProposerSettings(ctx context.Context, km keymanager.IKeymanager, slot primitives.Slot, deadline time.Time) error
PushProposerSettings(ctx context.Context, km keymanager.IKeymanager, slot primitives.Slot) error
SignValidatorRegistrationRequest(ctx context.Context, signer SigningFunc, newValidatorRegistration *ethpb.ValidatorRegistrationV1) (*ethpb.SignedValidatorRegistrationV1, error)
StartEventStream(ctx context.Context, topics []string, eventsChan chan<- *event.Event)
EventStreamIsRunning() bool

10
validator/client/runner.go
View File

@@ -61,9 +61,8 @@ func run(ctx context.Context, v iface.Validator) {
log.Warn("Validator client started without proposer settings such as fee recipient" +
" and will continue to use settings provided in the beacon node.")
}
deadline := time.Now().Add(5 * time.Minute)
if err := v.PushProposerSettings(ctx, km, headSlot, deadline); err != nil {
log.WithError(err).Fatal("Failed to update proposer settings") // allow fatal. skipcq
if err := v.PushProposerSettings(ctx, km, headSlot); err != nil {
log.WithError(err).Fatal("Failed to update proposer settings")
}
for {
ctx, span := trace.StartSpan(ctx, "validator.processSlot")
@@ -97,7 +96,7 @@ func run(ctx context.Context, v iface.Validator) {
// call push proposer settings often to account for the following edge cases:
// proposer is activated at the start of epoch and tries to propose immediately
// account has changed in the middle of an epoch
if err := v.PushProposerSettings(ctx, km, slot, deadline); err != nil {
if err := v.PushProposerSettings(ctx, km, slot); err != nil {
log.WithError(err).Warn("Failed to update proposer settings")
}
@@ -316,8 +315,7 @@ func runHealthCheckRoutine(ctx context.Context, v iface.Validator, eventsChan ch
log.WithError(err).Error("Could not get canonical head slot")
return
}
deadline := time.Now().Add(5 * time.Minute) // Should consider changing to a constant
if err := v.PushProposerSettings(ctx, km, slot, deadline); err != nil {
if err := v.PushProposerSettings(ctx, km, slot); err != nil {
log.WithError(err).Warn("Failed to update proposer settings")
}
}

5
validator/client/testutil/mock_validator.go
View File

@@ -254,10 +254,7 @@ func (*FakeValidator) HasProposerSettings() bool {
}
// PushProposerSettings for mocking
func (fv *FakeValidator) PushProposerSettings(ctx context.Context, _ keymanager.IKeymanager, _ primitives.Slot, deadline time.Time) error {
nctx, cancel := context.WithDeadline(ctx, deadline)
ctx = nctx
defer cancel()
func (fv *FakeValidator) PushProposerSettings(ctx context.Context, _ keymanager.IKeymanager, _ primitives.Slot) error {
time.Sleep(fv.ProposerSettingWait)
if errors.Is(ctx.Err(), context.DeadlineExceeded) {
log.Error("deadline exceeded")

5
validator/client/validator.go
View File

@@ -1102,16 +1102,13 @@ func (v *validator) SetProposerSettings(ctx context.Context, settings *proposer.
}
// PushProposerSettings calls the prepareBeaconProposer RPC to set the fee recipient and also the register validator API if using a custom builder.
func (v *validator) PushProposerSettings(ctx context.Context, km keymanager.IKeymanager, slot primitives.Slot, deadline time.Time) error {
func (v *validator) PushProposerSettings(ctx context.Context, km keymanager.IKeymanager, slot primitives.Slot) error {
ctx, span := trace.StartSpan(ctx, "validator.PushProposerSettings")
defer span.End()
if km == nil {
return errors.New("keymanager is nil when calling PrepareBeaconProposer")
}
nctx, cancel := context.WithDeadline(ctx, deadline)
ctx = nctx
defer cancel()
pubkeys, err := km.FetchValidatingPublicKeys(ctx)
if err != nil {

3
validator/client/validator_test.go
View File

@@ -2027,8 +2027,7 @@ func TestValidator_PushSettings(t *testing.T) {
require.Equal(t, len(tt.mockExpectedRequests), len(signedRegisterValidatorRequests))
require.Equal(t, len(signedRegisterValidatorRequests), len(v.signedValidatorRegistrations))
}
deadline := time.Now().Add(time.Duration(params.BeaconConfig().SecondsPerSlot) * time.Second)
if err := v.PushProposerSettings(ctx, km, 0, deadline); tt.err != "" {
if err := v.PushProposerSettings(ctx, km, 0); tt.err != "" {
assert.ErrorContains(t, tt.err, err)
}
if len(tt.logMessages) > 0 {