feat: many more tests passing

aiken-lang · Jan 31, 2024 · 77214b1 · 77214b1
1 parent 3178a2e
commit 77214b1
Show file tree

Hide file tree

Showing 3 changed files with 915 additions and 21 deletions.
diff --git a/build.sh b/build.sh
@@ -1,5 +1,5 @@
 #!/opt/homebrew/bin/fish
-aiken build --trace-level verbose
+aiken build
 
 aiken blueprint apply --validator "marlowe.execute" --out plutus.json 581c(cat plutus.json | jq -r '.validators[1].hash')
 

diff --git a/plutus.json b/plutus.json
diff --git a/validators/marlowe.ak b/validators/marlowe.ak
@@ -1,5 +1,4 @@
 use aiken/builtin
-use aiken/cbor
 use aiken/dict
 use aiken/interval.{Finite, Interval, IntervalBound}
 use aiken/list
@@ -270,11 +269,11 @@ type ApplyAction {
 }
 
 validator(validator_hash: ByteArray) {
-  fn execute(datum: Data, redeemer: Data, ctx: ScriptContext) -> Bool {
-    // trace cbor.diagnostic(redeemer)
-    expect datum: MarloweData = datum
-    expect redeemer: MarloweInput = redeemer
-
+  fn execute(
+    datum: MarloweData,
+    redeemer: MarloweInput,
+    ctx: ScriptContext,
+  ) -> Bool {
     let ScriptContext { transaction, purpose } = ctx
     expect Spend(own_out_ref) = purpose
 
@@ -430,25 +429,19 @@ validator(validator_hash: ByteArray) {
                         }
                       },
                     )
-                  trace val |> cbor.diagnostic()
+
                   trace_if_false(greater_eq_value(output_val, val), @"p")
                 }
                 PRole(role) -> {
                   let hsh =
                     dict.find(datums, Datum { currency: marlowe_params, role })
+
                   let addr =
                     Address {
                       payment_credential: ScriptCredential(validator_hash),
                       stake_credential: None,
                     }
 
-                  trace tx_outputs
-                    |> list.length
-                    |> cbor.diagnostic()
-
-                  trace hsh
-                    |> cbor.diagnostic()
-
                   trace_if_false(
                     list.any(
                       tx_outputs,