From 6e5ee5562ec9acdd761d87aa29dc72d644d7576e Mon Sep 17 00:00:00 2001
From: Ayaz Hafiz <ayaz@rwx.com>
Date: Thu, 22 Jun 2023 14:22:18 -0500
Subject: [PATCH] Update tests

---
 crates/compiler/test_derive/src/util.rs  | 24 +++++++++++++++++-------
 crates/reporting/tests/helpers/mod.rs    | 21 ++++++++++-----------
 crates/reporting/tests/test_reporting.rs |  4 ++--
 3 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/crates/compiler/test_derive/src/util.rs b/crates/compiler/test_derive/src/util.rs
index 566d433c9c0..5d050827386 100644
--- a/crates/compiler/test_derive/src/util.rs
+++ b/crates/compiler/test_derive/src/util.rs
@@ -3,6 +3,7 @@ use std::path::PathBuf;
 
 use bumpalo::Bump;
 use roc_packaging::cache::RocCacheDir;
+use roc_solve::module::{SolveConfig, SolveOutput};
 use ven_pretty::DocAllocator;
 
 use roc_can::{
@@ -418,18 +419,27 @@ fn check_derived_typechecks_and_golden(
         roc_debug_flags::ROC_PRINT_UNIFICATIONS_DERIVED,
         std::env::set_var(roc_debug_flags::ROC_PRINT_UNIFICATIONS, "1")
     );
-    let (mut solved_subs, _, problems, _) = roc_solve::module::run_solve(
-        test_module,
+
+    let solve_config = SolveConfig {
+        home: test_module,
+        constraints: &constraints,
+        root_constraint: constr,
         types,
-        &constraints,
-        constr,
+        pending_derives: Default::default(),
+        exposed_by_module: &exposed_for_module.exposed_by_module,
+        derived_module: Default::default(),
+    };
+
+    let SolveOutput {
+        subs: mut solved_subs,
+        errors: problems,
+        ..
+    } = roc_solve::module::run_solve(
+        solve_config,
         RigidVariables::default(),
         test_subs,
         Default::default(),
         abilities_store,
-        Default::default(),
-        &exposed_for_module.exposed_by_module,
-        Default::default(),
     );
     dbg_do!(
         roc_debug_flags::ROC_PRINT_UNIFICATIONS_DERIVED,
diff --git a/crates/reporting/tests/helpers/mod.rs b/crates/reporting/tests/helpers/mod.rs
index 187102105ea..a8bea3eeacb 100644
--- a/crates/reporting/tests/helpers/mod.rs
+++ b/crates/reporting/tests/helpers/mod.rs
@@ -15,7 +15,8 @@ use roc_module::symbol::{IdentIds, Interns, ModuleId, ModuleIds};
 use roc_parse::parser::{SourceError, SyntaxError};
 use roc_problem::can::Problem;
 use roc_region::all::Loc;
-use roc_solve::solve::{self, Aliases};
+use roc_solve::module::SolveConfig;
+use roc_solve::{solve, Aliases};
 use roc_solve_problem::TypeError;
 use roc_types::subs::{Content, Subs, VarStore, Variable};
 use roc_types::types::Types;
@@ -33,26 +34,24 @@ pub fn infer_expr(
     problems: &mut Vec<TypeError>,
     types: Types,
     constraints: &Constraints,
-    constraint: &Constraint,
+    constraint: Constraint,
     pending_derives: PendingDerives,
     aliases: &mut Aliases,
     abilities_store: &mut AbilitiesStore,
     derived_module: SharedDerivedModule,
     expr_var: Variable,
 ) -> (Content, Subs) {
-    let (solved, _) = solve::run(
-        ModuleId::ATTR,
+    let config = SolveConfig {
         types,
         constraints,
-        problems,
-        subs,
-        aliases,
-        constraint,
+        root_constraint: constraint,
+        home: ModuleId::ATTR,
         pending_derives,
-        abilities_store,
-        &Default::default(),
+        exposed_by_module: &Default::default(),
         derived_module,
-    );
+    };
+
+    let (solved, _) = solve::run(config, problems, subs, aliases, abilities_store);
 
     let content = *solved.inner().get_content_without_compacting(expr_var);
 
diff --git a/crates/reporting/tests/test_reporting.rs b/crates/reporting/tests/test_reporting.rs
index 4d51d7c1907..aeed31a9fcc 100644
--- a/crates/reporting/tests/test_reporting.rs
+++ b/crates/reporting/tests/test_reporting.rs
@@ -258,7 +258,7 @@ mod test_reporting {
             subs.rigid_var(var.value, "*".into());
         }
 
-        let mut solve_aliases = roc_solve::solve::Aliases::default();
+        let mut solve_aliases = roc_solve::Aliases::default();
 
         for (name, alias) in output.aliases {
             solve_aliases.insert(&mut types, name, alias);
@@ -271,7 +271,7 @@ mod test_reporting {
             &mut unify_problems,
             types,
             &constraints,
-            &constraint,
+            constraint,
             // Use `new_report_problem_as` in order to get proper derives.
             // TODO: remove the non-new reporting test infra.
             PendingDerives::default(),