👌 IMPROVE: resolve conflict

Signed-off-by: Gaurav Gahlot <[email protected]>
tinkerbell · Apr 29, 2022 · 1e94ce1 · 1e94ce1
1 parent ed22544
commit 1e94ce1
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 16 deletions.
diff --git a/server/dbserver.go b/server/dbserver.go
@@ -18,6 +18,7 @@ const (
 	errInvalidActionName     = "invalid action name"
 	errInvalidTaskReported   = "reported task name does not match the current action details"
 	errInvalidActionReported = "reported action name does not match the current action details"
+	errInvalidActionIndex    = "invalid action index for workflow"
 
 	msgReceivedStatus   = "received action status: %s"
 	msgCurrentWfContext = "current workflow context"

diff --git a/server/dbserver_worker_workflow.go b/server/dbserver_worker_workflow.go
@@ -13,22 +13,6 @@ import (
 	"google.golang.org/grpc/status"
 )
 
-var workflowData = make(map[string]int)
-
-const (
-	errInvalidWorkerID       = "invalid worker id"
-	errInvalidWorkflowID     = "invalid workflow id"
-	errInvalidTaskName       = "invalid task name"
-	errInvalidActionName     = "invalid action name"
-	errInvalidTaskReported   = "reported task name does not match the current action details"
-	errInvalidActionReported = "reported action name does not match the current action details"
-	errInvalidActionIndex    = "invalid action index for workflow"
-
-	msgReceivedStatus   = "received action status: %s"
-	msgCurrentWfContext = "current workflow context"
-	msgSendWfContext    = "send workflow context: %s"
-)
-
 // GetWorkflowContexts implements tinkerbell.GetWorkflowContexts.
 func (s *DBServer) GetWorkflowContexts(req *workflow.WorkflowContextRequest, stream workflow.WorkflowService_GetWorkflowContextsServer) error {
 	wfs, err := getWorkflowsForWorker(stream.Context(), s.db, req.WorkerId)