add transaction type enum

Author: janezpodhostnik

engine/execution/computation/computer/computer.go

@@ -40,6 +40,14 @@ type collectionInfo struct {
 	*entity.CompleteCollection
 }
 
+type ComputerTransactionType uint
+
+const (
+	ComputerTransactionTypeUser ComputerTransactionType = iota
+	ComputerTransactionTypeSystem
+	ComputerTransactionTypeScheduled
+)
+
 type TransactionRequest struct {
 	collectionInfo
 
@@ -48,8 +56,7 @@ type TransactionRequest struct {
 
 	txnIndex uint32
 
-	isScheduledTransaction      bool
-	isSystemTransaction         bool
+	transactionType             ComputerTransactionType
 	lastTransactionInCollection bool
 
 	ctx fvm.Context
@@ -62,8 +69,7 @@ func newTransactionRequest(
 	collectionLogger zerolog.Logger,
 	txnIndex uint32,
 	txnBody *flow.TransactionBody,
-	isScheduledTransaction bool,
-	isSystemTransaction bool,
+	transactionType ComputerTransactionType,
 	lastTransactionInCollection bool,
 ) TransactionRequest {
 	txnId := txnBody.ID()
@@ -85,8 +91,7 @@ func newTransactionRequest(
 			txnId,
 			txnIndex,
 			txnBody),
-		isScheduledTransaction:      isScheduledTransaction,
-		isSystemTransaction:         isSystemTransaction,
+		transactionType:             transactionType,
 		lastTransactionInCollection: lastTransactionInCollection,
 	}
 }
@@ -299,8 +304,7 @@ func (e *blockComputer) queueUserTransactions(
 				collectionLogger,
 				txnIndex,
 				txnBody,
-				false,
-				false,
+				ComputerTransactionTypeUser,
 				i == len(collection.Collection.Transactions)-1,
 			)
 			txnIndex += 1
@@ -340,8 +344,7 @@ func (e *blockComputer) queueSystemTransactions(
 			scheduledTxLogger,
 			txnIndex,
 			txBody,
-			true,
-			false,
+			ComputerTransactionTypeScheduled,
 			false,
 		)
 
@@ -354,8 +357,7 @@ func (e *blockComputer) queueSystemTransactions(
 		systemTxLogger,
 		txnIndex,
 		systemTxn,
-		false,
-		true,
+		ComputerTransactionTypeSystem,
 		true,
 	)
 
@@ -631,8 +633,7 @@ func (e *blockComputer) executeProcessCallback(
 		callbackLogger,
 		txnIndex,
 		e.processCallbackTxn,
-		false,
-		true,
+		ComputerTransactionTypeSystem,
 		false)
 
 	txnIndex++
@@ -733,7 +734,7 @@ func (e *blockComputer) executeTransaction(
 		attempt)
 	if err != nil {
 		prefix := ""
-		if request.isSystemTransaction {
+		if request.transactionType == ComputerTransactionTypeSystem {
 			prefix = "system "
 		}
 

engine/execution/computation/computer/result_collector.go

@@ -240,7 +240,7 @@ func (collector *resultCollector) processTransactionResult(
 			Logger()
 		logger.Info().Msg("transaction execution failed")
 
-		if txn.isSystemTransaction {
+		if txn.transactionType == ComputerTransactionTypeSystem {
 			// This log is used as the data source for an alert on grafana.
 			// The critical_error field must not be changed without adding
 			// the corresponding changes in grafana.
@@ -311,8 +311,8 @@ func (collector *resultCollector) handleTransactionExecutionMetrics(
 		ComputationIntensities:     output.ComputationIntensities,
 		NumberOfTxnConflictRetries: numConflictRetries,
 		Failed:                     output.Err != nil,
-		ScheduledTransaction:       txn.isScheduledTransaction,
-		SystemTransaction:          txn.isSystemTransaction,
+		ScheduledTransaction:       txn.transactionType == ComputerTransactionTypeScheduled,
+		SystemTransaction:          txn.transactionType == ComputerTransactionTypeSystem,
 	}
 	for _, entry := range txnExecutionSnapshot.UpdatedRegisters() {
 		transactionExecutionStats.NumberOfBytesWrittenToRegisters += len(entry.Value)

engine/execution/computation/computer/transaction_coordinator_test.go

@@ -122,8 +122,7 @@ func (db *testCoordinator) newTransaction(txnIndex uint32) (
 			zerolog.Nop(),
 			txnIndex,
 			&flow.TransactionBody{},
-			false,
-			false,
+			ComputerTransactionTypeUser,
 			false),
 		0)
 }

utils/unittest/fvm.go

@@ -5,27 +5,13 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/onflow/flow-go/fvm/systemcontracts"
 	"github.com/onflow/flow-go/model/flow"
 )
 
-func IsServiceEvent(event flow.Event, chainID flow.ChainID) bool {
-	serviceEvents := systemcontracts.ServiceEventsForChain(chainID)
-	for _, serviceEvent := range serviceEvents.All() {
-		if serviceEvent.EventType() == event.Type {
-			return true
-		}
-	}
-	return false
-}
-
 // EnsureEventsIndexSeq checks if values of given event index sequence are monotonically increasing.
 func EnsureEventsIndexSeq(t *testing.T, events []flow.Event, chainID flow.ChainID) {
 	expectedEventIndex := uint32(0)
 	for _, event := range events {
-		if expectedEventIndex != event.EventIndex {
-			require.Equal(t, expectedEventIndex, event.EventIndex)
-		}
 		require.Equal(t, expectedEventIndex, event.EventIndex)
 		expectedEventIndex++
 	}