Fix test

Author: acl-cqc

hugr-passes/src/replace_types/linearize.rs

@@ -367,8 +367,7 @@ mod test {
     use std::sync::Arc;
 
     use hugr_core::builder::{
-        BuildError, DFGBuilder, Dataflow, DataflowHugr, DataflowSubContainer, HugrBuilder,
-        inout_sig,
+        inout_sig, BuildError, DFGBuilder, Dataflow, DataflowHugr, DataflowSubContainer, FunctionBuilder, HugrBuilder
     };
 
     use hugr_core::extension::prelude::{option_type, usize_t};
@@ -798,9 +797,9 @@ mod test {
         let lin_t: Type = lin_ct.clone().into();
 
         // A simple Hugr that discards a usize_t, with a "drop" function
-        let mut dfb = DFGBuilder::new(inout_sig(usize_t(), type_row![])).unwrap();
+        let mut fb = FunctionBuilder::new("main", inout_sig(usize_t(), type_row![])).unwrap();
         let discard_fn = {
-            let mut mb = dfb.module_root_builder();
+            let mut mb = fb.module_root_builder();
             let mut fb = mb
                 .define_function("drop", Signature::new(lin_t.clone(), type_row![]))
                 .unwrap();
@@ -813,7 +812,7 @@ mod test {
             fb.finish_with_outputs([]).unwrap()
         }
         .node();
-        let backup = dfb.finish_hugr().unwrap();
+        let backup = fb.finish_hugr().unwrap();
 
         let mut lower_discard_to_call = ReplaceTypes::default();
         // The `copy_fn` here is just any random node, we don't use it
@@ -842,16 +841,15 @@ mod test {
         );
         let r = lower_discard_to_call.run(&mut backup.clone());
         // Note the error (or success) can be quite fragile, according to what the `discard_fn`
-        // Node points at in the (hidden here) inner Hugr inside the Value::Function built by
-        // the array linearization helper.
+        // Node points at in the (hidden here) inner Hugr built by the array linearization helper.
         assert!(matches!(
             r,
             Err(ReplaceTypesError::LinearizeError(
                 LinearizeError::NestedTemplateError(
                     nested_t,
-                    BuildError::NodeNotFound { node } // Note `..` would be somewhat less fragile
+                    BuildError::UnexpectedType { .. } // Note `..` would be somewhat less fragile
                 )
-            )) if nested_t == lin_t && node == discard_fn
+            )) if nested_t == lin_t
         ));
     }
 }