From 5fd349f571445fb0f3821eb154fedf7a0fca629f Mon Sep 17 00:00:00 2001
From: microproofs <kwhitemsg@gmail.com>
Date: Tue, 8 Oct 2024 20:32:56 -0400
Subject: [PATCH] Remove an unused opcode

---
 crates/aiken-lang/src/gen_uplc.rs      | 22 +-------
 crates/aiken-lang/src/gen_uplc/air.rs  |  4 --
 crates/aiken-lang/src/gen_uplc/tree.rs | 71 +-------------------------
 3 files changed, 4 insertions(+), 93 deletions(-)

diff --git a/crates/aiken-lang/src/gen_uplc.rs b/crates/aiken-lang/src/gen_uplc.rs
index e2f1abad..700fa885 100644
--- a/crates/aiken-lang/src/gen_uplc.rs
+++ b/crates/aiken-lang/src/gen_uplc.rs
@@ -25,8 +25,8 @@ use crate::{
         builder::{
             erase_opaque_type_operations, find_list_clause_or_default_first,
             get_generic_variant_name, get_line_columns_by_span, get_src_code_by_span,
-            known_data_to_type, monomorphize, pattern_has_conditions, wrap_as_multi_validator,
-            wrap_validator_condition, CodeGenFunction, SpecificClause,
+            known_data_to_type, monomorphize, pattern_has_conditions, wrap_validator_condition,
+            CodeGenFunction, SpecificClause,
         },
     },
     line_numbers::LineNumbers,
@@ -6035,24 +6035,6 @@ impl<'a> CodeGenerator<'a> {
             }
 
             Air::NoOp => None,
-            Air::MultiValidator {
-                two_arg_name,
-                three_arg_name,
-            } => {
-                let two_arg = arg_stack.pop().unwrap();
-
-                let three_arg = arg_stack.pop().unwrap();
-
-                let term = wrap_as_multi_validator(
-                    three_arg,
-                    two_arg,
-                    self.tracing,
-                    three_arg_name,
-                    two_arg_name,
-                );
-
-                Some(term)
-            }
             Air::SoftCastLet { name, tipo } => {
                 let value = arg_stack.pop().unwrap();
                 let then = arg_stack.pop().unwrap();
diff --git a/crates/aiken-lang/src/gen_uplc/air.rs b/crates/aiken-lang/src/gen_uplc/air.rs
index b3f2f8e6..cd6d98be 100644
--- a/crates/aiken-lang/src/gen_uplc/air.rs
+++ b/crates/aiken-lang/src/gen_uplc/air.rs
@@ -229,8 +229,4 @@ pub enum Air {
     NoOp,
     FieldsEmpty,
     ListEmpty,
-    MultiValidator {
-        two_arg_name: String,
-        three_arg_name: String,
-    },
 }
diff --git a/crates/aiken-lang/src/gen_uplc/tree.rs b/crates/aiken-lang/src/gen_uplc/tree.rs
index bb14e770..0ac2382c 100644
--- a/crates/aiken-lang/src/gen_uplc/tree.rs
+++ b/crates/aiken-lang/src/gen_uplc/tree.rs
@@ -410,13 +410,6 @@ pub enum AirTree {
         msg: Box<AirTree>,
         then: Box<AirTree>,
     },
-    // End Expressions
-    MultiValidator {
-        two_arg_name: String,
-        two_arg: Box<AirTree>,
-        three_arg_name: String,
-        three_arg: Box<AirTree>,
-    },
 }
 
 impl AirTree {
@@ -1025,20 +1018,6 @@ impl AirTree {
         }
     }
 
-    pub fn multi_validator(
-        two_arg_name: String,
-        two_arg: AirTree,
-        three_arg_name: String,
-        three_arg: AirTree,
-    ) -> AirTree {
-        AirTree::MultiValidator {
-            two_arg_name,
-            two_arg: two_arg.into(),
-            three_arg_name,
-            three_arg: three_arg.into(),
-        }
-    }
-
     pub fn expect_on_list2() -> AirTree {
         let inner_expect_on_list = AirTree::local_var(INNER_EXPECT_ON_LIST, Type::void());
 
@@ -1672,20 +1651,6 @@ impl AirTree {
                 msg.create_air_vec(air_vec);
                 then.create_air_vec(air_vec);
             }
-            AirTree::MultiValidator {
-                two_arg,
-                three_arg,
-                two_arg_name,
-                three_arg_name,
-            } => {
-                air_vec.push(Air::MultiValidator {
-                    two_arg_name: two_arg_name.clone(),
-                    three_arg_name: three_arg_name.clone(),
-                });
-
-                two_arg.create_air_vec(air_vec);
-                three_arg.create_air_vec(air_vec);
-            }
         }
     }
 
@@ -1741,7 +1706,6 @@ impl AirTree {
             | AirTree::FieldsEmpty { then, .. }
             | AirTree::ListEmpty { then, .. }
             | AirTree::NoOp { then } => then.return_type(),
-            AirTree::MultiValidator { .. } => Type::void(),
         }
     }
 
@@ -1819,8 +1783,7 @@ impl AirTree {
             | AirTree::Fn { .. }
             | AirTree::UnOp { .. }
             | AirTree::WrapClause { .. }
-            | AirTree::Finally { .. }
-            | AirTree::MultiValidator { .. } => vec![],
+            | AirTree::Finally { .. } => vec![],
         }
     }
 
@@ -2114,8 +2077,7 @@ impl AirTree {
             | AirTree::Constr { .. }
             | AirTree::RecordUpdate { .. }
             | AirTree::ErrorTerm { .. }
-            | AirTree::Trace { .. }
-            | AirTree::MultiValidator { .. } => {}
+            | AirTree::Trace { .. } => {}
         }
 
         match self {
@@ -2567,25 +2529,6 @@ impl AirTree {
             } => {
                 then.do_traverse_tree_with(tree_path, current_depth + 1, Fields::SecondField, with);
             }
-            AirTree::MultiValidator {
-                two_arg_name: _,
-                two_arg,
-                three_arg_name: _,
-                three_arg,
-            } => {
-                two_arg.do_traverse_tree_with(
-                    tree_path,
-                    current_depth + 1,
-                    Fields::SecondField,
-                    with,
-                );
-                three_arg.do_traverse_tree_with(
-                    tree_path,
-                    current_depth + 1,
-                    Fields::FourthField,
-                    with,
-                )
-            }
         }
 
         with(self, tree_path);
@@ -2960,16 +2903,6 @@ impl AirTree {
                 | AirTree::ErrorTerm { .. } => {
                     panic!("A tree node with no children was encountered with a longer tree path.")
                 }
-                AirTree::MultiValidator {
-                    two_arg_name: _,
-                    two_arg,
-                    three_arg_name: _,
-                    three_arg,
-                } => match field {
-                    Fields::SecondField => two_arg.as_mut().do_find_air_tree_node(tree_path_iter),
-                    Fields::FourthField => three_arg.as_mut().do_find_air_tree_node(tree_path_iter),
-                    _ => panic!("Tree Path index outside tree children nodes"),
-                },
             }
         } else {
             self