Merge #4120

4120: rm ExecutionStateSyncRequest/ExecutionStateDelta r=pattyshack a=pattyshack

It's dead code that only lives in tests

Co-authored-by: Patrick Lee <[email protected]>

Author: bors[bot]

cmd/execution/README.md

@@ -68,11 +68,6 @@ required to trigger this condition is put in place to prevent triggering it in c
 happen on unstable networks.
 EN keeps track of the highest block it has executed. This is not a Flow protocol feature, and only serves synchronisation needs.
 
-### Execution State syncing
-Other execution node is queried for range of missing blocks and hold authority to decide if it's willing (and able) to answer this query.
-If so, it sends the `ExecutionStateDelta` which contains all the block data and results of execution.
-Currently, this is fully trusted operation, meaning data is applied as-is without any extra checks.
-
 ### Missing blocks
 If no other EN are available, the block-level synchronisation is started. This requests blocks from consensus nodes, and
 incoming blocks are processed as if they were received during normal mode of operation

engine/execution/execution_test.go

@@ -581,39 +581,3 @@ func TestBroadcastToMultipleVerificationNodes(t *testing.T) {
 
 	verificationEngine.AssertExpectations(t)
 }
-
-// Test that when received the same state delta for the second time,
-// the delta will be saved again without causing any error.
-// func TestReceiveTheSameDeltaMultipleTimes(t *testing.T) {
-// 	hub := stub.NewNetworkHub()
-//
-// 	chainID := flow.Mainnet
-//
-// 	colID := unittest.IdentityFixture(unittest.WithRole(flow.RoleCollection))
-// 	exeID := unittest.IdentityFixture(unittest.WithRole(flow.RoleExecution))
-// 	ver1ID := unittest.IdentityFixture(unittest.WithRole(flow.RoleVerification))
-// 	ver2ID := unittest.IdentityFixture(unittest.WithRole(flow.RoleVerification))
-//
-// 	identities := unittest.CompleteIdentitySet(colID, exeID, ver1ID, ver2ID)
-//
-// 	exeNode := testutil.ExecutionNode(t, hub, exeID, identities, 21, chainID)
-// 	defer exeNode.Done()
-//
-// 	genesis, err := exeNode.State.AtHeight(0).Head()
-// 	require.NoError(t, err)
-//
-// 	delta := unittest.StateDeltaWithParentFixture(genesis)
-// 	delta.ExecutableBlock.StartState = unittest.GenesisStateCommitment
-// 	delta.EndState = unittest.GenesisStateCommitment
-//
-// 	fmt.Printf("block id: %v, delta for block (%v)'s parent id: %v\n", genesis.ID(), delta.Block.ID(), delta.ParentID())
-// 	exeNode.IngestionEngine.SubmitLocal(delta)
-// 	time.Sleep(time.Second)
-//
-// 	exeNode.IngestionEngine.SubmitLocal(delta)
-// 	// handling the same delta again to verify the DB calls in saveExecutionResults
-// 	// are idempotent, if they weren't, it will hit log.Fatal and crash before
-// 	// sleep is done
-// 	time.Sleep(time.Second)
-//
-// }

integration/tests/lib/msg_state.go

@@ -91,17 +91,3 @@ func MsgIsResultApproval(msg interface{}) bool {
 	_, ok := msg.(*flow.ResultApproval)
 	return ok
 }
-
-func MsgIsExecutionStateDelta(msg interface{}) bool {
-	_, ok := msg.(*messages.ExecutionStateDelta)
-	return ok
-}
-
-func MsgIsExecutionStateDeltaWithChanges(msg interface{}) bool {
-	delta, ok := msg.(*messages.ExecutionStateDelta)
-	if !ok {
-		return false
-	}
-
-	return *delta.StartState != delta.EndState
-}

model/messages/execution.go

@@ -1,9 +1,7 @@
 package messages
 
 import (
-	"github.com/onflow/flow-go/engine/execution/state/delta"
 	"github.com/onflow/flow-go/model/flow"
-	"github.com/onflow/flow-go/module/mempool/entity"
 )
 
 // ChunkDataRequest represents a request for the a chunk data pack
@@ -19,37 +17,3 @@ type ChunkDataResponse struct {
 	ChunkDataPack flow.ChunkDataPack
 	Nonce         uint64 // so that we aren't deduplicated by the network layer
 }
-
-// ExecutionStateSyncRequest represents a request for state deltas between
-// the block at the `FromHeight` and the block at the `ToHeight`
-// since the state sync request only requests for sealed blocks, heights
-// should be enough to specify the block deterministically.
-type ExecutionStateSyncRequest struct {
-	FromHeight uint64
-	ToHeight   uint64
-}
-
-type ExecutionStateDelta struct {
-	entity.ExecutableBlock
-	StateInteractions  []*delta.Snapshot
-	EndState           flow.StateCommitment
-	Events             []flow.Event
-	ServiceEvents      []flow.Event
-	TransactionResults []flow.TransactionResult
-}
-
-func (b *ExecutionStateDelta) ID() flow.Identifier {
-	return b.Block.ID()
-}
-
-func (b *ExecutionStateDelta) Checksum() flow.Identifier {
-	return b.Block.Checksum()
-}
-
-func (b *ExecutionStateDelta) Height() uint64 {
-	return b.Block.Header.Height
-}
-
-func (b *ExecutionStateDelta) ParentID() flow.Identifier {
-	return b.Block.Header.ParentID
-}

