address merge conflicts

Signed-off-by: Per Goncalves da Silva <[email protected]>
operator-framework · Jul 18, 2023 · a585358 · a585358
1 parent 98be22e
commit a585358
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 274 deletions.
diff --git a/cmd/dimacs/cmd.go b/cmd/dimacs/cmd.go
@@ -53,10 +53,7 @@ func solve(path string) error {
 	}
 
 	// build solver
-	so, err := solver.NewDeppySolver(NewDimacsVariableSource(dimacs))
-	if err != nil {
-		return err
-	}
+	so := solver.NewDeppySolver(NewDimacsVariableSource(dimacs))
 
 	// get solution
 	solution, err := so.Solve(context.Background(), solver.AddAllVariablesToSolution())

diff --git a/cmd/sudoku/cmd.go b/cmd/sudoku/cmd.go
@@ -24,10 +24,7 @@ func NewSudokuCommand() *cobra.Command {
 func solve() error {
 	// build solver
 	sudoku := &Sudoku{}
-	so, err := solver.NewDeppySolver(sudoku)
-	if err != nil {
-		return err
-	}
+	so := solver.NewDeppySolver(sudoku)
 
 	// get solution
 	solution, err := so.Solve(context.Background())

diff --git a/pkg/deppy/input/cache_entity_source.go b/pkg/deppy/input/cache_entity_source.go
diff --git a/pkg/deppy/input/entity_source_test.go b/pkg/deppy/input/entity_source_test.go