remove redundant activeOp interface

Signed-off-by: Erik Sipsma <[email protected]>
moby · Dec 6, 2024 · fc4ecad · fc4ecad
1 parent 8f16a38
commit fc4ecad
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 13 deletions.
diff --git a/solver/edge.go b/solver/edge.go
@@ -24,7 +24,7 @@ func (t edgeStatusType) String() string {
 	return []string{"initial", "cache-fast", "cache-slow", "complete"}[t]
 }
 
-func newEdge(ed Edge, op activeOp, index *edgeIndex) *edge {
+func newEdge(ed Edge, op *sharedOp, index *edgeIndex) *edge {
 	e := &edge{
 		edge:               ed,
 		op:                 op,
@@ -40,7 +40,7 @@ func newEdge(ed Edge, op activeOp, index *edgeIndex) *edge {
 
 type edge struct {
 	edge Edge
-	op   activeOp
+	op   *sharedOp
 
 	edgeState
 	depRequests map[pipeReceiver]*dep

diff --git a/solver/exporter.go b/solver/exporter.go
@@ -118,8 +118,7 @@ func (e *exporter) ExportTo(ctx context.Context, t CacheExporterTarget, opt Cach
 		}
 
 		if e.edge != nil {
-			op, ok := e.edge.op.(*sharedOp)
-			if ok && op != nil && op.st != nil {
+			if op := e.edge.op; op != nil && op.st != nil {
 				ctx = withAncestorCacheOpts(ctx, op)
 			}
 		}

diff --git a/solver/jobs.go b/solver/jobs.go
@@ -825,15 +825,6 @@ type cacheMapResp struct {
 	complete bool
 }
 
-type activeOp interface {
-	CacheMap(context.Context, int) (*cacheMapResp, error)
-	LoadCache(ctx context.Context, rec *CacheRecord) (Result, error)
-	Exec(ctx context.Context, inputs []Result) (outputs []Result, exporters []ExportableCacheKey, err error)
-	IgnoreCache() bool
-	Cache() CacheManager
-	CalcSlowCache(context.Context, Index, PreprocessFunc, ResultBasedCacheFunc, Result) (digest.Digest, error)
-}
-
 func newSharedOp(resolver ResolveOpFunc, st *state) *sharedOp {
 	so := &sharedOp{
 		resolver:     resolver,