module/mempool/mock/deltas.go

@@ -46,10 +46,6 @@ const (
 	CodeExecutionReceipt
 	CodeResultApproval
 
-	// execution state synchronization
-	CodeExecutionStateSyncRequest
-	CodeExecutionStateDelta
-
 	// data exchange for execution of blocks
 	CodeChunkDataRequest
 	CodeChunkDataResponse
@@ -119,12 +115,6 @@ func MessageCodeFromInterface(v interface{}) (MessageCode, string, error) {
 	case *flow.ResultApproval:
 		return CodeResultApproval, s, nil
 
-	// execution state synchronization
-	case *messages.ExecutionStateSyncRequest:
-		return CodeExecutionStateSyncRequest, s, nil
-	case *messages.ExecutionStateDelta:
-		return CodeExecutionStateDelta, s, nil
-
 	// data exchange for execution of blocks
 	case *messages.ChunkDataRequest:
 		return CodeChunkDataRequest, s, nil
@@ -206,12 +196,6 @@ func InterfaceFromMessageCode(code MessageCode) (interface{}, string, error) {
 	case CodeResultApproval:
 		return &flow.ResultApproval{}, what(&flow.ResultApproval{}), nil
 
-	// execution state synchronization
-	case CodeExecutionStateSyncRequest:
-		return &messages.ExecutionStateSyncRequest{}, what(&messages.ExecutionStateSyncRequest{}), nil
-	case CodeExecutionStateDelta:
-		return &messages.ExecutionStateDelta{}, what(&messages.ExecutionStateDelta{}), nil
-
 	// data exchange for execution of blocks
 	case CodeChunkDataRequest:
 		return &messages.ChunkDataRequest{}, what(&messages.ChunkDataRequest{}), nil

network/codec/codes.go

@@ -79,12 +79,6 @@ func getPriorityByType(message interface{}) Priority {
 	case *flow.ResultApproval:
 		return HighPriority
 
-	// execution state synchronization
-	case *messages.ExecutionStateSyncRequest:
-		return MediumPriority
-	case *messages.ExecutionStateDelta:
-		return HighPriority
-
 	// data exchange for execution of blocks
 	case *messages.ChunkDataRequest:
 		return HighPriority

network/queue/eventPriority.go

@@ -22,7 +22,7 @@ import (
 
 	hotstuff "github.com/onflow/flow-go/consensus/hotstuff/model"
 	"github.com/onflow/flow-go/engine"
-	"github.com/onflow/flow-go/engine/execution/state/delta"
+	"github.com/onflow/flow-go/fvm/state"
 	"github.com/onflow/flow-go/ledger/common/bitutils"
 	"github.com/onflow/flow-go/model/bootstrap"
 	"github.com/onflow/flow-go/model/chainsync"
@@ -239,16 +239,6 @@ func AsSlashable[T any](msg T) flow.Slashable[T] {
 	return slashable
 }
 
-func StateDeltaFixture() *messages.ExecutionStateDelta {
-	header := BlockHeaderFixture()
-	block := BlockWithParentFixture(header)
-	return &messages.ExecutionStateDelta{
-		ExecutableBlock: entity.ExecutableBlock{
-			Block: block,
-		},
-	}
-}
-
 func ReceiptAndSealForBlock(block *flow.Block) (*flow.ExecutionReceipt, *flow.Seal) {
 	receipt := ReceiptForBlockFixture(block)
 	seal := Seal.Fixture(Seal.WithBlock(block.Header), Seal.WithResult(&receipt.ExecutionResult))
@@ -341,8 +331,8 @@ func WithoutGuarantee(payload *flow.Payload) {
 	payload.Guarantees = nil
 }
 
-func StateInteractionsFixture() *delta.Snapshot {
-	return &delta.NewDeltaView(nil).Interactions().Snapshot
+func StateInteractionsFixture() *state.ExecutionSnapshot {
+	return &state.ExecutionSnapshot{}
 }
 
 func BlockWithParentAndProposerFixture(t *testing.T, parent *flow.Header, proposer flow.Identifier) flow.Block {
@@ -381,26 +371,6 @@ func BlockWithParentAndSeals(parent *flow.Header, seals []*flow.Header) *flow.Bl
 	return block
 }
 
-func StateDeltaWithParentFixture(parent *flow.Header) *messages.ExecutionStateDelta {
-	payload := PayloadFixture()
-	header := BlockHeaderWithParentFixture(parent)
-	header.PayloadHash = payload.Hash()
-	block := flow.Block{
-		Header:  header,
-		Payload: &payload,
-	}
-
-	var stateInteractions []*delta.Snapshot
-	stateInteractions = append(stateInteractions, StateInteractionsFixture())
-
-	return &messages.ExecutionStateDelta{
-		ExecutableBlock: entity.ExecutableBlock{
-			Block: &block,
-		},
-		StateInteractions: stateInteractions,
-	}
-}
-
 func GenesisFixture() *flow.Block {
 	genesis := flow.Genesis(flow.Emulator)
 	return genesis