Skip to content

Commit

Permalink
fix more validator controller tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@MatusKysel
MatusKysel committed May 24, 2024
1 parent 41d0699 commit a926ea0
Showing 1 changed file with 95 additions and 87 deletions.
182 changes: 95 additions & 87 deletions operator/validator/controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@ import (
"github.com/ssvlabs/ssv/operator/validator/mocks"
"github.com/ssvlabs/ssv/operator/validators"
"github.com/ssvlabs/ssv/protocol/v2/blockchain/beacon"
"github.com/ssvlabs/ssv/protocol/v2/message"
"github.com/ssvlabs/ssv/protocol/v2/queue/worker"
"github.com/ssvlabs/ssv/protocol/v2/ssv/queue"
"github.com/ssvlabs/ssv/protocol/v2/ssv/runner"
"github.com/ssvlabs/ssv/protocol/v2/ssv/validator"
"github.com/ssvlabs/ssv/protocol/v2/types"
Expand All @@ -49,13 +51,12 @@ const (
// 1. a validator with a non-empty share and empty metadata - test a scenario if we cannot get metadata from beacon node

type MockControllerOptions struct {
network P2PNetwork
recipientsStorage Recipients
sharesStorage SharesStorage
metrics validator.Metrics
beacon beacon.BeaconNode
validatorOptions validator.Options
// keyManager spectypes.KeyManager
network P2PNetwork
recipientsStorage Recipients
sharesStorage SharesStorage
metrics validator.Metrics
beacon beacon.BeaconNode
validatorOptions validator.Options
signer spectypes.BeaconSigner
metadataLastUpdated map[spectypes.ValidatorPK]time.Time
StorageMap *ibftstorage.QBFTStores
Expand Down Expand Up @@ -207,69 +208,69 @@ func TestSetupNonCommitteeValidators(t *testing.T) {
}
}

// func TestHandleNonCommitteeMessages(t *testing.T) {
// logger := logging.TestLogger(t)
// mockValidatorsMap := validators.New(context.TODO())
// controllerOptions := MockControllerOptions{
// validatorsMap: mockValidatorsMap,
// }
// ctr := setupController(logger, controllerOptions) // none committee

// // Only exporter handles non committee messages
// ctr.validatorOptions.Exporter = true

// go ctr.handleRouterMessages()

// var wg sync.WaitGroup

// ctr.messageWorker.UseHandler(func(msg *queue.DecodedSSVMessage) error {
// wg.Done()
// return nil
// })

// wg.Add(2)

// identifier := spectypes.NewMsgID(networkconfig.TestNetwork.Domain, []byte("pk"), spectypes.BNRoleAttester)

// ctr.messageRouter.Route(context.TODO(), &queue.DecodedSSVMessage{
// SSVMessage: &spectypes.SSVMessage{
// MsgType: spectypes.SSVConsensusMsgType,
// MsgID: identifier,
// Data: generateDecidedMessage(t, identifier),
// },
// })

// ctr.messageRouter.Route(context.TODO(), &queue.DecodedSSVMessage{
// SSVMessage: &spectypes.SSVMessage{
// MsgType: spectypes.SSVConsensusMsgType,
// MsgID: identifier,
// Data: generateChangeRoundMsg(t, identifier),
// },
// })

// ctr.messageRouter.Route(context.TODO(), &queue.DecodedSSVMessage{
// SSVMessage: &spectypes.SSVMessage{ // checks that not process unnecessary message
// MsgType: message.SSVSyncMsgType,
// MsgID: identifier,
// Data: []byte("data"),
// },
// })

// ctr.messageRouter.Route(context.TODO(), &queue.DecodedSSVMessage{
// SSVMessage: &spectypes.SSVMessage{ // checks that not process unnecessary message
// MsgType: spectypes.SSVPartialSignatureMsgType,
// MsgID: identifier,
// Data: []byte("data"),
// },
// })

// go func() {
// time.Sleep(time.Second * 4)
// panic("time out!")
// }()

// wg.Wait()
// }
func TestHandleNonCommitteeMessages(t *testing.T) {
logger := logging.TestLogger(t)
mockValidatorsMap := validators.New(context.TODO())
controllerOptions := MockControllerOptions{
validatorsMap: mockValidatorsMap,
}
ctr := setupController(logger, controllerOptions) // none committee

// Only exporter handles non committee messages
ctr.validatorOptions.Exporter = true

go ctr.handleRouterMessages()

var wg sync.WaitGroup

ctr.messageWorker.UseHandler(func(msg *queue.DecodedSSVMessage) error {
wg.Done()
return nil
})

wg.Add(2)

identifier := spectypes.NewMsgID(networkconfig.TestNetwork.Domain, []byte("pk"), spectypes.RoleCommittee)

ctr.messageRouter.Route(context.TODO(), &queue.DecodedSSVMessage{
SSVMessage: &spectypes.SSVMessage{
MsgType: spectypes.SSVConsensusMsgType,
MsgID: identifier,
Data: generateDecidedMessage(t, identifier),
},
})

ctr.messageRouter.Route(context.TODO(), &queue.DecodedSSVMessage{
SSVMessage: &spectypes.SSVMessage{
MsgType: spectypes.SSVConsensusMsgType,
MsgID: identifier,
Data: generateChangeRoundMsg(t, identifier),
},
})

ctr.messageRouter.Route(context.TODO(), &queue.DecodedSSVMessage{
SSVMessage: &spectypes.SSVMessage{ // checks that not process unnecessary message
MsgType: message.SSVSyncMsgType,
MsgID: identifier,
Data: []byte("data"),
},
})

ctr.messageRouter.Route(context.TODO(), &queue.DecodedSSVMessage{
SSVMessage: &spectypes.SSVMessage{ // checks that not process unnecessary message
MsgType: spectypes.SSVPartialSignatureMsgType,
MsgID: identifier,
Data: []byte("data"),
},
})

go func() {
time.Sleep(time.Second * 4)
panic("time out!")
}()

wg.Wait()
}

func TestUpdateValidatorMetadata(t *testing.T) {

Expand Down Expand Up @@ -327,7 +328,6 @@ func TestUpdateValidatorMetadata(t *testing.T) {
testPublicKey spectypes.ValidatorPK
mockRecipientTimes int
}{
{"could not decode public key", validatorMetaData, true, nil, false, 1, spectypes.ValidatorPK([]byte("123")), 0},
{"Empty metadata", nil, true, nil, false, 1, spectypes.ValidatorPK(secretKey.GetPublicKey().Serialize()), 0},
{"Valid metadata", validatorMetaData, false, nil, false, 1, spectypes.ValidatorPK(secretKey.GetPublicKey().Serialize()), 0},
{"Share wasn't found", validatorMetaData, true, nil, true, 1, spectypes.ValidatorPK(secretKey.GetPublicKey().Serialize()), 0},
Expand Down Expand Up @@ -605,7 +605,7 @@ func TestSetupValidators(t *testing.T) {
}).AnyTimes()

testValidatorsMap := map[spectypes.ValidatorPK]*validator.Validator{
spectypes.ValidatorPK([]byte("0")): testValidator,
createPubKey(byte('0')): testValidator,
}
mockValidatorsMap := validators.New(context.TODO(), validators.WithInitialState(testValidatorsMap, nil))

Expand Down Expand Up @@ -650,7 +650,7 @@ func TestGetValidator(t *testing.T) {
}

testValidatorsMap := map[spectypes.ValidatorPK]*validator.Validator{
spectypes.ValidatorPK([]byte("0")): testValidator,
createPubKey(byte('0')): testValidator,
}
mockValidatorsMap := validators.New(context.TODO(), validators.WithInitialState(testValidatorsMap, nil))
// Set up the controller with mock data
Expand All @@ -660,9 +660,9 @@ func TestGetValidator(t *testing.T) {
ctr := setupController(logger, controllerOptions)

// Execute the function under test and validate results
_, found := ctr.GetValidator(spectypes.ValidatorPK([]byte("0")))
_, found := ctr.GetValidator(createPubKey(byte('0')))
require.True(t, found)
_, found = ctr.GetValidator(spectypes.ValidatorPK([]byte("1")))
_, found = ctr.GetValidator(createPubKey(byte('1')))
require.False(t, found)
}

Expand Down Expand Up @@ -891,7 +891,7 @@ func TestUpdateFeeRecipient(t *testing.T) {
testValidator := setupTestValidator(ownerAddressBytes, firstFeeRecipientBytes)

testValidatorsMap := map[spectypes.ValidatorPK]*validator.Validator{
spectypes.ValidatorPK([]byte("0")): testValidator,
createPubKey(byte('0')): testValidator,
}
mockValidatorsMap := validators.New(context.TODO(), validators.WithInitialState(testValidatorsMap, nil))

Expand All @@ -908,7 +908,7 @@ func TestUpdateFeeRecipient(t *testing.T) {
t.Run("Test with wrong owner address", func(t *testing.T) {
testValidator := setupTestValidator(ownerAddressBytes, firstFeeRecipientBytes)
testValidatorsMap := map[spectypes.ValidatorPK]*validator.Validator{
spectypes.ValidatorPK([]byte("0")): testValidator,
createPubKey(byte('0')): testValidator,
}
mockValidatorsMap := validators.New(context.TODO(), validators.WithInitialState(testValidatorsMap, nil))
controllerOptions := MockControllerOptions{validatorsMap: mockValidatorsMap}
Expand All @@ -926,63 +926,63 @@ func TestGetIndices(t *testing.T) {
farFutureEpoch := phase0.Epoch(99999)
currentEpoch := phase0.Epoch(100)
testValidatorsMap := map[spectypes.ValidatorPK]*validator.Validator{
spectypes.ValidatorPK([]byte("0")): newValidator(&beacon.ValidatorMetadata{
createPubKey(byte('0')): newValidator(&beacon.ValidatorMetadata{
Balance: 0,
Status: 0, // ValidatorStateUnknown
Index: 0,
ActivationEpoch: farFutureEpoch,
}),
spectypes.ValidatorPK([]byte("1")): newValidator(&beacon.ValidatorMetadata{
createPubKey(byte('1')): newValidator(&beacon.ValidatorMetadata{
Balance: 0,
Status: 1, // ValidatorStatePendingInitialized
Index: 0,
ActivationEpoch: farFutureEpoch,
}),
spectypes.ValidatorPK([]byte("2")): newValidator(&beacon.ValidatorMetadata{
createPubKey(byte('2')): newValidator(&beacon.ValidatorMetadata{
Balance: 0,
Status: 2, // ValidatorStatePendingQueued
Index: 3,
ActivationEpoch: phase0.Epoch(101),
}),

spectypes.ValidatorPK([]byte("3")): newValidator(&beacon.ValidatorMetadata{
createPubKey(byte('3')): newValidator(&beacon.ValidatorMetadata{
Balance: 0,
Status: 3, // ValidatorStateActiveOngoing
Index: 3,
ActivationEpoch: phase0.Epoch(100),
}),
spectypes.ValidatorPK([]byte("4")): newValidator(&beacon.ValidatorMetadata{
createPubKey(byte('4')): newValidator(&beacon.ValidatorMetadata{
Balance: 0,
Status: 4, // ValidatorStateActiveExiting
Index: 4,
ActivationEpoch: phase0.Epoch(100),
}),
spectypes.ValidatorPK([]byte("5")): newValidator(&beacon.ValidatorMetadata{
createPubKey(byte('5')): newValidator(&beacon.ValidatorMetadata{
Balance: 0,
Status: 5, // ValidatorStateActiveSlashed
Index: 5,
ActivationEpoch: phase0.Epoch(100),
}),

spectypes.ValidatorPK([]byte("6")): newValidator(&beacon.ValidatorMetadata{
createPubKey(byte('6')): newValidator(&beacon.ValidatorMetadata{
Balance: 0,
Status: 6, // ValidatorStateExitedUnslashed
Index: 6,
ActivationEpoch: phase0.Epoch(100),
}),
spectypes.ValidatorPK([]byte("7")): newValidator(&beacon.ValidatorMetadata{
createPubKey(byte('7')): newValidator(&beacon.ValidatorMetadata{
Balance: 0,
Status: 7, // ValidatorStateExitedSlashed
Index: 7,
ActivationEpoch: phase0.Epoch(100),
}),
spectypes.ValidatorPK([]byte("8")): newValidator(&beacon.ValidatorMetadata{
createPubKey(byte('8')): newValidator(&beacon.ValidatorMetadata{
Balance: 0,
Status: 8, // ValidatorStateWithdrawalPossible
Index: 8,
ActivationEpoch: phase0.Epoch(100),
}),
spectypes.ValidatorPK([]byte("9")): newValidator(&beacon.ValidatorMetadata{
createPubKey(byte('9')): newValidator(&beacon.ValidatorMetadata{
Balance: 0,
Status: 9, // ValidatorStateWithdrawalDone
Index: 9,
Expand Down Expand Up @@ -1186,3 +1186,11 @@ func buildOperators(t *testing.T) []*spectypes.ShareMember {
}
return operators
}

func createPubKey(input byte) spectypes.ValidatorPK {
var byteArray [48]byte
for i := range byteArray {
byteArray[i] = input
}
return byteArray
}

0 comments on commit a926ea0

Please sign in to comment.