Fix proposervm.GetAncestors test flake (ava-labs#1572)

joshua-kim · Jun 2, 2023 · c2ff5ff · c2ff5ff
1 parent 842a6ab
commit c2ff5ff
Show file tree

Hide file tree

Showing 4 changed files with 118 additions and 125 deletions.
diff --git a/vms/platformvm/blocks/executor/proposal_block_test.go b/vms/platformvm/blocks/executor/proposal_block_test.go
@@ -113,9 +113,9 @@ func TestApricotProposalBlockTimeVerification(t *testing.T) {
 	onParentAccept.EXPECT().GetDelegateeReward(constants.PrimaryNetworkID, utx.NodeID()).Return(uint64(0), nil).AnyTimes()
 
 	env.mockedState.EXPECT().GetUptime(gomock.Any(), constants.PrimaryNetworkID).Return(
-		time.Duration(1000), /*upDuration*/
-		time.Time{},         /*lastUpdated*/
-		nil,                 /*err*/
+		time.Microsecond, /*upDuration*/
+		time.Time{},      /*lastUpdated*/
+		nil,              /*err*/
 	).AnyTimes()
 
 	// wrong height
@@ -240,9 +240,9 @@ func TestBanffProposalBlockTimeVerification(t *testing.T) {
 	onParentAccept.EXPECT().GetPendingStakerIterator().Return(pendingStakersIt, nil).AnyTimes()
 
 	env.mockedState.EXPECT().GetUptime(gomock.Any(), gomock.Any()).Return(
-		time.Duration(1000), /*upDuration*/
-		time.Time{},         /*lastUpdated*/
-		nil,                 /*err*/
+		time.Microsecond, /*upDuration*/
+		time.Time{},      /*lastUpdated*/
+		nil,              /*err*/
 	).AnyTimes()
 
 	// create proposal tx to be included in the proposal block

diff --git a/vms/platformvm/state/validator_metadata_test.go b/vms/platformvm/state/validator_metadata_test.go
@@ -218,7 +218,7 @@ func TestParseValidatorMetadata(t *testing.T) {
 				0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x86, 0xA0,
 			},
 			expected: &validatorMetadata{
-				UpDuration:      time.Duration(6000000),
+				UpDuration:      6000000,
 				LastUpdated:     900000,
 				PotentialReward: 100000,
 				lastUpdated:     time.Unix(900000, 0),
@@ -240,7 +240,7 @@ func TestParseValidatorMetadata(t *testing.T) {
 				0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4E, 0x20,
 			},
 			expected: &validatorMetadata{
-				UpDuration:               time.Duration(6000000),
+				UpDuration:               6000000,
 				LastUpdated:              900000,
 				PotentialReward:          100000,
 				PotentialDelegateeReward: 20000,

diff --git a/vms/platformvm/txs/executor/staker_tx_verification_test.go b/vms/platformvm/txs/executor/staker_tx_verification_test.go
@@ -640,8 +640,8 @@ func TestGetValidatorRules(t *testing.T) {
 				assetID:           customAssetID,
 				minValidatorStake: config.MinValidatorStake,
 				maxValidatorStake: config.MaxValidatorStake,
-				minStakeDuration:  time.Duration(1337) * time.Second,
-				maxStakeDuration:  time.Duration(42) * time.Second,
+				minStakeDuration:  1337 * time.Second,
+				maxStakeDuration:  42 * time.Second,
 				minDelegationFee:  config.MinDelegationFee,
 			},
 			expectedErr: nil,
@@ -760,8 +760,8 @@ func TestGetDelegatorRules(t *testing.T) {
 				assetID:                  customAssetID,
 				minDelegatorStake:        config.MinDelegatorStake,
 				maxValidatorStake:        config.MaxValidatorStake,
-				minStakeDuration:         time.Duration(1337) * time.Second,
-				maxStakeDuration:         time.Duration(42) * time.Second,
+				minStakeDuration:         1337 * time.Second,
+				maxStakeDuration:         42 * time.Second,
 				maxValidatorWeightFactor: 21,
 			},
 			expectedErr: nil,