From c2ff5ff8dbb832cb7cff0dce3f282c7aa6528844 Mon Sep 17 00:00:00 2001 From: Stephen Buttolph Date: Fri, 2 Jun 2023 12:55:10 -0400 Subject: [PATCH] Fix proposervm.GetAncestors test flake (#1572) --- .../blocks/executor/proposal_block_test.go | 12 +- .../state/validator_metadata_test.go | 4 +- .../executor/staker_tx_verification_test.go | 8 +- vms/proposervm/batched_vm_test.go | 219 +++++++++--------- 4 files changed, 118 insertions(+), 125 deletions(-) diff --git a/vms/platformvm/blocks/executor/proposal_block_test.go b/vms/platformvm/blocks/executor/proposal_block_test.go index caa93b195245..054678b1bf72 100644 --- 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 index 15fa19649528..22b7e0313e5a 100644 --- 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 index 2f32fee48c15..300b56f027f7 100644 --- 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, diff --git a/vms/proposervm/batched_vm_test.go b/vms/proposervm/batched_vm_test.go index 70e462cffed0..f07c956ab111 100644 --- a/vms/proposervm/batched_vm_test.go +++ b/vms/proposervm/batched_vm_test.go @@ -32,9 +32,9 @@ func TestCoreVMNotRemote(t *testing.T) { _, _, proVM, _, _ := initTestProposerVM(t, time.Time{}, 0) // enable ProBlks blkID := ids.Empty - maxBlocksNum := 1000 // an high value to get all built blocks - maxBlocksSize := 1000000 // an high value to get all built blocks - maxBlocksRetrivalTime := time.Duration(1000000) // an high value to get all built blocks + maxBlocksNum := 1000 // a high value to get all built blocks + maxBlocksSize := 1000000 // a high value to get all built blocks + maxBlocksRetrivalTime := time.Hour // a high value to get all built blocks _, err := proVM.GetAncestors( context.Background(), blkID, @@ -56,7 +56,7 @@ func TestGetAncestorsPreForkOnly(t *testing.T) { // Build some prefork blocks.... coreBlk1 := &snowman.TestBlock{ TestDecidable: choices.TestDecidable{ - IDV: ids.Empty.Prefix(111), + IDV: ids.GenerateTestID(), StatusV: choices.Processing, }, BytesV: []byte{1}, @@ -68,7 +68,7 @@ func TestGetAncestorsPreForkOnly(t *testing.T) { return coreBlk1, nil } builtBlk1, err := proRemoteVM.BuildBlock(context.Background()) - require.NoError(err, "Could not build preFork block") + require.NoError(err) // prepare build of next block require.NoError(proRemoteVM.SetPreference(context.Background(), builtBlk1.ID())) @@ -83,7 +83,7 @@ func TestGetAncestorsPreForkOnly(t *testing.T) { coreBlk2 := &snowman.TestBlock{ TestDecidable: choices.TestDecidable{ - IDV: ids.Empty.Prefix(222), + IDV: ids.GenerateTestID(), StatusV: choices.Processing, }, BytesV: []byte{2}, @@ -95,7 +95,7 @@ func TestGetAncestorsPreForkOnly(t *testing.T) { return coreBlk2, nil } builtBlk2, err := proRemoteVM.BuildBlock(context.Background()) - require.NoError(err, "Could not build proposer block") + require.NoError(err) // prepare build of next block require.NoError(proRemoteVM.SetPreference(context.Background(), builtBlk2.ID())) @@ -110,7 +110,7 @@ func TestGetAncestorsPreForkOnly(t *testing.T) { coreBlk3 := &snowman.TestBlock{ TestDecidable: choices.TestDecidable{ - IDV: ids.Empty.Prefix(222), + IDV: ids.GenerateTestID(), StatusV: choices.Processing, }, BytesV: []byte{3}, @@ -122,7 +122,7 @@ func TestGetAncestorsPreForkOnly(t *testing.T) { return coreBlk3, nil } builtBlk3, err := proRemoteVM.BuildBlock(context.Background()) - require.NoError(err, "Could not build proposer block") + require.NoError(err) // ...Call GetAncestors on them ... // Note: we assumed that if blkID is not known, that's NOT an error. @@ -148,9 +148,9 @@ func TestGetAncestorsPreForkOnly(t *testing.T) { } reqBlkID := builtBlk3.ID() - maxBlocksNum := 1000 // an high value to get all built blocks - maxBlocksSize := 1000000 // an high value to get all built blocks - maxBlocksRetrivalTime := time.Duration(1000000) // an high value to get all built blocks + maxBlocksNum := 1000 // a high value to get all built blocks + maxBlocksSize := 1000000 // a high value to get all built blocks + maxBlocksRetrivalTime := time.Hour // a high value to get all built blocks res, err := proRemoteVM.GetAncestors( context.Background(), reqBlkID, @@ -160,11 +160,11 @@ func TestGetAncestorsPreForkOnly(t *testing.T) { ) // ... and check returned values are as expected - require.NoError(err, "Error calling GetAncestors: %v", err) - require.Len(res, 3, "GetAncestor returned %v entries instead of %v", len(res), 3) - require.Equal(res[0], builtBlk3.Bytes()) - require.Equal(res[1], builtBlk2.Bytes()) - require.Equal(res[2], builtBlk1.Bytes()) + require.NoError(err) + require.Len(res, 3) + require.Equal(builtBlk3.Bytes(), res[0]) + require.Equal(builtBlk2.Bytes(), res[1]) + require.Equal(builtBlk1.Bytes(), res[2]) // another good call reqBlkID = builtBlk1.ID() @@ -175,9 +175,9 @@ func TestGetAncestorsPreForkOnly(t *testing.T) { maxBlocksSize, maxBlocksRetrivalTime, ) - require.NoError(err, "Error calling GetAncestors: %v", err) - require.Len(res, 1, "GetAncestor returned %v entries instead of %v", len(res), 1) - require.Equal(res[0], builtBlk1.Bytes()) + require.NoError(err) + require.Len(res, 1) + require.Equal(builtBlk1.Bytes(), res[0]) // a faulty call reqBlkID = ids.Empty @@ -188,8 +188,8 @@ func TestGetAncestorsPreForkOnly(t *testing.T) { maxBlocksSize, maxBlocksRetrivalTime, ) - require.NoError(err, "Error calling GetAncestors: %v", err) - require.Empty(res, "GetAncestor returned %v entries instead of %v", len(res), 0) + require.NoError(err) + require.Empty(res) } func TestGetAncestorsPostForkOnly(t *testing.T) { @@ -199,7 +199,7 @@ func TestGetAncestorsPostForkOnly(t *testing.T) { // Build some post-Fork blocks.... coreBlk1 := &snowman.TestBlock{ TestDecidable: choices.TestDecidable{ - IDV: ids.Empty.Prefix(111), + IDV: ids.GenerateTestID(), StatusV: choices.Processing, }, BytesV: []byte{1}, @@ -211,7 +211,7 @@ func TestGetAncestorsPostForkOnly(t *testing.T) { return coreBlk1, nil } builtBlk1, err := proRemoteVM.BuildBlock(context.Background()) - require.NoError(err, "Could not build preFork block") + require.NoError(err) // prepare build of next block require.NoError(builtBlk1.Verify(context.Background())) @@ -220,7 +220,7 @@ func TestGetAncestorsPostForkOnly(t *testing.T) { coreBlk2 := &snowman.TestBlock{ TestDecidable: choices.TestDecidable{ - IDV: ids.Empty.Prefix(222), + IDV: ids.GenerateTestID(), StatusV: choices.Processing, }, BytesV: []byte{2}, @@ -232,7 +232,7 @@ func TestGetAncestorsPostForkOnly(t *testing.T) { return coreBlk2, nil } builtBlk2, err := proRemoteVM.BuildBlock(context.Background()) - require.NoError(err, "Could not build proposer block") + require.NoError(err) // prepare build of next block require.NoError(builtBlk2.Verify(context.Background())) @@ -241,7 +241,7 @@ func TestGetAncestorsPostForkOnly(t *testing.T) { coreBlk3 := &snowman.TestBlock{ TestDecidable: choices.TestDecidable{ - IDV: ids.Empty.Prefix(333), + IDV: ids.GenerateTestID(), StatusV: choices.Processing, }, BytesV: []byte{3}, @@ -253,7 +253,7 @@ func TestGetAncestorsPostForkOnly(t *testing.T) { return coreBlk3, nil } builtBlk3, err := proRemoteVM.BuildBlock(context.Background()) - require.NoError(err, "Could not build proposer block") + require.NoError(err) require.NoError(builtBlk3.Verify(context.Background())) require.NoError(proRemoteVM.SetPreference(context.Background(), builtBlk3.ID())) @@ -297,9 +297,9 @@ func TestGetAncestorsPostForkOnly(t *testing.T) { } reqBlkID := builtBlk3.ID() - maxBlocksNum := 1000 // an high value to get all built blocks - maxBlocksSize := 1000000 // an high value to get all built blocks - maxBlocksRetrivalTime := time.Duration(1000000) // an high value to get all built blocks + maxBlocksNum := 1000 // a high value to get all built blocks + maxBlocksSize := 1000000 // a high value to get all built blocks + maxBlocksRetrivalTime := time.Hour // a high value to get all built blocks res, err := proRemoteVM.GetAncestors( context.Background(), reqBlkID, @@ -309,11 +309,11 @@ func TestGetAncestorsPostForkOnly(t *testing.T) { ) // ... and check returned values are as expected - require.NoError(err, "Error calling GetAncestors: %v", err) + require.NoError(err) require.Len(res, 3) - require.Equal(res[0], builtBlk3.Bytes()) - require.Equal(res[1], builtBlk2.Bytes()) - require.Equal(res[2], builtBlk1.Bytes()) + require.Equal(builtBlk3.Bytes(), res[0]) + require.Equal(builtBlk2.Bytes(), res[1]) + require.Equal(builtBlk1.Bytes(), res[2]) // another good call reqBlkID = builtBlk1.ID() @@ -324,9 +324,9 @@ func TestGetAncestorsPostForkOnly(t *testing.T) { maxBlocksSize, maxBlocksRetrivalTime, ) - require.NoError(err, "Error calling GetAncestors: %v", err) - require.Len(res, 1, "GetAncestor returned %v entries instead of %v", len(res), 1) - require.Equal(res[0], builtBlk1.Bytes()) + require.NoError(err) + require.Len(res, 1) + require.Equal(builtBlk1.Bytes(), res[0]) // a faulty call reqBlkID = ids.Empty @@ -337,8 +337,8 @@ func TestGetAncestorsPostForkOnly(t *testing.T) { maxBlocksSize, maxBlocksRetrivalTime, ) - require.NoError(err, "Error calling GetAncestors: %v", err) - require.Empty(res, "GetAncestor returned %v entries instead of %v", len(res), 0) + require.NoError(err) + require.Empty(res) } func TestGetAncestorsAtSnomanPlusPlusFork(t *testing.T) { @@ -354,7 +354,7 @@ func TestGetAncestorsAtSnomanPlusPlusFork(t *testing.T) { proRemoteVM.Set(preForkTime) coreBlk1 := &snowman.TestBlock{ TestDecidable: choices.TestDecidable{ - IDV: ids.Empty.Prefix(111), + IDV: ids.GenerateTestID(), StatusV: choices.Processing, }, BytesV: []byte{1}, @@ -366,7 +366,7 @@ func TestGetAncestorsAtSnomanPlusPlusFork(t *testing.T) { return coreBlk1, nil } builtBlk1, err := proRemoteVM.BuildBlock(context.Background()) - require.NoError(err, "Could not build preFork block") + require.NoError(err) require.IsType(&preForkBlock{}, builtBlk1) // prepare build of next block @@ -382,7 +382,7 @@ func TestGetAncestorsAtSnomanPlusPlusFork(t *testing.T) { coreBlk2 := &snowman.TestBlock{ TestDecidable: choices.TestDecidable{ - IDV: ids.Empty.Prefix(222), + IDV: ids.GenerateTestID(), StatusV: choices.Processing, }, BytesV: []byte{2}, @@ -394,7 +394,7 @@ func TestGetAncestorsAtSnomanPlusPlusFork(t *testing.T) { return coreBlk2, nil } builtBlk2, err := proRemoteVM.BuildBlock(context.Background()) - require.NoError(err, "Could not build proposer block") + require.NoError(err) require.IsType(&preForkBlock{}, builtBlk2) // prepare build of next block @@ -412,7 +412,7 @@ func TestGetAncestorsAtSnomanPlusPlusFork(t *testing.T) { proRemoteVM.Set(postForkTime) coreBlk3 := &snowman.TestBlock{ TestDecidable: choices.TestDecidable{ - IDV: ids.Empty.Prefix(333), + IDV: ids.GenerateTestID(), StatusV: choices.Processing, }, BytesV: []byte{3}, @@ -424,7 +424,7 @@ func TestGetAncestorsAtSnomanPlusPlusFork(t *testing.T) { return coreBlk3, nil } builtBlk3, err := proRemoteVM.BuildBlock(context.Background()) - require.NoError(err, "Could not build proposer block") + require.NoError(err) require.IsType(&postForkBlock{}, builtBlk3) // prepare build of next block @@ -434,7 +434,7 @@ func TestGetAncestorsAtSnomanPlusPlusFork(t *testing.T) { coreBlk4 := &snowman.TestBlock{ TestDecidable: choices.TestDecidable{ - IDV: ids.Empty.Prefix(444), + IDV: ids.GenerateTestID(), StatusV: choices.Processing, }, BytesV: []byte{4}, @@ -446,7 +446,7 @@ func TestGetAncestorsAtSnomanPlusPlusFork(t *testing.T) { return coreBlk4, nil } builtBlk4, err := proRemoteVM.BuildBlock(context.Background()) - require.NoError(err, "Could not build proposer block") + require.NoError(err) require.IsType(&postForkBlock{}, builtBlk4) require.NoError(builtBlk4.Verify(context.Background())) @@ -492,12 +492,12 @@ func TestGetAncestorsAtSnomanPlusPlusFork(t *testing.T) { ) // ... and check returned values are as expected - require.NoError(err, "Error calling GetAncestors") - require.Len(res, 4, "Wrong GetAncestor response") - require.Equal(res[0], builtBlk4.Bytes()) - require.Equal(res[1], builtBlk3.Bytes()) - require.Equal(res[2], builtBlk2.Bytes()) - require.Equal(res[3], builtBlk1.Bytes()) + require.NoError(err) + require.Len(res, 4) + require.Equal(builtBlk4.Bytes(), res[0]) + require.Equal(builtBlk3.Bytes(), res[1]) + require.Equal(builtBlk2.Bytes(), res[2]) + require.Equal(builtBlk1.Bytes(), res[3]) // Regression case: load some prefork and some postfork blocks. reqBlkID = builtBlk4.ID() @@ -511,11 +511,11 @@ func TestGetAncestorsAtSnomanPlusPlusFork(t *testing.T) { ) // ... and check returned values are as expected - require.NoError(err, "Error calling GetAncestors") - require.Len(res, 3, "Wrong GetAncestor response") - require.Equal(res[0], builtBlk4.Bytes()) - require.Equal(res[1], builtBlk3.Bytes()) - require.Equal(res[2], builtBlk2.Bytes()) + require.NoError(err) + require.Len(res, 3) + require.Equal(builtBlk4.Bytes(), res[0]) + require.Equal(builtBlk3.Bytes(), res[1]) + require.Equal(builtBlk2.Bytes(), res[2]) // another good call reqBlkID = builtBlk1.ID() @@ -526,9 +526,9 @@ func TestGetAncestorsAtSnomanPlusPlusFork(t *testing.T) { maxBlocksSize, maxBlocksRetrivalTime, ) - require.NoError(err, "Error calling GetAncestors") - require.Len(res, 1, "Wrong GetAncestor response") - require.Equal(res[0], builtBlk1.Bytes()) + require.NoError(err) + require.Len(res, 1) + require.Equal(builtBlk1.Bytes(), res[0]) // a faulty call reqBlkID = ids.Empty @@ -539,8 +539,8 @@ func TestGetAncestorsAtSnomanPlusPlusFork(t *testing.T) { maxBlocksSize, maxBlocksRetrivalTime, ) - require.NoError(err, "Error calling GetAncestors") - require.Empty(res, "Wrong GetAncestor response") + require.NoError(err) + require.Empty(res) } func TestBatchedParseBlockPreForkOnly(t *testing.T) { @@ -550,7 +550,7 @@ func TestBatchedParseBlockPreForkOnly(t *testing.T) { // Build some prefork blocks.... coreBlk1 := &snowman.TestBlock{ TestDecidable: choices.TestDecidable{ - IDV: ids.Empty.Prefix(111), + IDV: ids.GenerateTestID(), StatusV: choices.Processing, }, BytesV: []byte{1}, @@ -562,7 +562,7 @@ func TestBatchedParseBlockPreForkOnly(t *testing.T) { return coreBlk1, nil } builtBlk1, err := proRemoteVM.BuildBlock(context.Background()) - require.NoError(err, "Could not build preFork block") + require.NoError(err) // prepare build of next block require.NoError(proRemoteVM.SetPreference(context.Background(), builtBlk1.ID())) @@ -577,7 +577,7 @@ func TestBatchedParseBlockPreForkOnly(t *testing.T) { coreBlk2 := &snowman.TestBlock{ TestDecidable: choices.TestDecidable{ - IDV: ids.Empty.Prefix(222), + IDV: ids.GenerateTestID(), StatusV: choices.Processing, }, BytesV: []byte{2}, @@ -589,7 +589,7 @@ func TestBatchedParseBlockPreForkOnly(t *testing.T) { return coreBlk2, nil } builtBlk2, err := proRemoteVM.BuildBlock(context.Background()) - require.NoError(err, "Could not build proposer block") + require.NoError(err) // prepare build of next block require.NoError(proRemoteVM.SetPreference(context.Background(), builtBlk2.ID())) @@ -604,7 +604,7 @@ func TestBatchedParseBlockPreForkOnly(t *testing.T) { coreBlk3 := &snowman.TestBlock{ TestDecidable: choices.TestDecidable{ - IDV: ids.Empty.Prefix(222), + IDV: ids.GenerateTestID(), StatusV: choices.Processing, }, BytesV: []byte{3}, @@ -616,7 +616,7 @@ func TestBatchedParseBlockPreForkOnly(t *testing.T) { return coreBlk3, nil } builtBlk3, err := proRemoteVM.BuildBlock(context.Background()) - require.NoError(err, "Could not build proposer block") + require.NoError(err) coreVM.ParseBlockF = func(_ context.Context, b []byte) (snowman.Block, error) { switch { @@ -654,11 +654,11 @@ func TestBatchedParseBlockPreForkOnly(t *testing.T) { builtBlk3.Bytes(), } res, err := proRemoteVM.BatchedParseBlock(context.Background(), bytesToParse) - require.NoError(err, "Error calling BatchedParseBlock: %v", err) - require.Len(res, 3, "BatchedParseBlock returned %v entries instead of %v", len(res), 3) - require.Equal(res[0].ID(), builtBlk1.ID()) - require.Equal(res[1].ID(), builtBlk2.ID()) - require.Equal(res[2].ID(), builtBlk3.ID()) + require.NoError(err) + require.Len(res, 3) + require.Equal(builtBlk1.ID(), res[0].ID()) + require.Equal(builtBlk2.ID(), res[1].ID()) + require.Equal(builtBlk3.ID(), res[2].ID()) } func TestBatchedParseBlockPostForkOnly(t *testing.T) { @@ -668,7 +668,7 @@ func TestBatchedParseBlockPostForkOnly(t *testing.T) { // Build some post-Fork blocks.... coreBlk1 := &snowman.TestBlock{ TestDecidable: choices.TestDecidable{ - IDV: ids.Empty.Prefix(111), + IDV: ids.GenerateTestID(), StatusV: choices.Processing, }, BytesV: []byte{1}, @@ -680,7 +680,7 @@ func TestBatchedParseBlockPostForkOnly(t *testing.T) { return coreBlk1, nil } builtBlk1, err := proRemoteVM.BuildBlock(context.Background()) - require.NoError(err, "Could not build preFork block") + require.NoError(err) // prepare build of next block require.NoError(builtBlk1.Verify(context.Background())) @@ -689,7 +689,7 @@ func TestBatchedParseBlockPostForkOnly(t *testing.T) { coreBlk2 := &snowman.TestBlock{ TestDecidable: choices.TestDecidable{ - IDV: ids.Empty.Prefix(222), + IDV: ids.GenerateTestID(), StatusV: choices.Processing, }, BytesV: []byte{2}, @@ -701,7 +701,7 @@ func TestBatchedParseBlockPostForkOnly(t *testing.T) { return coreBlk2, nil } builtBlk2, err := proRemoteVM.BuildBlock(context.Background()) - require.NoError(err, "Could not build proposer block") + require.NoError(err) // prepare build of next block require.NoError(builtBlk2.Verify(context.Background())) @@ -710,7 +710,7 @@ func TestBatchedParseBlockPostForkOnly(t *testing.T) { coreBlk3 := &snowman.TestBlock{ TestDecidable: choices.TestDecidable{ - IDV: ids.Empty.Prefix(333), + IDV: ids.GenerateTestID(), StatusV: choices.Processing, }, BytesV: []byte{3}, @@ -722,7 +722,7 @@ func TestBatchedParseBlockPostForkOnly(t *testing.T) { return coreBlk3, nil } builtBlk3, err := proRemoteVM.BuildBlock(context.Background()) - require.NoError(err, "Could not build proposer block") + require.NoError(err) coreVM.ParseBlockF = func(_ context.Context, b []byte) (snowman.Block, error) { switch { @@ -760,11 +760,11 @@ func TestBatchedParseBlockPostForkOnly(t *testing.T) { builtBlk3.Bytes(), } res, err := proRemoteVM.BatchedParseBlock(context.Background(), bytesToParse) - require.NoError(err, "Error calling BatchedParseBlock: %v", err) - require.Len(res, 3, "BatchedParseBlock returned %v entries instead of %v", len(res), 3) - require.Equal(res[0].ID(), builtBlk1.ID()) - require.Equal(res[1].ID(), builtBlk2.ID()) - require.Equal(res[2].ID(), builtBlk3.ID()) + require.NoError(err) + require.Len(res, 3) + require.Equal(builtBlk1.ID(), res[0].ID()) + require.Equal(builtBlk2.ID(), res[1].ID()) + require.Equal(builtBlk3.ID(), res[2].ID()) } func TestBatchedParseBlockAtSnomanPlusPlusFork(t *testing.T) { @@ -780,7 +780,7 @@ func TestBatchedParseBlockAtSnomanPlusPlusFork(t *testing.T) { proRemoteVM.Set(preForkTime) coreBlk1 := &snowman.TestBlock{ TestDecidable: choices.TestDecidable{ - IDV: ids.Empty.Prefix(111), + IDV: ids.GenerateTestID(), StatusV: choices.Processing, }, BytesV: []byte{1}, @@ -792,7 +792,7 @@ func TestBatchedParseBlockAtSnomanPlusPlusFork(t *testing.T) { return coreBlk1, nil } builtBlk1, err := proRemoteVM.BuildBlock(context.Background()) - require.NoError(err, "Could not build preFork block") + require.NoError(err) require.IsType(&preForkBlock{}, builtBlk1) // prepare build of next block @@ -808,7 +808,7 @@ func TestBatchedParseBlockAtSnomanPlusPlusFork(t *testing.T) { coreBlk2 := &snowman.TestBlock{ TestDecidable: choices.TestDecidable{ - IDV: ids.Empty.Prefix(222), + IDV: ids.GenerateTestID(), StatusV: choices.Processing, }, BytesV: []byte{2}, @@ -820,7 +820,7 @@ func TestBatchedParseBlockAtSnomanPlusPlusFork(t *testing.T) { return coreBlk2, nil } builtBlk2, err := proRemoteVM.BuildBlock(context.Background()) - require.NoError(err, "Could not build proposer block") + require.NoError(err) require.IsType(&preForkBlock{}, builtBlk2) // prepare build of next block @@ -838,7 +838,7 @@ func TestBatchedParseBlockAtSnomanPlusPlusFork(t *testing.T) { proRemoteVM.Set(postForkTime) coreBlk3 := &snowman.TestBlock{ TestDecidable: choices.TestDecidable{ - IDV: ids.Empty.Prefix(333), + IDV: ids.GenerateTestID(), StatusV: choices.Processing, }, BytesV: []byte{3}, @@ -850,7 +850,7 @@ func TestBatchedParseBlockAtSnomanPlusPlusFork(t *testing.T) { return coreBlk3, nil } builtBlk3, err := proRemoteVM.BuildBlock(context.Background()) - require.NoError(err, "Could not build proposer block") + require.NoError(err) require.IsType(&postForkBlock{}, builtBlk3) // prepare build of next block @@ -860,7 +860,7 @@ func TestBatchedParseBlockAtSnomanPlusPlusFork(t *testing.T) { coreBlk4 := &snowman.TestBlock{ TestDecidable: choices.TestDecidable{ - IDV: ids.Empty.Prefix(444), + IDV: ids.GenerateTestID(), StatusV: choices.Processing, }, BytesV: []byte{4}, @@ -872,7 +872,7 @@ func TestBatchedParseBlockAtSnomanPlusPlusFork(t *testing.T) { return coreBlk4, nil } builtBlk4, err := proRemoteVM.BuildBlock(context.Background()) - require.NoError(err, "Could not build proposer block") + require.NoError(err) require.IsType(&postForkBlock{}, builtBlk4) require.NoError(builtBlk4.Verify(context.Background())) @@ -918,12 +918,12 @@ func TestBatchedParseBlockAtSnomanPlusPlusFork(t *testing.T) { } res, err := proRemoteVM.BatchedParseBlock(context.Background(), bytesToParse) - require.NoError(err, "Error calling BatchedParseBlock: %v", err) - require.Len(res, 4, "BatchedParseBlock returned %v entries instead of %v", len(res), 4) - require.Equal(res[0].ID(), builtBlk4.ID()) - require.Equal(res[1].ID(), builtBlk3.ID()) - require.Equal(res[2].ID(), builtBlk2.ID()) - require.Equal(res[3].ID(), builtBlk1.ID()) + require.NoError(err) + require.Len(res, 4) + require.Equal(builtBlk4.ID(), res[0].ID()) + require.Equal(builtBlk3.ID(), res[1].ID()) + require.Equal(builtBlk2.ID(), res[2].ID()) + require.Equal(builtBlk1.ID(), res[3].ID()) } type TestRemoteProposerVM struct { @@ -939,6 +939,8 @@ func initTestRemoteProposerVM( *VM, *snowman.TestBlock, ) { + require := require.New(t) + coreGenBlk := &snowman.TestBlock{ TestDecidable: choices.TestDecidable{ IDV: ids.GenerateTestID(), @@ -1036,7 +1038,7 @@ func initTestRemoteProposerVM( dummyDBManager := manager.NewMemDB(version.Semantic1_0_0) // make sure that DBs are compressed correctly dummyDBManager = dummyDBManager.NewPrefixDBManager([]byte{}) - err := proVM.Initialize( + require.NoError(proVM.Initialize( context.Background(), ctx, dummyDBManager, @@ -1046,21 +1048,12 @@ func initTestRemoteProposerVM( nil, nil, nil, - ) - if err != nil { - t.Fatalf("failed to initialize proposerVM with %s", err) - } + )) // Initialize shouldn't be called again coreVM.InitializeF = nil - if err := proVM.SetState(context.Background(), snow.NormalOp); err != nil { - t.Fatal(err) - } - - if err := proVM.SetPreference(context.Background(), coreGenBlk.IDV); err != nil { - t.Fatal(err) - } - + require.NoError(proVM.SetState(context.Background(), snow.NormalOp)) + require.NoError(proVM.SetPreference(context.Background(), coreGenBlk.IDV)) return coreVM, proVM, coreGenBlk }