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

Remove compiler-generated helper 'global' traces in compact mode. 

Since there's no line number to show here, we don't have much choice. And the alternative of showing shorter traces as code is just ugly as hell.
This commit is contained in:
KtorZ 2024-01-18 16:04:55 +01:00
parent 42fdecf41f
commit 6fa272bd34
No known key found for this signature in database
GPG Key ID: 33173CB6F77F4277
1 changed files with 13 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
crates/aiken-lang/src/gen_uplc/builder.rs
View File

@ -1627,7 +1627,7 @@ pub fn wrap_as_multi_validator(
mint_name: String, mint_name: String,
) -> Term<Name> { ) -> Term<Name> {
match trace { match trace {
TraceLevel::Silent => Term::equals_integer() TraceLevel::Silent | TraceLevel::Compact => Term::equals_integer()
.apply(Term::integer(0.into())) .apply(Term::integer(0.into()))
.apply(Term::var(CONSTR_INDEX_EXPOSER).apply(Term::var("__second_arg"))) .apply(Term::var(CONSTR_INDEX_EXPOSER).apply(Term::var("__second_arg")))
.delayed_if_then_else( .delayed_if_then_else(
@ -1640,16 +1640,12 @@ pub fn wrap_as_multi_validator(
) )
.lambda("__second_arg") .lambda("__second_arg")
.lambda("__first_arg"), .lambda("__first_arg"),
TraceLevel::Verbose | TraceLevel::Compact => { TraceLevel::Verbose => {
let trace_string = match trace { let trace_string = format!(
TraceLevel::Verbose => format!(
"Incorrect redeemer type for validator {}. "Incorrect redeemer type for validator {}.
Double check you have wrapped the redeemer type as specified in your plutus.json", Double check you have wrapped the redeemer type as specified in your plutus.json",
spend_name spend_name
), );
TraceLevel::Compact => "RX".to_string(),
TraceLevel::Silent => unreachable!("Filtered-out from the pattern guards."),
};
let error_term = Term::Error.delayed_trace(Term::var("__incorrect_second_arg_type")); let error_term = Term::Error.delayed_trace(Term::var("__incorrect_second_arg_type"));
@ -1668,22 +1664,14 @@ pub fn wrap_as_multi_validator(
.apply(Term::integer(0.into())) .apply(Term::integer(0.into()))
.apply(Term::var(CONSTR_INDEX_EXPOSER).apply(Term::var("__second_arg"))) .apply(Term::var(CONSTR_INDEX_EXPOSER).apply(Term::var("__second_arg")))
.delayed_if_then_else( .delayed_if_then_else(
if trace == TraceLevel::Verbose { then_term.delayed_trace(Term::string(format!(
then_term.delayed_trace(Term::string(format!( "Running 2 arg validator {}",
"Running 2 arg validator {}", mint_name
mint_name ))),
))) else_term.delayed_trace(Term::string(format!(
} else { "Running 3 arg validator {}",
then_term spend_name
}, ))),
if trace == TraceLevel::Verbose {
else_term.delayed_trace(Term::string(format!(
"Running 3 arg validator {}",
spend_name
)))
} else {
else_term
},
), ),
error_term.clone(), error_term.clone(),
error_term.clone(), error_term.clone(),
@ -1736,10 +1724,7 @@ pub fn cast_validator_args(term: Term<Name>, arguments: &[TypedArg]) -> Term<Nam
pub fn wrap_validator_condition(air_tree: AirTree, trace: TraceLevel) -> AirTree { pub fn wrap_validator_condition(air_tree: AirTree, trace: TraceLevel) -> AirTree {
let success_branch = vec![(air_tree, AirTree::void())]; let success_branch = vec![(air_tree, AirTree::void())];
let otherwise = match trace { let otherwise = match trace {
TraceLevel::Silent => AirTree::error(void(), true), TraceLevel::Silent | TraceLevel::Compact => AirTree::error(void(), true),
TraceLevel::Compact => {
AirTree::trace(AirTree::string("VX"), void(), AirTree::error(void(), true))
}
TraceLevel::Verbose => AirTree::trace( TraceLevel::Verbose => AirTree::trace(
AirTree::string("Validator returned false"), AirTree::string("Validator returned false"),
void(), void(),