From b9c923da8a20d68a8bedd73e1d9f27e185725dee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20Pa=C3=9F?=
 <22845248+mpass99@users.noreply.github.com>
Date: Fri, 14 Oct 2022 20:16:56 +0100
Subject: [PATCH] Remove unused and deprecated Storer interface.

---
 internal/runner/aws_runner.go | 13 ++++++-------
 pkg/execution/execution.go    | 22 ----------------------
 2 files changed, 6 insertions(+), 29 deletions(-)
 delete mode 100644 pkg/execution/execution.go

diff --git a/internal/runner/aws_runner.go b/internal/runner/aws_runner.go
index 890afda..7254aac 100644
--- a/internal/runner/aws_runner.go
+++ b/internal/runner/aws_runner.go
@@ -9,7 +9,6 @@ import (
 	"github.com/gorilla/websocket"
 	"github.com/openHPI/poseidon/internal/config"
 	"github.com/openHPI/poseidon/pkg/dto"
-	"github.com/openHPI/poseidon/pkg/execution"
 	"github.com/openHPI/poseidon/pkg/monitoring"
 	"github.com/openHPI/poseidon/pkg/storage"
 	"io"
@@ -34,7 +33,7 @@ type AWSFunctionWorkload struct {
 	id                string
 	fs                map[dto.FilePath][]byte
 	executions        storage.Storage[*dto.ExecutionRequest]
-	runningExecutions map[execution.ID]context.CancelFunc
+	runningExecutions map[string]context.CancelFunc
 	onDestroy         DestroyRunnerHandler
 	environment       ExecutionEnvironment
 	ctx               context.Context
@@ -53,7 +52,7 @@ func NewAWSFunctionWorkload(
 	workload := &AWSFunctionWorkload{
 		id:                newUUID.String(),
 		fs:                make(map[dto.FilePath][]byte),
-		runningExecutions: make(map[execution.ID]context.CancelFunc),
+		runningExecutions: make(map[string]context.CancelFunc),
 		onDestroy:         onDestroy,
 		environment:       environment,
 		ctx:               ctx,
@@ -102,7 +101,7 @@ func (w *AWSFunctionWorkload) ExecuteInteractively(id string, _ io.ReadWriter, s
 	exit := make(chan ExitInfo, 1)
 
 	go w.executeCommand(ctx, command, stdout, stderr, exitInternal)
-	go w.handleRunnerTimeout(ctx, exitInternal, exit, execution.ID(id))
+	go w.handleRunnerTimeout(ctx, exitInternal, exit, id)
 
 	return exit, cancel, nil
 }
@@ -220,10 +219,10 @@ func (w *AWSFunctionWorkload) receiveOutput(
 // handleRunnerTimeout listens for a runner timeout and aborts the execution in that case.
 // It listens via a context in runningExecutions that is canceled on the timeout event.
 func (w *AWSFunctionWorkload) handleRunnerTimeout(ctx context.Context,
-	exitInternal <-chan ExitInfo, exit chan<- ExitInfo, id execution.ID) {
+	exitInternal <-chan ExitInfo, exit chan<- ExitInfo, executionID string) {
 	executionCtx, cancelExecution := context.WithCancel(ctx)
-	w.runningExecutions[id] = cancelExecution
-	defer delete(w.runningExecutions, id)
+	w.runningExecutions[executionID] = cancelExecution
+	defer delete(w.runningExecutions, executionID)
 	defer close(exit)
 
 	select {
diff --git a/pkg/execution/execution.go b/pkg/execution/execution.go
deleted file mode 100644
index 649d0b2..0000000
--- a/pkg/execution/execution.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package execution
-
-import (
-	"github.com/openHPI/poseidon/pkg/dto"
-)
-
-// ID is an identifier for an execution.
-type ID string
-
-// Storer stores executions.
-type Storer interface {
-	// Add adds a runner to the storage.
-	// It overwrites the existing execution if an execution with the same id already exists.
-	Add(id ID, executionRequest *dto.ExecutionRequest)
-
-	// Exists returns whether the execution with the given id exists in the store.
-	Exists(id ID) bool
-
-	// Pop deletes the execution with the given id from the storage and returns it.
-	// If no such execution exists, ok is false and true otherwise.
-	Pop(id ID) (request *dto.ExecutionRequest, ok bool)
-}