refactor solver and independence solver to use laser.smt.model

mythril/laser/smt/independence_solver.py

@@ -1,5 +1,6 @@
 import z3
 
+from mythril.laser.smt import Model
 
 def get_expr_variables(expression: z3.ExprRef):
     """
@@ -124,7 +125,7 @@ class IndependenceSolver:
 
         :return:
         """
-        return self.models
+        return Model(self.models)
 
     def reset(self) -> None:
         """Reset this solver."""

mythril/laser/smt/solver.py

@@ -2,7 +2,7 @@
 import z3
 
 from mythril.laser.smt.expression import Expression
-
+from mythril.laser.smt.model import Model
 
 class Solver:
     """An SMT solver object."""
@@ -55,7 +55,7 @@ class Solver:
 
         :return:
         """
-        return self.raw.model()
+        return Model([self.raw.model()])
 
     def reset(self) -> None:
         """Reset this solver."""