rip out modulecontext.Map

block · Jun 5, 2024 · bd3849a · bd3849a
1 parent a0f98b3
commit bd3849a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/go-runtime/ftl/ftltest/fake.go b/go-runtime/ftl/ftltest/fake.go
@@ -12,13 +12,17 @@ import (
 
 type fakeFTL struct {
 	fsm      *fakeFSMManager
-	mockMaps map[uintptr]modulecontext.Map
+	mockMaps map[uintptr]mapImpl
 }
 
+// mapImpl is a function that takes an object and returns an object of a potentially different
+// type but is not constrained by input/output type like ftl.Map.
+type mapImpl func(context.Context) (any, error)
+
 func newFakeFTL() *fakeFTL {
 	return &fakeFTL{
 		fsm:      newFakeFSMManager(),
-		mockMaps: make(map[uintptr]modulecontext.Map),
+		mockMaps: make(map[uintptr]mapImpl),
 	}
 }
 
@@ -62,7 +66,7 @@ func makeMapKey(mapper any) uintptr {
 	return v.Pointer()
 }
 
-func actuallyCallMap(ctx context.Context, impl modulecontext.Map) any {
+func actuallyCallMap(ctx context.Context, impl mapImpl) any {
 	out, err := impl(ctx)
 	if err != nil {
 		panic(err)

diff --git a/internal/modulecontext/module_context.go b/internal/modulecontext/module_context.go
@@ -20,11 +20,6 @@ import (
 // It is used for definitions of mock verbs as well as real implementations of verbs to directly execute
 type Verb func(ctx context.Context, req any) (resp any, err error)
 
-// Map is a function that takes an object and returns an object of a potentially different type but is not constrained by input/output type like ftl.Map
-//
-// It is used for definitions of mock maps as well as real implementations of maps to directly execute
-type Map func(context.Context) (any, error)
-
 // ModuleContext holds the context needed for a module, including configs, secrets and DSNs
 //
 // ModuleContext is immutable