Use throw_if_scalar_and_constant_not_zero when appropriate (#2753)

Author: blegat

src/Bridges/Constraint/bridges/VectorizeBridge.jl

@@ -45,10 +45,7 @@ function bridge_constraint(
     scalar_f::G,
     set::MOI.Utilities.ScalarLinearSet{T},
 ) where {T,F,S,G}
-    scalar_const = MOI.constant(scalar_f, T)
-    if !iszero(scalar_const)
-        throw(MOI.ScalarFunctionConstantNotZero{T,G,typeof(set)}(scalar_const))
-    end
+    MOI.throw_if_scalar_and_constant_not_zero(scalar_f, typeof(set))
     set_const = MOI.constant(set)
     vector_f = MOI.Utilities.operate(
         vcat,

src/Utilities/mockoptimizer.jl

@@ -181,12 +181,8 @@ function MOI.add_constraint(
 ) where {T}
     if !mock.add_con_allowed
         throw(MOI.AddConstraintNotAllowed{typeof(func),typeof(set)}())
-    elseif mock.scalar_function_constant_non_zero && !iszero(func.constant)
-        throw(
-            MOI.ScalarFunctionConstantNotZero{T,typeof(func),typeof(set)}(
-                func.constant,
-            ),
-        )
+    elseif mock.scalar_function_constant_non_zero
+        MOI.throw_if_scalar_and_constant_not_zero(func, typeof(set))
     end
     ci = MOI.add_constraint(mock.inner_model, xor_indices(func), set)
     return xor_index(ci)