Only return accepted blocks in GetStatelessBlock (ava-labs#1724)

fengq3784 · Jul 18, 2023 · cccba11 · cccba11
1 parent b9355c1
commit cccba11
Show file tree

Hide file tree

Showing 14 changed files with 91 additions and 93 deletions.
diff --git a/vms/platformvm/blocks/executor/backend.go b/vms/platformvm/blocks/executor/backend.go
@@ -68,9 +68,9 @@ func (b *backend) GetBlock(blkID ids.ID) (blocks.Block, error) {
 	if blk, ok := b.blkIDToState[blkID]; ok {
 		return blk.statelessBlock, nil
 	}
+
 	// The block isn't in memory. Check the database.
-	statelessBlk, _, err := b.state.GetStatelessBlock(blkID)
-	return statelessBlk, err
+	return b.state.GetStatelessBlock(blkID)
 }
 
 func (b *backend) LastAccepted() ids.ID {

diff --git a/vms/platformvm/blocks/executor/backend_test.go b/vms/platformvm/blocks/executor/backend_test.go
@@ -13,7 +13,6 @@ import (
 
 	"github.com/ava-labs/avalanchego/database"
 	"github.com/ava-labs/avalanchego/ids"
-	"github.com/ava-labs/avalanchego/snow/choices"
 	"github.com/ava-labs/avalanchego/vms/platformvm/blocks"
 	"github.com/ava-labs/avalanchego/vms/platformvm/state"
 )
@@ -98,15 +97,15 @@ func TestBackendGetBlock(t *testing.T) {
 	{
 		// Case: block isn't in the map or database.
 		blkID := ids.GenerateTestID()
-		state.EXPECT().GetStatelessBlock(blkID).Return(nil, choices.Unknown, database.ErrNotFound)
+		state.EXPECT().GetStatelessBlock(blkID).Return(nil, database.ErrNotFound)
 		_, err := b.GetBlock(blkID)
 		require.Equal(database.ErrNotFound, err)
 	}
 
 	{
 		// Case: block isn't in the map and is in database.
 		blkID := ids.GenerateTestID()
-		state.EXPECT().GetStatelessBlock(blkID).Return(statelessBlk, choices.Accepted, nil)
+		state.EXPECT().GetStatelessBlock(blkID).Return(statelessBlk, nil)
 		gotBlk, err := b.GetBlock(blkID)
 		require.NoError(err)
 		require.Equal(statelessBlk, gotBlk)

diff --git a/vms/platformvm/blocks/executor/block.go b/vms/platformvm/blocks/executor/block.go
@@ -58,10 +58,10 @@ func (b *Block) Status() choices.Status {
 		return choices.Processing
 	}
 	// Block isn't in memory. Check in the database.
-	_, status, err := b.manager.state.GetStatelessBlock(blkID)
+	_, err := b.manager.state.GetStatelessBlock(blkID)
 	switch err {
 	case nil:
-		return status
+		return choices.Accepted
 
 	case database.ErrNotFound:
 		// choices.Unknown means we don't have the bytes of the block.

diff --git a/vms/platformvm/blocks/executor/block_test.go b/vms/platformvm/blocks/executor/block_test.go
@@ -76,7 +76,7 @@ func TestStatus(t *testing.T) {
 				statelessBlk.EXPECT().ID().Return(blkID)
 
 				state := state.NewMockState(ctrl)
-				state.EXPECT().GetStatelessBlock(blkID).Return(statelessBlk, choices.Accepted, nil)
+				state.EXPECT().GetStatelessBlock(blkID).Return(statelessBlk, nil)
 
 				manager := &manager{
 					backend: &backend{
@@ -98,7 +98,7 @@ func TestStatus(t *testing.T) {
 				statelessBlk.EXPECT().ID().Return(blkID)
 
 				state := state.NewMockState(ctrl)
-				state.EXPECT().GetStatelessBlock(blkID).Return(nil, choices.Unknown, database.ErrNotFound)
+				state.EXPECT().GetStatelessBlock(blkID).Return(nil, database.ErrNotFound)
 
 				manager := &manager{
 					backend: &backend{

diff --git a/vms/platformvm/blocks/executor/manager_test.go b/vms/platformvm/blocks/executor/manager_test.go
@@ -12,7 +12,6 @@ import (
 
 	"github.com/ava-labs/avalanchego/database"
 	"github.com/ava-labs/avalanchego/ids"
-	"github.com/ava-labs/avalanchego/snow/choices"
 	"github.com/ava-labs/avalanchego/vms/platformvm/blocks"
 	"github.com/ava-labs/avalanchego/vms/platformvm/state"
 )
@@ -34,13 +33,13 @@ func TestGetBlock(t *testing.T) {
 
 	{
 		// Case: block isn't in memory or database
-		state.EXPECT().GetStatelessBlock(statelessBlk.ID()).Return(nil, choices.Unknown, database.ErrNotFound).Times(1)
+		state.EXPECT().GetStatelessBlock(statelessBlk.ID()).Return(nil, database.ErrNotFound).Times(1)
 		_, err := manager.GetBlock(statelessBlk.ID())
 		require.ErrorIs(err, database.ErrNotFound)
 	}
 	{
 		// Case: block isn't in memory but is in database.
-		state.EXPECT().GetStatelessBlock(statelessBlk.ID()).Return(statelessBlk, choices.Accepted, nil).Times(1)
+		state.EXPECT().GetStatelessBlock(statelessBlk.ID()).Return(statelessBlk, nil).Times(1)
 		gotBlk, err := manager.GetBlock(statelessBlk.ID())
 		require.NoError(err)
 		require.Equal(statelessBlk.ID(), gotBlk.ID())

diff --git a/vms/platformvm/blocks/executor/proposal_block_test.go b/vms/platformvm/blocks/executor/proposal_block_test.go
@@ -15,7 +15,6 @@ import (
 
 	"github.com/ava-labs/avalanchego/database"
 	"github.com/ava-labs/avalanchego/ids"
-	"github.com/ava-labs/avalanchego/snow/choices"
 	"github.com/ava-labs/avalanchego/snow/consensus/snowman"
 	"github.com/ava-labs/avalanchego/snow/validators"
 	"github.com/ava-labs/avalanchego/utils/constants"
@@ -183,11 +182,11 @@ func TestBanffProposalBlockTimeVerification(t *testing.T) {
 	env.blkManager.(*manager).lastAccepted = parentID
 	env.mockedState.EXPECT().GetLastAccepted().Return(parentID).AnyTimes()
 	env.mockedState.EXPECT().GetStatelessBlock(gomock.Any()).DoAndReturn(
-		func(blockID ids.ID) (blocks.Block, choices.Status, error) {
+		func(blockID ids.ID) (blocks.Block, error) {
 			if blockID == parentID {
-				return banffParentBlk, choices.Accepted, nil
+				return banffParentBlk, nil
 			}
-			return nil, choices.Rejected, database.ErrNotFound
+			return nil, database.ErrNotFound
 		}).AnyTimes()
 
 	// setup state to validate proposal block transaction
@@ -660,7 +659,7 @@ func TestBanffProposalBlockUpdateStakers(t *testing.T) {
 				// build proposal block moving ahead chain time
 				// as well as rewarding staker0
 				preferredID := env.state.GetLastAccepted()
-				parentBlk, _, err := env.state.GetStatelessBlock(preferredID)
+				parentBlk, err := env.state.GetStatelessBlock(preferredID)
 				require.NoError(err)
 				statelessProposalBlock, err := blocks.NewBanffProposalBlock(
 					newTime,
@@ -815,7 +814,7 @@ func TestBanffProposalBlockRemoveSubnetValidator(t *testing.T) {
 
 	// build proposal block moving ahead chain time
 	preferredID := env.state.GetLastAccepted()
-	parentBlk, _, err := env.state.GetStatelessBlock(preferredID)
+	parentBlk, err := env.state.GetStatelessBlock(preferredID)
 	require.NoError(err)
 	statelessProposalBlock, err := blocks.NewBanffProposalBlock(
 		subnetVdr1EndTime,
@@ -927,7 +926,7 @@ func TestBanffProposalBlockTrackedSubnet(t *testing.T) {
 
 			// build proposal block moving ahead chain time
 			preferredID := env.state.GetLastAccepted()
-			parentBlk, _, err := env.state.GetStatelessBlock(preferredID)
+			parentBlk, err := env.state.GetStatelessBlock(preferredID)
 			require.NoError(err)
 			statelessProposalBlock, err := blocks.NewBanffProposalBlock(
 				subnetVdr1StartTime,
@@ -1012,7 +1011,7 @@ func TestBanffProposalBlockDelegatorStakerWeight(t *testing.T) {
 
 	// build proposal block moving ahead chain time
 	preferredID := env.state.GetLastAccepted()
-	parentBlk, _, err := env.state.GetStatelessBlock(preferredID)
+	parentBlk, err := env.state.GetStatelessBlock(preferredID)
 	require.NoError(err)
 	statelessProposalBlock, err := blocks.NewBanffProposalBlock(
 		pendingValidatorStartTime,
@@ -1105,7 +1104,7 @@ func TestBanffProposalBlockDelegatorStakerWeight(t *testing.T) {
 
 	// Advance Time
 	preferredID = env.state.GetLastAccepted()
-	parentBlk, _, err = env.state.GetStatelessBlock(preferredID)
+	parentBlk, err = env.state.GetStatelessBlock(preferredID)
 	require.NoError(err)
 	statelessProposalBlock, err = blocks.NewBanffProposalBlock(
 		pendingDelegatorStartTime,
@@ -1196,7 +1195,7 @@ func TestBanffProposalBlockDelegatorStakers(t *testing.T) {
 
 	// build proposal block moving ahead chain time
 	preferredID := env.state.GetLastAccepted()
-	parentBlk, _, err := env.state.GetStatelessBlock(preferredID)
+	parentBlk, err := env.state.GetStatelessBlock(preferredID)
 	require.NoError(err)
 	statelessProposalBlock, err := blocks.NewBanffProposalBlock(
 		pendingValidatorStartTime,
@@ -1288,7 +1287,7 @@ func TestBanffProposalBlockDelegatorStakers(t *testing.T) {
 
 	// Advance Time
 	preferredID = env.state.GetLastAccepted()
-	parentBlk, _, err = env.state.GetStatelessBlock(preferredID)
+	parentBlk, err = env.state.GetStatelessBlock(preferredID)
 	require.NoError(err)
 	statelessProposalBlock, err = blocks.NewBanffProposalBlock(
 		pendingDelegatorStartTime,

diff --git a/vms/platformvm/blocks/executor/standard_block_test.go b/vms/platformvm/blocks/executor/standard_block_test.go
@@ -324,7 +324,7 @@ func TestBanffStandardBlockUpdatePrimaryNetworkStakers(t *testing.T) {
 
 	// build standard block moving ahead chain time
 	preferredID := env.state.GetLastAccepted()
-	parentBlk, _, err := env.state.GetStatelessBlock(preferredID)
+	parentBlk, err := env.state.GetStatelessBlock(preferredID)
 	require.NoError(err)
 	statelessStandardBlock, err := blocks.NewBanffStandardBlock(
 		pendingValidatorStartTime,
@@ -543,7 +543,7 @@ func TestBanffStandardBlockUpdateStakers(t *testing.T) {
 
 				// build standard block moving ahead chain time
 				preferredID := env.state.GetLastAccepted()
-				parentBlk, _, err := env.state.GetStatelessBlock(preferredID)
+				parentBlk, err := env.state.GetStatelessBlock(preferredID)
 				require.NoError(err)
 				statelessStandardBlock, err := blocks.NewBanffStandardBlock(
 					newTime,
@@ -659,7 +659,7 @@ func TestBanffStandardBlockRemoveSubnetValidator(t *testing.T) {
 	env.clk.Set(subnetVdr1EndTime)
 	// build standard block moving ahead chain time
 	preferredID := env.state.GetLastAccepted()
-	parentBlk, _, err := env.state.GetStatelessBlock(preferredID)
+	parentBlk, err := env.state.GetStatelessBlock(preferredID)
 	require.NoError(err)
 	statelessStandardBlock, err := blocks.NewBanffStandardBlock(
 		subnetVdr1EndTime,
@@ -731,7 +731,7 @@ func TestBanffStandardBlockTrackedSubnet(t *testing.T) {
 
 			// build standard block moving ahead chain time
 			preferredID := env.state.GetLastAccepted()
-			parentBlk, _, err := env.state.GetStatelessBlock(preferredID)
+			parentBlk, err := env.state.GetStatelessBlock(preferredID)
 			require.NoError(err)
 			statelessStandardBlock, err := blocks.NewBanffStandardBlock(
 				subnetVdr1StartTime,
@@ -776,7 +776,7 @@ func TestBanffStandardBlockDelegatorStakerWeight(t *testing.T) {
 
 	// build standard block moving ahead chain time
 	preferredID := env.state.GetLastAccepted()
-	parentBlk, _, err := env.state.GetStatelessBlock(preferredID)
+	parentBlk, err := env.state.GetStatelessBlock(preferredID)
 	require.NoError(err)
 	statelessStandardBlock, err := blocks.NewBanffStandardBlock(
 		pendingValidatorStartTime,
@@ -828,7 +828,7 @@ func TestBanffStandardBlockDelegatorStakerWeight(t *testing.T) {
 
 	// Advance Time
 	preferredID = env.state.GetLastAccepted()
-	parentBlk, _, err = env.state.GetStatelessBlock(preferredID)
+	parentBlk, err = env.state.GetStatelessBlock(preferredID)
 	require.NoError(err)
 	statelessStandardBlock, err = blocks.NewBanffStandardBlock(
 		pendingDelegatorStartTime,

diff --git a/vms/platformvm/blocks/executor/verifier_test.go b/vms/platformvm/blocks/executor/verifier_test.go
@@ -16,7 +16,6 @@ import (
 	"github.com/ava-labs/avalanchego/database"
 	"github.com/ava-labs/avalanchego/ids"
 	"github.com/ava-labs/avalanchego/snow"
-	"github.com/ava-labs/avalanchego/snow/choices"
 	"github.com/ava-labs/avalanchego/utils/logging"
 	"github.com/ava-labs/avalanchego/utils/set"
 	"github.com/ava-labs/avalanchego/utils/timer/mockable"
@@ -482,7 +481,7 @@ func TestVerifyUnverifiedParent(t *testing.T) {
 
 	// Set expectations for dependencies.
 	s.EXPECT().GetTimestamp().Return(time.Now()).Times(1)
-	s.EXPECT().GetStatelessBlock(parentID).Return(nil, choices.Unknown, database.ErrNotFound).Times(1)
+	s.EXPECT().GetStatelessBlock(parentID).Return(nil, database.ErrNotFound).Times(1)
 
 	// Verify the block.
 	err = blk.Visit(verifier)

diff --git a/vms/platformvm/state/mock_state.go b/vms/platformvm/state/mock_state.go