mirror of
https://gitlab.com/pulsechaincom/prysm-pulse.git
synced 2024-12-25 04:47:18 +00:00
c77296ff82
* Add aggregate stats struct to validator struct. Log aggregate voting summary from beginning of node startup. * Refactoring out to function UpdateLogAggregateStats which updates and logs aggregate statistics * Changes to spelling. More refactoring so that the rest of aggregate stats are moved to UpdateLogAggregateStats * Bugfix - moved startBalance initialization out of if. * Remove a print debug. Spelling adjustment. * Minor refactoring/grammar changes * Renaming variables for consistency. * Address linter feedback: omit 2nd value from range over map as values were not being used. * Address feedback from PR re comments. Co-authored-by: terence tsao <terence@prysmaticlabs.com> * Addressing feedback from terencechain in PR. (name changes) * Addressing feedback from terencechain in PR. * Create test for UpdateLogAggregateStats() * Changed comment regarding "numberOfEpochs" log * go fmt metrics_test.go * bazel run //:gazelle -- fix * fix typos * Improved the code to detect the last iteration of the range responses loop * Merge branch 'master' into tempIssue4987 * For both previous Epoch and total runtime statistics, do not count non-included attestations for "correctly" statistics. * Update wording in since-launch logging Co-authored-by: terence tsao <terence@prysmaticlabs.com> * Store first logged epoch in startEpoch and appropriately adjust calculations. Initialize startEpoch to ^uint64(0). * Merge branch 'master' into tempIssue4987 * Update validator/client/metrics.go * Update validator/client/metrics.go * Update validator/client/validator.go * Update validator/client/metrics_test.go * Merge branch 'master' into tempIssue4987 * Merge branch 'master' into tempIssue4987 * Merge branch 'master' into tempIssue4987 * Merge branch 'master' into tempIssue4987 * Merge branch 'master' into tempIssue4987 * Merge branch 'master' into tempIssue4987 * Merge branch 'master' into tempIssue4987 * Merge branch 'master' into tempIssue4987 * Merge branch 'master' into tempIssue4987 * Merge branch 'master' into tempIssue4987
91 lines
3.2 KiB
Go
91 lines
3.2 KiB
Go
package client
|
|
|
|
import (
|
|
"testing"
|
|
|
|
ethpb "github.com/prysmaticlabs/ethereumapis/eth/v1alpha1"
|
|
"github.com/prysmaticlabs/prysm/shared/bytesutil"
|
|
"github.com/prysmaticlabs/prysm/shared/testutil"
|
|
logTest "github.com/sirupsen/logrus/hooks/test"
|
|
)
|
|
|
|
func TestUpdateLogAggregateStats(t *testing.T) {
|
|
v := &validator{
|
|
logValidatorBalances: true,
|
|
startBalances: make(map[[48]byte]uint64),
|
|
prevBalance: make(map[[48]byte]uint64),
|
|
voteStats: voteStats{
|
|
startEpoch: 0, //this would otherwise have been previously set in LogValidatorGainsAndLosses()
|
|
},
|
|
}
|
|
|
|
pubKeyBytes := [][48]byte{
|
|
bytesutil.ToBytes48([]byte("000000000000000000000000000000000000000012345678")),
|
|
bytesutil.ToBytes48([]byte("000000000000000000000000000000000000000099999999")),
|
|
bytesutil.ToBytes48([]byte("000000000000000000000000000000000000000055555555")),
|
|
}
|
|
|
|
v.startBalances[pubKeyBytes[0]] = uint64(32100000000)
|
|
v.startBalances[pubKeyBytes[1]] = uint64(32200000000)
|
|
v.startBalances[pubKeyBytes[2]] = uint64(33000000000)
|
|
|
|
responses := []*ethpb.ValidatorPerformanceResponse{
|
|
{
|
|
PublicKeys: [][]byte{
|
|
bytesutil.FromBytes48(pubKeyBytes[0]),
|
|
bytesutil.FromBytes48(pubKeyBytes[1]),
|
|
bytesutil.FromBytes48(pubKeyBytes[2]),
|
|
},
|
|
InclusionSlots: []uint64{^uint64(0), 10, 11}, //exact slot doesn't matter, only if it is == or != ^uint64(0)
|
|
InclusionDistances: []uint64{0, 5, 2},
|
|
CorrectlyVotedHead: []bool{false, true, false},
|
|
CorrectlyVotedSource: []bool{false, true, true},
|
|
CorrectlyVotedTarget: []bool{false, true, true},
|
|
},
|
|
{
|
|
PublicKeys: [][]byte{
|
|
bytesutil.FromBytes48(pubKeyBytes[0]),
|
|
bytesutil.FromBytes48(pubKeyBytes[1]),
|
|
bytesutil.FromBytes48(pubKeyBytes[2]),
|
|
},
|
|
InclusionSlots: []uint64{33, 34, 35},
|
|
InclusionDistances: []uint64{1, 2, 3},
|
|
CorrectlyVotedHead: []bool{true, true, true},
|
|
CorrectlyVotedSource: []bool{true, true, true},
|
|
CorrectlyVotedTarget: []bool{true, true, true},
|
|
},
|
|
{
|
|
PublicKeys: [][]byte{
|
|
bytesutil.FromBytes48(pubKeyBytes[0]),
|
|
bytesutil.FromBytes48(pubKeyBytes[1]),
|
|
bytesutil.FromBytes48(pubKeyBytes[2]),
|
|
},
|
|
InclusionSlots: []uint64{65, ^uint64(0), 67},
|
|
InclusionDistances: []uint64{1, 0, 2},
|
|
CorrectlyVotedHead: []bool{true, false, true},
|
|
CorrectlyVotedSource: []bool{true, false, true},
|
|
CorrectlyVotedTarget: []bool{false, false, true},
|
|
},
|
|
}
|
|
|
|
v.prevBalance[pubKeyBytes[0]] = uint64(33200000000)
|
|
v.prevBalance[pubKeyBytes[1]] = uint64(33300000000)
|
|
v.prevBalance[pubKeyBytes[2]] = uint64(31000000000)
|
|
|
|
var hook *logTest.Hook
|
|
|
|
for i, val := range responses {
|
|
if i == len(responses)-1 { // Handle last log.
|
|
hook = logTest.NewGlobal()
|
|
}
|
|
v.UpdateLogAggregateStats(val, uint64(32*(i+1)))
|
|
}
|
|
|
|
testutil.AssertLogsContain(t, hook, "msg=\"Previous epoch aggregated voting summary\" attestationInclusionPct=\"67%\" "+
|
|
"correctlyVotedHeadPct=\"100%\" correctlyVotedSourcePct=\"100%\" correctlyVotedTargetPct=\"50%\" epoch=2")
|
|
testutil.AssertLogsContain(t, hook, "msg=\"Vote summary since launch\" attestationsInclusionPct=\"78%\" "+
|
|
"averageInclusionDistance=\"2.29 slots\" correctlyVotedHeadPct=\"86%\" correctlyVotedSourcePct=\"100%\" "+
|
|
"correctlyVotedTargetPct=\"86%\" numberOfEpochs=3 pctChangeCombinedBalance=\"0.20555%\"")
|
|
|
|
}
|