From 2572ed6bbd5c2e5772878fa59923ea81778b7ef1 Mon Sep 17 00:00:00 2001 From: rvcas Date: Mon, 19 Sep 2022 16:40:08 -0400 Subject: [PATCH] fix: remove BadTerm --- crates/uplc/src/tx/error.rs | 7 +------ crates/uplc/src/tx/eval.rs | 24 ++++-------------------- 2 files changed, 5 insertions(+), 26 deletions(-) diff --git a/crates/uplc/src/tx/error.rs b/crates/uplc/src/tx/error.rs index 1d4befa2..b20b68f3 100644 --- a/crates/uplc/src/tx/error.rs +++ b/crates/uplc/src/tx/error.rs @@ -1,14 +1,9 @@ -use crate::{ - ast::{NamedDeBruijn, Term}, - machine::{self, cost_model::ExBudget}, -}; +use crate::machine::{self, cost_model::ExBudget}; #[derive(thiserror::Error, Debug)] pub enum Error { #[error("{0}")] Address(#[from] pallas_addresses::Error), - #[error("{}\n\n{:#?}\n\n{}", .0, .1, .2.join("\n"))] - BadTerm(Term, ExBudget, Vec), #[error("Only shelley reward addresses can be a part of withdrawals")] BadWithdrawalAddress, #[error("{0}")] diff --git a/crates/uplc/src/tx/eval.rs b/crates/uplc/src/tx/eval.rs index ceaa25af..c1f8dc0c 100644 --- a/crates/uplc/src/tx/eval.rs +++ b/crates/uplc/src/tx/eval.rs @@ -652,11 +652,7 @@ pub fn eval_redeemer( }; match result { - Ok(term) => { - if !term.is_valid_script_result() { - return Err(Error::BadTerm(term, budget, logs)); - } - } + Ok(_) => (), Err(err) => return Err(Error::Machine(err, budget, logs)), } @@ -707,11 +703,7 @@ pub fn eval_redeemer( }; match result { - Ok(term) => { - if !term.is_valid_script_result() { - return Err(Error::BadTerm(term, budget, logs)); - } - } + Ok(_) => (), Err(err) => return Err(Error::Machine(err, budget, logs)), } @@ -764,11 +756,7 @@ pub fn eval_redeemer( }; match result { - Ok(term) => { - if !term.is_valid_script_result() { - return Err(Error::BadTerm(term, budget, logs)); - } - } + Ok(_) => (), Err(err) => return Err(Error::Machine(err, budget, logs)), } @@ -818,11 +806,7 @@ pub fn eval_redeemer( }; match result { - Ok(term) => { - if !term.is_valid_script_result() { - return Err(Error::BadTerm(term, budget, logs)); - } - } + Ok(_) => (), Err(err) => return Err(Error::Machine(err, budget, logs)), }