Merge branch 'populate-subnet-public-key-diffs' into implement-acp-77…

…-sov-validators-state

.github/pull_request_template.md

@@ -3,3 +3,5 @@
 ## How this works
 
 ## How this was tested
+
+## Need to be documented in RELEASES.md?

vms/platformvm/state/state_test.go

@@ -251,9 +251,9 @@ func TestState_writeStakers(t *testing.T) {
 			expectedCurrentValidator:  primaryNetworkCurrentValidatorStaker,
 			expectedCurrentDelegators: []*Staker{primaryNetworkCurrentDelegatorStaker},
 			expectedValidatorSetOutput: &validators.GetValidatorOutput{
-				NodeID:    primaryNetworkCurrentDelegatorStaker.NodeID,
+				NodeID:    primaryNetworkCurrentValidatorStaker.NodeID,
 				PublicKey: primaryNetworkCurrentValidatorStaker.PublicKey,
-				Weight:    primaryNetworkCurrentDelegatorStaker.Weight + primaryNetworkCurrentValidatorStaker.Weight,
+				Weight:    primaryNetworkCurrentValidatorStaker.Weight + primaryNetworkCurrentDelegatorStaker.Weight,
 			},
 			expectedWeightDiff: &ValidatorWeightDiff{
 				Decrease: false,
@@ -775,14 +775,15 @@ func TestState_ApplyValidatorDiffs(t *testing.T) {
 		sk, err := bls.NewSecretKey()
 		require.NoError(err)
 
+		timeOffset := time.Duration(i) * time.Second
 		primaryStakers[i] = Staker{
 			TxID:            ids.GenerateTestID(),
 			NodeID:          ids.GenerateTestNodeID(),
 			PublicKey:       bls.PublicFromSecretKey(sk),
 			SubnetID:        constants.PrimaryNetworkID,
 			Weight:          uint64(i + 1),
-			StartTime:       startTime.Add(time.Duration(i) * time.Second),
-			EndTime:         endTime.Add(time.Duration(i) * time.Second),
+			StartTime:       startTime.Add(timeOffset),
+			EndTime:         endTime.Add(timeOffset),
 			PotentialReward: uint64(i + 1),
 		}
 	}

x/sync/sync_test.go

@@ -1078,6 +1078,8 @@ func Test_Sync_Result_Correct_Root_With_Sync_Restart(t *testing.T) {
 }
 
 func Test_Sync_Result_Correct_Root_Update_Root_During(t *testing.T) {
+	t.Skip("FLAKY")
+
 	require := require.New(t)
 
 	now := time.Now().UnixNano()