Removes return error from NewDeppySolver

It never returns an error Signed-off-by: Mikalai Radchuk <mradchuk@redhat.com>
operator-framework · Jun 1, 2023 · e2ea021 · e2ea021
1 parent 9a7655c
commit e2ea021
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 31 deletions.
diff --git a/cmd/dimacs/cmd.go b/cmd/dimacs/cmd.go
@@ -18,7 +18,7 @@ func NewDimacsCommand() *cobra.Command {
 		Long: `Solves a sat problem given in dimacs format. For instance:
 c
 c this is a comment
-c header: p cnf <number of variable> <number of clauses> 
+c header: p cnf <number of variable> <number of clauses>
 p cnf 2 2
 c clauses end in zero, negative means 'not'
 c 0 (zero) is not a valid literal
@@ -53,10 +53,7 @@ func solve(path string) error {
 	}
 
 	// build solver
-	so, err := solver.NewDeppySolver(NewDimacsEntitySource(dimacs), NewDimacsVariableSource(dimacs))
-	if err != nil {
-		return err
-	}
+	so := solver.NewDeppySolver(NewDimacsEntitySource(dimacs), 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 := NewSudoku()
-	so, err := solver.NewDeppySolver(sudoku, sudoku)
-	if err != nil {
-		return err
-	}
+	so := solver.NewDeppySolver(sudoku, sudoku)
 
 	// get solution
 	solution, err := so.Solve(context.Background())

diff --git a/pkg/deppy/solver/solver.go b/pkg/deppy/solver/solver.go
@@ -81,11 +81,11 @@ type DeppySolver struct {
 	variableSource input.VariableSource
 }
 
-func NewDeppySolver(entitySource input.EntitySource, variableSource input.VariableSource) (*DeppySolver, error) {
+func NewDeppySolver(entitySource input.EntitySource, variableSource input.VariableSource) *DeppySolver {
 	return &DeppySolver{
 		entitySource:   entitySource,
 		variableSource: variableSource,
-	}, nil
+	}
 }
 
 func (d DeppySolver) Solve(ctx context.Context, options ...Option) (*Solution, error) {

diff --git a/pkg/deppy/solver/solver_test.go b/pkg/deppy/solver/solver_test.go
@@ -51,8 +51,7 @@ var _ = Describe("Entity", func() {
 			input.NewSimpleVariable("2"),
 		}
 		s := NewEntitySource(variables)
-		so, err := solver.NewDeppySolver(s, s)
-		Expect(err).ToNot(HaveOccurred())
+		so := solver.NewDeppySolver(s, s)
 		solution, err := so.Solve(context.Background())
 		Expect(err).ToNot(HaveOccurred())
 		Expect(solution.SelectedVariables()).To(MatchAllKeys(Keys{
@@ -67,8 +66,7 @@ var _ = Describe("Entity", func() {
 			input.NewSimpleVariable("2", constraint.Mandatory()),
 		}
 		s := NewEntitySource(variables)
-		so, err := solver.NewDeppySolver(s, s)
-		Expect(err).ToNot(HaveOccurred())
+		so := solver.NewDeppySolver(s, s)
 		solution, err := so.Solve(context.Background())
 		Expect(err).ToNot(HaveOccurred())
 		Expect(solution.SelectedVariables()).To(MatchAllKeys(Keys{
@@ -85,8 +83,7 @@ var _ = Describe("Entity", func() {
 		}
 		s := NewEntitySource(variables)
 
-		so, err := solver.NewDeppySolver(s, s)
-		Expect(err).ToNot(HaveOccurred())
+		so := solver.NewDeppySolver(s, s)
 		solution, err := so.Solve(context.Background())
 		Expect(err).ToNot(HaveOccurred())
 		Expect(solution.SelectedVariables()).To(MatchAllKeys(Keys{
@@ -102,17 +99,15 @@ var _ = Describe("Entity", func() {
 			input.NewSimpleVariable("3"),
 		}
 		s := NewEntitySource(variables)
-		so, err := solver.NewDeppySolver(s, s)
-		Expect(err).ToNot(HaveOccurred())
+		so := solver.NewDeppySolver(s, s)
 		solution, err := so.Solve(context.Background())
 		Expect(err).ToNot(HaveOccurred())
 		Expect(solution.Error()).To(HaveOccurred())
 	})
 
 	It("should return peripheral errors", func() {
 		s := NewEntitySource(nil)
-		so, err := solver.NewDeppySolver(s, FailingVariableSource{})
-		Expect(err).ToNot(HaveOccurred())
+		so := solver.NewDeppySolver(s, FailingVariableSource{})
 		solution, err := so.Solve(context.Background())
 		Expect(err).To(HaveOccurred())
 		Expect(solution).To(BeNil())
@@ -125,8 +120,7 @@ var _ = Describe("Entity", func() {
 			input.NewSimpleVariable("3", constraint.Prohibited()),
 		}
 		s := NewEntitySource(variables)
-		so, err := solver.NewDeppySolver(s, s)
-		Expect(err).ToNot(HaveOccurred())
+		so := solver.NewDeppySolver(s, s)
 		solution, err := so.Solve(context.Background())
 		Expect(err).ToNot(HaveOccurred())
 		Expect(solution.SelectedVariables()).To(MatchAllKeys(Keys{
@@ -142,8 +136,7 @@ var _ = Describe("Entity", func() {
 			input.NewSimpleVariable("3", constraint.Prohibited()),
 		}
 		s := NewEntitySource(variables)
-		so, err := solver.NewDeppySolver(s, s)
-		Expect(err).ToNot(HaveOccurred())
+		so := solver.NewDeppySolver(s, s)
 		solution, err := so.Solve(context.Background(), solver.AddAllVariablesToSolution())
 		Expect(err).ToNot(HaveOccurred())
 		Expect(solution.AllVariables()).To(Equal([]deppy.Variable{
@@ -161,8 +154,7 @@ var _ = Describe("Entity", func() {
 			input.NewSimpleVariable("4"),
 		}
 		s := NewEntitySource(variables)
-		so, err := solver.NewDeppySolver(s, s)
-		Expect(err).ToNot(HaveOccurred())
+		so := solver.NewDeppySolver(s, s)
 		solution, err := so.Solve(context.Background())
 		Expect(err).ToNot(HaveOccurred())
 		Expect(solution.SelectedVariables()).To(MatchAllKeys(Keys{
@@ -179,8 +171,7 @@ var _ = Describe("Entity", func() {
 			input.NewSimpleVariable("4"),
 		}
 		s := NewEntitySource(variables)
-		so, err := solver.NewDeppySolver(s, s)
-		Expect(err).ToNot(HaveOccurred())
+		so := solver.NewDeppySolver(s, s)
 		solution, err := so.Solve(context.Background())
 		Expect(err).ToNot(HaveOccurred())
 		Expect(solution.SelectedVariables()).To(MatchAllKeys(Keys{
@@ -199,8 +190,7 @@ var _ = Describe("Entity", func() {
 			input.NewSimpleVariable("6"),
 		}
 		s := NewEntitySource(variables)
-		so, err := solver.NewDeppySolver(s, s)
-		Expect(err).ToNot(HaveOccurred())
+		so := solver.NewDeppySolver(s, s)
 		solution, err := so.Solve(context.Background())
 		Expect(err).ToNot(HaveOccurred())
 		Expect(solution.SelectedVariables()).To(MatchAllKeys(Keys{