Merge pull request #799 from onflow/m4ksio/epoch-service-events

Epoch service events
onflow · Jun 18, 2021 · 774a8ac · 774a8ac
2 parents 0fc3314 + 5fa293a
commit 774a8ac
Show file tree

Hide file tree

Showing 8 changed files with 1,741 additions and 7 deletions.
diff --git a/engine/execution/ingestion/engine.go b/engine/execution/ingestion/engine.go
@@ -20,6 +20,7 @@ import (
 	"github.com/onflow/flow-go/engine/execution/state"
 	"github.com/onflow/flow-go/engine/execution/state/delta"
 	"github.com/onflow/flow-go/engine/execution/utils"
+	"github.com/onflow/flow-go/model/convert"
 	"github.com/onflow/flow-go/model/flow"
 	"github.com/onflow/flow-go/model/flow/filter"
 	"github.com/onflow/flow-go/module"
@@ -1194,7 +1195,7 @@ func (e *Engine) generateExecutionResultForBlock(
 	// convert Cadence service event representation to flow-go representation
 	convertedServiceEvents := make([]flow.ServiceEvent, 0, len(serviceEvents))
 	for _, event := range serviceEvents {
-		converted, err := flow.ConvertServiceEvent(event)
+		converted, err := convert.ServiceEvent(event)
 		if err != nil {
 			return nil, fmt.Errorf("could not convert service event: %w", err)
 		}

diff --git a/model/convert/fixtures.go b/model/convert/fixtures.go