waalge/aiken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: remove BadTerm

Browse Source
This commit is contained in:
rvcas
2022-09-19 16:40:08 -04:00
parent 169fa05572
commit 2572ed6bbd
2 changed files with 5 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
crates/uplc/src/tx/error.rs
View File

@@ -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<NamedDeBruijn>, ExBudget, Vec<String>),
#[error("Only shelley reward addresses can be a part of withdrawals")]
BadWithdrawalAddress,
#[error("{0}")]

24
crates/uplc/src/tx/eval.rs
View File

@@ -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)),
}