revert some changes

prysmaticlabs · Feb 1, 2024 · f6dcc91 · f6dcc91
1 parent 407bb2f
commit f6dcc91
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 12 deletions.
diff --git a/validator/accounts/testing/mock.go b/validator/accounts/testing/mock.go
@@ -154,7 +154,7 @@ func (_ *Validator) SubmitSignedContributionAndProof(_ context.Context, _ primit
 	panic("implement me")
 }
 
-func (_ *Validator) LogSubmittedAtts(_ primitives.Slot) {
+func (_ *Validator) LogSubmittedAtts() {
 	panic("implement me")
 }
 

diff --git a/validator/client/iface/validator.go b/validator/client/iface/validator.go
@@ -52,7 +52,7 @@ type Validator interface {
 	SubmitAggregateAndProof(ctx context.Context, slot primitives.Slot, pubKey [fieldparams.BLSPubkeyLength]byte)
 	SubmitSyncCommitteeMessage(ctx context.Context, slot primitives.Slot, pubKey [fieldparams.BLSPubkeyLength]byte)
 	SubmitSignedContributionAndProof(ctx context.Context, slot primitives.Slot, pubKey [fieldparams.BLSPubkeyLength]byte)
-	LogSubmittedAtts(slot primitives.Slot)
+	LogSubmittedAtts()
 	LogSubmittedSyncCommitteeMessages()
 	UpdateDomainDataCaches(ctx context.Context, slot primitives.Slot)
 	WaitForKeymanagerInitialization(ctx context.Context) error

diff --git a/validator/client/log.go b/validator/client/log.go
@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"sync/atomic"
 
-	"github.com/prysmaticlabs/prysm/v4/consensus-types/primitives"
 	"github.com/prysmaticlabs/prysm/v4/encoding/bytesutil"
 	ethpb "github.com/prysmaticlabs/prysm/v4/proto/prysm/v1alpha1"
 	"github.com/sirupsen/logrus"
@@ -19,15 +18,10 @@ type submittedAtt struct {
 }
 
 // LogSubmittedAtts logs info about submitted attestations.
-func (v *validator) LogSubmittedAtts(slot primitives.Slot) {
+func (v *validator) LogSubmittedAtts() {
 	v.attLogsLock.Lock()
 	defer v.attLogsLock.Unlock()
 
-	if len(v.submittedAtts) == 0 {
-		return
-	}
-
-	log.Infof("Submitted new attestations for slot %d", slot)
 	for _, attLog := range v.submittedAtts {
 		attesterPubkeys := make([]string, len(attLog.attesterPubkeys))
 		for i, p := range attLog.attesterPubkeys {
@@ -38,6 +32,7 @@ func (v *validator) LogSubmittedAtts(slot primitives.Slot) {
 			aggregatorPubkeys[i] = fmt.Sprintf("%#x", bytesutil.Trunc(p))
 		}
 		log.WithFields(logrus.Fields{
+			"slot":              attLog.data.Slot,
 			"committeeIndex":    attLog.data.CommitteeIndex,
 			"beaconBlockRoot":   fmt.Sprintf("%#x", bytesutil.Trunc(attLog.data.BeaconBlockRoot)),
 			"sourceEpoch":       attLog.data.Source.Epoch,

diff --git a/validator/client/testutil/mock_validator.go b/validator/client/testutil/mock_validator.go
@@ -181,8 +181,8 @@ func (*FakeValidator) SubmitAggregateAndProof(_ context.Context, _ primitives.Sl
 func (*FakeValidator) SubmitSyncCommitteeMessage(_ context.Context, _ primitives.Slot, _ [fieldparams.BLSPubkeyLength]byte) {
 }
 
-// LogAttestationsSubmitted for mocking.
-func (*FakeValidator) LogSubmittedAtts(_ primitives.Slot) {}
+// LogSubmittedAtts for mocking.
+func (*FakeValidator) LogSubmittedAtts() {}
 
 // UpdateDomainDataCaches for mocking.
 func (*FakeValidator) UpdateDomainDataCaches(context.Context, primitives.Slot) {}

diff --git a/validator/client/validator.go b/validator/client/validator.go
@@ -967,11 +967,13 @@ func (v *validator) logDuties(slot primitives.Slot, currentEpochDuties []*ethpb.
 		}
 		if len(attesterKeys[i]) > 0 {
 			slotLog = slotLog.WithFields(logrus.Fields{
+				"slot":            epochStartSlot + i,
+				"slotInEpoch":     (epochStartSlot + i) % params.BeaconConfig().SlotsPerEpoch,
 				"attesterCount":   len(attesterKeys[i]),
 				"attesterPubkeys": attesterKeys[i],
 			})
 		}
-		slotLog.Infof("Schedule for slot %d (slot %d in epoch)", epochStartSlot+i, (epochStartSlot+i)%params.BeaconConfig().SlotsPerEpoch)
+		slotLog.Infof("Duties schedule")
 	}
 }