From b3d0c3ec04493a9d32a5228cbf2f1f0c3b01748d Mon Sep 17 00:00:00 2001 From: microproofs Date: Sat, 4 May 2024 14:26:06 -0400 Subject: [PATCH] fix: fixing tests to account for the new stdlib main. Also added test 75 but commented out for now until a fix is merged --- examples/acceptance_tests/036/aiken.lock | 2 +- examples/acceptance_tests/036/plutus.json | 6 +-- examples/acceptance_tests/047/plutus.json | 2 +- examples/acceptance_tests/054/aiken.lock | 2 +- examples/acceptance_tests/055/aiken.lock | 2 +- examples/acceptance_tests/061/aiken.lock | 2 +- examples/acceptance_tests/061/lib/tests.ak | 4 +- examples/acceptance_tests/063/aiken.lock | 2 +- examples/acceptance_tests/067/aiken.lock | 2 +- examples/acceptance_tests/068/aiken.lock | 2 +- examples/acceptance_tests/069/aiken.lock | 2 +- examples/acceptance_tests/070/aiken.lock | 2 +- examples/acceptance_tests/071/aiken.lock | 2 +- examples/acceptance_tests/071/plutus.json | 2 +- examples/acceptance_tests/072/aiken.lock | 2 +- examples/acceptance_tests/073/aiken.lock | 2 +- examples/acceptance_tests/074/aiken.lock | 2 +- examples/acceptance_tests/075/aiken.lock | 7 ++++ examples/acceptance_tests/075/aiken.toml | 3 ++ examples/acceptance_tests/075/lib/tests.ak | 37 +++++++++++++++++++ examples/acceptance_tests/077/aiken.lock | 2 +- examples/acceptance_tests/077/plutus.json | 34 +++++++++++++++-- .../acceptance_tests/077/validators/spend.ak | 4 +- .../acceptance_tests/077/validators/spend2.ak | 29 +++++++-------- examples/acceptance_tests/079/plutus.json | 2 +- examples/acceptance_tests/082/aiken.lock | 2 +- examples/acceptance_tests/083/aiken.lock | 2 +- examples/acceptance_tests/083/lib/tests.ak | 29 +++++---------- examples/acceptance_tests/084/aiken.lock | 6 +-- examples/acceptance_tests/084/aiken.toml | 2 +- examples/acceptance_tests/086/aiken.lock | 2 +- examples/acceptance_tests/086/plutus.json | 2 +- examples/acceptance_tests/087/aiken.lock | 6 +-- examples/acceptance_tests/087/aiken.toml | 2 +- examples/acceptance_tests/088/aiken.lock | 2 +- examples/acceptance_tests/089/aiken.lock | 6 +-- examples/acceptance_tests/089/aiken.toml | 2 +- examples/acceptance_tests/089/plutus.json | 2 +- examples/acceptance_tests/090/plutus.json | 2 +- examples/acceptance_tests/096/plutus.json | 2 +- .../script_context/aiken.lock | 6 +-- .../script_context/aiken.toml | 2 +- .../script_context/plutus.json | 2 +- 43 files changed, 150 insertions(+), 87 deletions(-) create mode 100644 examples/acceptance_tests/075/aiken.lock create mode 100644 examples/acceptance_tests/075/aiken.toml create mode 100644 examples/acceptance_tests/075/lib/tests.ak diff --git a/examples/acceptance_tests/036/aiken.lock b/examples/acceptance_tests/036/aiken.lock index 092f5960..b48aff3f 100644 --- a/examples/acceptance_tests/036/aiken.lock +++ b/examples/acceptance_tests/036/aiken.lock @@ -13,4 +13,4 @@ requirements = [] source = "github" [etags] -"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1714678414, nanos_since_epoch = 692370000 }, "2a710731e0127ec3e21c6c3962a0254c98602e7428b33fc4fcaa67ab368ce1b1"] +"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1714846145, nanos_since_epoch = 425093000 }, "5ee55dc5ccf269bb493f4cacb32096f0191a6adb2ef39d62a1f79b8c5a8fcc7f"] diff --git a/examples/acceptance_tests/036/plutus.json b/examples/acceptance_tests/036/plutus.json index 0e8ed041..6432017f 100644 --- a/examples/acceptance_tests/036/plutus.json +++ b/examples/acceptance_tests/036/plutus.json @@ -5,7 +5,7 @@ "plutusVersion": "v2", "compiler": { "name": "Aiken", - "version": "v1.0.26-alpha+cdd7f67" + "version": "v1.0.26-alpha+a44ed4c" } }, "validators": [ @@ -42,8 +42,8 @@ "$ref": "#/definitions/Data" } }, - "compiledCode": "58d601000032323232323232222533300432330010013758601460166016600e6ea8c028c01cdd50011129998048008a501325333007333007533300a3253330083370e900118049baa00114bd7009bac300d300a375400264660020026eb0c034c038c028dd518068019129998060008a6103d87a80001323232533300c3371e91105000000000000375c6022006266e95200033010374e00297ae013300500500237586020602200460200046eb0c0380045288a504a094452889980180180098060008a4c26cacae6955ceaab9e5573eae815d0aba201", - "hash": "7726e9cfbd734a0aa846a7fb1648199ae7d746b0ce123c6c6df780ca" + "compiledCode": "58ef01000032323232323232222533300432330010013758601460166016600e6ea8c028c01cdd50011129998048008a501325333007333007533300a3253330083370e900118049baa00114bd6f7b63009bab300d300a375400264660020026eacc034c038c028dd518068019129998060008a60103d87a8000132323232533300d33722911050000000000000021533300d3371e91010500000000000000213374a9000198089ba60014bd700a6103d87a80001330060060033756601c0066eb8c030008c040008c0380045288a504a094452889980180180098060008a4c26cacae6955ceaab9e5573eae815d0aba21", + "hash": "f56561e01063b11146809755d9907147e79d3166aa5c65fba4040fd1" } ], "definitions": { diff --git a/examples/acceptance_tests/047/plutus.json b/examples/acceptance_tests/047/plutus.json index f093fd86..18356818 100644 --- a/examples/acceptance_tests/047/plutus.json +++ b/examples/acceptance_tests/047/plutus.json @@ -5,7 +5,7 @@ "plutusVersion": "v2", "compiler": { "name": "Aiken", - "version": "v1.0.26-alpha+cdd7f67" + "version": "v1.0.26-alpha+a44ed4c" } }, "validators": [ diff --git a/examples/acceptance_tests/054/aiken.lock b/examples/acceptance_tests/054/aiken.lock index d22c6904..b96e70dc 100644 --- a/examples/acceptance_tests/054/aiken.lock +++ b/examples/acceptance_tests/054/aiken.lock @@ -13,4 +13,4 @@ requirements = [] source = "github" [etags] -"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1714678415, nanos_since_epoch = 416054000 }, "2a710731e0127ec3e21c6c3962a0254c98602e7428b33fc4fcaa67ab368ce1b1"] +"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1714846146, nanos_since_epoch = 788255000 }, "5ee55dc5ccf269bb493f4cacb32096f0191a6adb2ef39d62a1f79b8c5a8fcc7f"] diff --git a/examples/acceptance_tests/055/aiken.lock b/examples/acceptance_tests/055/aiken.lock index 51e0c062..2872f54c 100644 --- a/examples/acceptance_tests/055/aiken.lock +++ b/examples/acceptance_tests/055/aiken.lock @@ -13,4 +13,4 @@ requirements = [] source = "github" [etags] -"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1714678412, nanos_since_epoch = 997736000 }, "2a710731e0127ec3e21c6c3962a0254c98602e7428b33fc4fcaa67ab368ce1b1"] +"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1714846144, nanos_since_epoch = 127670000 }, "5ee55dc5ccf269bb493f4cacb32096f0191a6adb2ef39d62a1f79b8c5a8fcc7f"] diff --git a/examples/acceptance_tests/061/aiken.lock b/examples/acceptance_tests/061/aiken.lock index 6045b04d..5ff6a897 100644 --- a/examples/acceptance_tests/061/aiken.lock +++ b/examples/acceptance_tests/061/aiken.lock @@ -13,4 +13,4 @@ requirements = [] source = "github" [etags] -"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1714678416, nanos_since_epoch = 243739000 }, "2a710731e0127ec3e21c6c3962a0254c98602e7428b33fc4fcaa67ab368ce1b1"] +"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1714846142, nanos_since_epoch = 245752000 }, "5ee55dc5ccf269bb493f4cacb32096f0191a6adb2ef39d62a1f79b8c5a8fcc7f"] diff --git a/examples/acceptance_tests/061/lib/tests.ak b/examples/acceptance_tests/061/lib/tests.ak index ee0411cb..912aa64d 100644 --- a/examples/acceptance_tests/061/lib/tests.ak +++ b/examples/acceptance_tests/061/lib/tests.ak @@ -61,7 +61,7 @@ pub fn tx_1() -> Transaction { fee: value.zero(), mint: value.from_asset(#"000000", #"00", -1) |> value.to_minted_value, certificates: [], - withdrawals: dict.new(), + withdrawals: [], validity_range: Interval { lower_bound: IntervalBound { bound_type: PositiveInfinity, @@ -73,7 +73,7 @@ pub fn tx_1() -> Transaction { }, }, extra_signatories: [keyhash], - redeemers: dict.new(), + redeemers: [], datums: dict.new(), id: TransactionId { hash: #"" }, } diff --git a/examples/acceptance_tests/063/aiken.lock b/examples/acceptance_tests/063/aiken.lock index 28cd66ea..f80bb8d3 100644 --- a/examples/acceptance_tests/063/aiken.lock +++ b/examples/acceptance_tests/063/aiken.lock @@ -13,4 +13,4 @@ requirements = [] source = "github" [etags] -"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1714678414, nanos_since_epoch = 603259000 }, "2a710731e0127ec3e21c6c3962a0254c98602e7428b33fc4fcaa67ab368ce1b1"] +"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1714846146, nanos_since_epoch = 83887000 }, "5ee55dc5ccf269bb493f4cacb32096f0191a6adb2ef39d62a1f79b8c5a8fcc7f"] diff --git a/examples/acceptance_tests/067/aiken.lock b/examples/acceptance_tests/067/aiken.lock index 112491e4..315fa395 100644 --- a/examples/acceptance_tests/067/aiken.lock +++ b/examples/acceptance_tests/067/aiken.lock @@ -13,4 +13,4 @@ requirements = [] source = "github" [etags] -"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1714678422, nanos_since_epoch = 502741000 }, "2a710731e0127ec3e21c6c3962a0254c98602e7428b33fc4fcaa67ab368ce1b1"] +"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1714846148, nanos_since_epoch = 777353000 }, "5ee55dc5ccf269bb493f4cacb32096f0191a6adb2ef39d62a1f79b8c5a8fcc7f"] diff --git a/examples/acceptance_tests/068/aiken.lock b/examples/acceptance_tests/068/aiken.lock index 379786fa..63e9d7dc 100644 --- a/examples/acceptance_tests/068/aiken.lock +++ b/examples/acceptance_tests/068/aiken.lock @@ -13,4 +13,4 @@ requirements = [] source = "github" [etags] -"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1714678420, nanos_since_epoch = 593386000 }, "2a710731e0127ec3e21c6c3962a0254c98602e7428b33fc4fcaa67ab368ce1b1"] +"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1714846145, nanos_since_epoch = 834596000 }, "5ee55dc5ccf269bb493f4cacb32096f0191a6adb2ef39d62a1f79b8c5a8fcc7f"] diff --git a/examples/acceptance_tests/069/aiken.lock b/examples/acceptance_tests/069/aiken.lock index 1b5a04ed..5e865764 100644 --- a/examples/acceptance_tests/069/aiken.lock +++ b/examples/acceptance_tests/069/aiken.lock @@ -13,4 +13,4 @@ requirements = [] source = "github" [etags] -"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1714678414, nanos_since_epoch = 78614000 }, "2a710731e0127ec3e21c6c3962a0254c98602e7428b33fc4fcaa67ab368ce1b1"] +"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1714846157, nanos_since_epoch = 982252000 }, "5ee55dc5ccf269bb493f4cacb32096f0191a6adb2ef39d62a1f79b8c5a8fcc7f"] diff --git a/examples/acceptance_tests/070/aiken.lock b/examples/acceptance_tests/070/aiken.lock index d3227755..77f46571 100644 --- a/examples/acceptance_tests/070/aiken.lock +++ b/examples/acceptance_tests/070/aiken.lock @@ -13,4 +13,4 @@ requirements = [] source = "github" [etags] -"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1714678414, nanos_since_epoch = 845310000 }, "2a710731e0127ec3e21c6c3962a0254c98602e7428b33fc4fcaa67ab368ce1b1"] +"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1714846143, nanos_since_epoch = 532140000 }, "5ee55dc5ccf269bb493f4cacb32096f0191a6adb2ef39d62a1f79b8c5a8fcc7f"] diff --git a/examples/acceptance_tests/071/aiken.lock b/examples/acceptance_tests/071/aiken.lock index 4b17f29d..fc527e74 100644 --- a/examples/acceptance_tests/071/aiken.lock +++ b/examples/acceptance_tests/071/aiken.lock @@ -13,4 +13,4 @@ requirements = [] source = "github" [etags] -"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1714678417, nanos_since_epoch = 106832000 }, "2a710731e0127ec3e21c6c3962a0254c98602e7428b33fc4fcaa67ab368ce1b1"] +"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1714846142, nanos_since_epoch = 944680000 }, "5ee55dc5ccf269bb493f4cacb32096f0191a6adb2ef39d62a1f79b8c5a8fcc7f"] diff --git a/examples/acceptance_tests/071/plutus.json b/examples/acceptance_tests/071/plutus.json index 1b1e9fb8..13660199 100644 --- a/examples/acceptance_tests/071/plutus.json +++ b/examples/acceptance_tests/071/plutus.json @@ -5,7 +5,7 @@ "plutusVersion": "v2", "compiler": { "name": "Aiken", - "version": "v1.0.26-alpha+cdd7f67" + "version": "v1.0.26-alpha+a44ed4c" } }, "validators": [ diff --git a/examples/acceptance_tests/072/aiken.lock b/examples/acceptance_tests/072/aiken.lock index 15986681..087a9377 100644 --- a/examples/acceptance_tests/072/aiken.lock +++ b/examples/acceptance_tests/072/aiken.lock @@ -13,4 +13,4 @@ requirements = [] source = "github" [etags] -"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1714678413, nanos_since_epoch = 797509000 }, "2a710731e0127ec3e21c6c3962a0254c98602e7428b33fc4fcaa67ab368ce1b1"] +"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1714846155, nanos_since_epoch = 738816000 }, "5ee55dc5ccf269bb493f4cacb32096f0191a6adb2ef39d62a1f79b8c5a8fcc7f"] diff --git a/examples/acceptance_tests/073/aiken.lock b/examples/acceptance_tests/073/aiken.lock index b06c8c25..59202549 100644 --- a/examples/acceptance_tests/073/aiken.lock +++ b/examples/acceptance_tests/073/aiken.lock @@ -13,4 +13,4 @@ requirements = [] source = "github" [etags] -"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1714678419, nanos_since_epoch = 593445000 }, "2a710731e0127ec3e21c6c3962a0254c98602e7428b33fc4fcaa67ab368ce1b1"] +"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1714846157, nanos_since_epoch = 901159000 }, "5ee55dc5ccf269bb493f4cacb32096f0191a6adb2ef39d62a1f79b8c5a8fcc7f"] diff --git a/examples/acceptance_tests/074/aiken.lock b/examples/acceptance_tests/074/aiken.lock index 5a5d9917..bcc19200 100644 --- a/examples/acceptance_tests/074/aiken.lock +++ b/examples/acceptance_tests/074/aiken.lock @@ -13,4 +13,4 @@ requirements = [] source = "github" [etags] -"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1714678419, nanos_since_epoch = 106684000 }, "2a710731e0127ec3e21c6c3962a0254c98602e7428b33fc4fcaa67ab368ce1b1"] +"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1714846157, nanos_since_epoch = 827789000 }, "5ee55dc5ccf269bb493f4cacb32096f0191a6adb2ef39d62a1f79b8c5a8fcc7f"] diff --git a/examples/acceptance_tests/075/aiken.lock b/examples/acceptance_tests/075/aiken.lock new file mode 100644 index 00000000..6e350cda --- /dev/null +++ b/examples/acceptance_tests/075/aiken.lock @@ -0,0 +1,7 @@ +# This file was generated by Aiken +# You typically do not need to edit this file + +requirements = [] +packages = [] + +[etags] diff --git a/examples/acceptance_tests/075/aiken.toml b/examples/acceptance_tests/075/aiken.toml new file mode 100644 index 00000000..71fd3f18 --- /dev/null +++ b/examples/acceptance_tests/075/aiken.toml @@ -0,0 +1,3 @@ +name = 'aiken-lang/acceptance_test_075' +version = '0.0.0' +description = '' diff --git a/examples/acceptance_tests/075/lib/tests.ak b/examples/acceptance_tests/075/lib/tests.ak new file mode 100644 index 00000000..663355d9 --- /dev/null +++ b/examples/acceptance_tests/075/lib/tests.ak @@ -0,0 +1,37 @@ +// pub opaque type Dict { +// inner: List>, +// } + +// pub fn constant(a: a) -> Fuzzer { +// fn(s0) { Some((s0, a)) } +// } + +// pub fn map(fuzz_a: Fuzzer, f: fn(a) -> b) -> Fuzzer { +// fn(s0) { +// when fuzz_a(s0) is { +// Some((s1, a)) -> Some((s1, f(a))) +// None -> None +// } +// } +// } + +// // NOTE: Inlining `do_list` fixes the problem. But the indirection here causes: +// // +// // --> Type mismatch expected 'pair data data' got 'data' +// pub fn list(fuzzer: Fuzzer) -> Fuzzer> { +// do_list(fuzzer, []) +// } + +// fn do_list(fuzzer, xs) -> Fuzzer> { +// let x <- map(fuzzer) +// [x, ..xs] +// } + +// pub fn dict() -> Fuzzer> { +// list(constant(Pair(1, True))) +// |> map(fn(inner) { Dict { inner } }) +// } + +// test prop_dict_between(_d via dict()) { +// True +// } diff --git a/examples/acceptance_tests/077/aiken.lock b/examples/acceptance_tests/077/aiken.lock index 0a6f7851..d6b90d41 100644 --- a/examples/acceptance_tests/077/aiken.lock +++ b/examples/acceptance_tests/077/aiken.lock @@ -13,4 +13,4 @@ requirements = [] source = "github" [etags] -"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1714678411, nanos_since_epoch = 533080000 }, "2a710731e0127ec3e21c6c3962a0254c98602e7428b33fc4fcaa67ab368ce1b1"] +"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1714846140, nanos_since_epoch = 960222000 }, "5ee55dc5ccf269bb493f4cacb32096f0191a6adb2ef39d62a1f79b8c5a8fcc7f"] diff --git a/examples/acceptance_tests/077/plutus.json b/examples/acceptance_tests/077/plutus.json index 8795ceb0..dd53fa48 100644 --- a/examples/acceptance_tests/077/plutus.json +++ b/examples/acceptance_tests/077/plutus.json @@ -5,7 +5,7 @@ "plutusVersion": "v2", "compiler": { "name": "Aiken", - "version": "v1.0.26-alpha+cdd7f67" + "version": "v1.0.26-alpha+a44ed4c" } }, "validators": [ @@ -31,8 +31,25 @@ } } ], - "compiledCode": "5901bc010000323232323232322322232323225333009323232533300c3007300d3754002264646464a666026602c00426464a666024601a60266ea803854ccc048c8cc004004018894ccc05c004528099299980a99baf301a30173754603400402429444cc00c00c004c06800454ccc048c0300044cdc78010080a501616375a602c602e0046eb8c05400458dd6180a0009991192999808980598091baa00114bd7009bac301630133754002646600200200644a66602a002298103d87a8000132323253330153371e00c6eb8c06800c4cdd2a4000660326e9c0052f5c026600a00a0046eb0c064c068008c064008dd6180b80099198008009bac3014301530153015301500322533301300114bd70099191919299980a19b8f4881000021003133018374e660306ea4008cc060dd3800a5eb80cc01801800cdd6180c180c8019bae301700230170023758602a0026eb8c04cc040dd50019bac3012001300e37540042c60206022004601e00260166ea80045261365632533300830030011533300b300a37540082930b0a99980418010008a99980598051baa00414985858c020dd50019b8748008dc3a40006eb80055cd2ab9d5573caae7d5d02ba15745", - "hash": "3dea1be2920aef692e0bcb894a17a984541682359c8c2b04679fca75" + "compiledCode": "5901cc010000323232323232322322232323225333009323232533300c3007300d3754002264646464a666026602c00426464a666024601a60266ea803854ccc048c8cc004004018894ccc05c004528099299980a99baf301a30173754603400402429444cc00c00c004c06800454ccc048c0300044cdc78010080a501616375a60260046eb8c04400458c050004c94ccc03cc024c040dd50008a5eb7bdb1804dd5980a18089baa00132323300100132330010013756602c602e602e602e602e00a44a66602a002297adef6c6013232323253330163372291100002153330163371e9101000021003100513301a337606ea4008dd3000998030030019bab3017003375c602a0046032004602e00244a666028002298103d87a800013232323253330153372200e0042a66602a66e3c01c0084cdd2a4000660326e980052f5c02980103d87a80001330060060033756602c0066eb8c050008c060008c058004dd7180998081baa00337586024002601c6ea800858c040c044008c03c004c02cdd50008a4c26cac64a66601060060022a66601660146ea8010526161533300830020011533300b300a37540082930b0b18041baa003370e90011b8748000dd7000ab9a5573aaae7955cfaba05742ae89", + "hash": "df50e06b40d42b2c399ebcec4c2a8e51a6b28ef99790d950cc251caa" + }, + { + "title": "spend2.backtrace", + "datum": { + "title": "_datum", + "schema": { + "$ref": "#/definitions/Void" + } + }, + "redeemer": { + "title": "_redeemer", + "schema": { + "$ref": "#/definitions/Void" + } + }, + "compiledCode": "58ad010000323232323232322323223225333007533300730053008375464660020026eb0c034c038c038c028dd5180698051baa00222533300c00114c0103d87a800013232533300b4a2266e9520003300f0024bd70099802002000980800118070008a511614984d958c94ccc018c010c01c00454ccc024c0200045261616375400264a6660086004600a0022a66600e600c0022930b0b1baa002370e90002b9a5573aaae7955cfaba05742ae881", + "hash": "aae5a1fcf239d541c67a7efb006436be41c5ee7f6f4a8fd7b39b97a8" } ], "definitions": { @@ -42,6 +59,17 @@ "Int": { "dataType": "integer" }, + "Void": { + "title": "Unit", + "description": "The nullary constructor.", + "anyOf": [ + { + "dataType": "constructor", + "index": 0, + "fields": [] + } + ] + }, "aiken/transaction/OutputReference": { "title": "OutputReference", "description": "An `OutputReference` is a unique reference to an output on-chain. The `output_index`\n corresponds to the position in the output list of the transaction (identified by its id)\n that produced that output", diff --git a/examples/acceptance_tests/077/validators/spend.ak b/examples/acceptance_tests/077/validators/spend.ak index 86ca3f22..d0615fa0 100644 --- a/examples/acceptance_tests/077/validators/spend.ak +++ b/examples/acceptance_tests/077/validators/spend.ak @@ -14,11 +14,11 @@ validator(token_name: ByteArray, utxo_ref: OutputReference) { let ScriptContext { transaction, purpose } = ctx expect tx.Mint(policy_id) = purpose let Transaction { inputs, mint, .. } = transaction - expect [(asset_name, amount)] = + expect [Pair(asset_name, amount)] = mint |> value.from_minted_value |> value.tokens(policy_id) - |> dict.to_list() + |> dict.to_alist() when rdmr is { Mint -> { expect diff --git a/examples/acceptance_tests/077/validators/spend2.ak b/examples/acceptance_tests/077/validators/spend2.ak index 6ce6daa6..08533914 100644 --- a/examples/acceptance_tests/077/validators/spend2.ak +++ b/examples/acceptance_tests/077/validators/spend2.ak @@ -1,18 +1,15 @@ -// use aiken/list -// use aiken/transaction.{Output, ScriptContext} +use aiken/list +use aiken/transaction.{Output, ScriptContext} -// validator { -// fn backtrace(_datum: Void, _redeemer: Void, context: ScriptContext) -> Bool { -// expect Some(_) = -// list.find(context.transaction.outputs, fn(_) { True }) -// let _ = -// find_stuff(context) -// True -// } -// } +validator { + fn backtrace(_datum: Void, _redeemer: Void, context: ScriptContext) -> Bool { + expect Some(_) = list.find(context.transaction.outputs, fn(_) { True }) + let _ = find_stuff(context) + True + } +} -// fn find_stuff(context) -> Output { -// expect Some(stuff) = -// list.find(context.transaction.outputs, fn(_) { True }) -// stuff -// } +fn find_stuff(context) -> Output { + expect Some(stuff) = list.find(context.transaction.outputs, fn(_) { True }) + stuff +} diff --git a/examples/acceptance_tests/079/plutus.json b/examples/acceptance_tests/079/plutus.json index 5061d198..a66157e8 100644 --- a/examples/acceptance_tests/079/plutus.json +++ b/examples/acceptance_tests/079/plutus.json @@ -5,7 +5,7 @@ "plutusVersion": "v2", "compiler": { "name": "Aiken", - "version": "v1.0.26-alpha+cdd7f67" + "version": "v1.0.26-alpha+a44ed4c" } }, "validators": [ diff --git a/examples/acceptance_tests/082/aiken.lock b/examples/acceptance_tests/082/aiken.lock index f9f493f6..c1e878fd 100644 --- a/examples/acceptance_tests/082/aiken.lock +++ b/examples/acceptance_tests/082/aiken.lock @@ -13,4 +13,4 @@ requirements = [] source = "github" [etags] -"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1714678414, nanos_since_epoch = 850404000 }, "2a710731e0127ec3e21c6c3962a0254c98602e7428b33fc4fcaa67ab368ce1b1"] +"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1714846145, nanos_since_epoch = 960294000 }, "5ee55dc5ccf269bb493f4cacb32096f0191a6adb2ef39d62a1f79b8c5a8fcc7f"] diff --git a/examples/acceptance_tests/083/aiken.lock b/examples/acceptance_tests/083/aiken.lock index 9751ac4c..93321d15 100644 --- a/examples/acceptance_tests/083/aiken.lock +++ b/examples/acceptance_tests/083/aiken.lock @@ -13,4 +13,4 @@ requirements = [] source = "github" [etags] -"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1714678411, nanos_since_epoch = 536024000 }, "2a710731e0127ec3e21c6c3962a0254c98602e7428b33fc4fcaa67ab368ce1b1"] +"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1714846142, nanos_since_epoch = 654244000 }, "5ee55dc5ccf269bb493f4cacb32096f0191a6adb2ef39d62a1f79b8c5a8fcc7f"] diff --git a/examples/acceptance_tests/083/lib/tests.ak b/examples/acceptance_tests/083/lib/tests.ak index 3ec19658..6820bbc6 100644 --- a/examples/acceptance_tests/083/lib/tests.ak +++ b/examples/acceptance_tests/083/lib/tests.ak @@ -41,16 +41,16 @@ test dict_test1() { let (ask_map, asize, offer_map, osize) = ( - dict.from_list([(ask_input_ref, transaction.NoDatum)], compare_out_ref), + [Pair(ask_input_ref, transaction.NoDatum)], 1, - dict.from_list([(offer_input_ref, transaction.NoDatum)], compare_out_ref), + [Pair(offer_input_ref, transaction.NoDatum)], 1, ) (ask_map, asize, offer_map, osize) == ( - dict.from_list([(ask_input_ref, transaction.NoDatum)], compare_out_ref), + [Pair(ask_input_ref, transaction.NoDatum)], 1, - dict.from_list([(offer_input_ref, transaction.NoDatum)], compare_out_ref), + [Pair(offer_input_ref, transaction.NoDatum)], 1, ) } @@ -62,14 +62,9 @@ test dict_test2() { [(ask_input_ref, offer_input_ref)] let foo = - fn(pair: (OutputReference, OutputReference), acc: Dict) { + fn(pair: (OutputReference, OutputReference), acc: Dict) { let new_pay_map = - dict.insert( - acc, - value.zero(), - Address(VerificationKeyCredential("00"), None), - compare_value("", "", _, _), - ) + dict.insert(acc, "", Address(VerificationKeyCredential("00"), None)) new_pay_map } @@ -87,21 +82,17 @@ test dict_test3() { let (ask_map, asize, offer_map, osize) = ( - dict.from_list([(ask_input_ref, transaction.NoDatum)], compare_out_ref), + [Pair(ask_input_ref, transaction.NoDatum)], 1, - dict.from_list([(offer_input_ref, transaction.NoDatum)], compare_out_ref), + [Pair(offer_input_ref, transaction.NoDatum)], 1, ) + // TODO: Maybe passing Value to the key generic of dict shouldn't be possible let foo = fn(pair: (OutputReference, OutputReference), acc: Dict) { let new_pay_map = - dict.insert( - acc, - value.zero(), - Address(VerificationKeyCredential("00"), None), - compare_value("", "", _, _), - ) + dict.insert(acc, "", Address(VerificationKeyCredential("00"), None)) new_pay_map } diff --git a/examples/acceptance_tests/084/aiken.lock b/examples/acceptance_tests/084/aiken.lock index c511d689..b070d613 100644 --- a/examples/acceptance_tests/084/aiken.lock +++ b/examples/acceptance_tests/084/aiken.lock @@ -3,14 +3,14 @@ [[requirements]] name = "aiken-lang/stdlib" -version = "specialize-dict-key" +version = "main" source = "github" [[packages]] name = "aiken-lang/stdlib" -version = "specialize-dict-key" +version = "main" requirements = [] source = "github" [etags] -"aiken-lang/stdlib@specialize-dict-key" = [{ secs_since_epoch = 1714678422, nanos_since_epoch = 633452000 }, "4a471c3bad39d9bd642bb8ae80c5e90585cc4d79315de7d5b4277a2f00994714"] +"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1714846140, nanos_since_epoch = 959446000 }, "5ee55dc5ccf269bb493f4cacb32096f0191a6adb2ef39d62a1f79b8c5a8fcc7f"] diff --git a/examples/acceptance_tests/084/aiken.toml b/examples/acceptance_tests/084/aiken.toml index 7a3cc40d..dce5f766 100644 --- a/examples/acceptance_tests/084/aiken.toml +++ b/examples/acceptance_tests/084/aiken.toml @@ -4,5 +4,5 @@ description = "" [[dependencies]] name = 'aiken-lang/stdlib' -version = 'specialize-dict-key' +version = 'main' source = 'github' diff --git a/examples/acceptance_tests/086/aiken.lock b/examples/acceptance_tests/086/aiken.lock index a0a306b9..eca5643c 100644 --- a/examples/acceptance_tests/086/aiken.lock +++ b/examples/acceptance_tests/086/aiken.lock @@ -13,4 +13,4 @@ requirements = [] source = "github" [etags] -"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1714678426, nanos_since_epoch = 730465000 }, "2a710731e0127ec3e21c6c3962a0254c98602e7428b33fc4fcaa67ab368ce1b1"] +"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1714846146, nanos_since_epoch = 131250000 }, "5ee55dc5ccf269bb493f4cacb32096f0191a6adb2ef39d62a1f79b8c5a8fcc7f"] diff --git a/examples/acceptance_tests/086/plutus.json b/examples/acceptance_tests/086/plutus.json index 75bb2ca0..82104af5 100644 --- a/examples/acceptance_tests/086/plutus.json +++ b/examples/acceptance_tests/086/plutus.json @@ -5,7 +5,7 @@ "plutusVersion": "v2", "compiler": { "name": "Aiken", - "version": "v1.0.26-alpha+cdd7f67" + "version": "v1.0.26-alpha+a44ed4c" } }, "validators": [ diff --git a/examples/acceptance_tests/087/aiken.lock b/examples/acceptance_tests/087/aiken.lock index 0f594000..44a98618 100644 --- a/examples/acceptance_tests/087/aiken.lock +++ b/examples/acceptance_tests/087/aiken.lock @@ -3,14 +3,14 @@ [[requirements]] name = "aiken-lang/stdlib" -version = "specialize-dict-key" +version = "main" source = "github" [[packages]] name = "aiken-lang/stdlib" -version = "specialize-dict-key" +version = "main" requirements = [] source = "github" [etags] -"aiken-lang/stdlib@specialize-dict-key" = [{ secs_since_epoch = 1714678415, nanos_since_epoch = 599042000 }, "4a471c3bad39d9bd642bb8ae80c5e90585cc4d79315de7d5b4277a2f00994714"] +"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1714846153, nanos_since_epoch = 630488000 }, "5ee55dc5ccf269bb493f4cacb32096f0191a6adb2ef39d62a1f79b8c5a8fcc7f"] diff --git a/examples/acceptance_tests/087/aiken.toml b/examples/acceptance_tests/087/aiken.toml index 0de921eb..b4ae8714 100644 --- a/examples/acceptance_tests/087/aiken.toml +++ b/examples/acceptance_tests/087/aiken.toml @@ -4,5 +4,5 @@ description = "" [[dependencies]] name = "aiken-lang/stdlib" -version = "specialize-dict-key" +version = "main" source = "github" diff --git a/examples/acceptance_tests/088/aiken.lock b/examples/acceptance_tests/088/aiken.lock index 644f385d..cc4f4f09 100644 --- a/examples/acceptance_tests/088/aiken.lock +++ b/examples/acceptance_tests/088/aiken.lock @@ -13,4 +13,4 @@ requirements = [] source = "github" [etags] -"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1714678427, nanos_since_epoch = 715353000 }, "2a710731e0127ec3e21c6c3962a0254c98602e7428b33fc4fcaa67ab368ce1b1"] +"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1714846156, nanos_since_epoch = 334155000 }, "5ee55dc5ccf269bb493f4cacb32096f0191a6adb2ef39d62a1f79b8c5a8fcc7f"] diff --git a/examples/acceptance_tests/089/aiken.lock b/examples/acceptance_tests/089/aiken.lock index 56f82bde..81487160 100644 --- a/examples/acceptance_tests/089/aiken.lock +++ b/examples/acceptance_tests/089/aiken.lock @@ -3,14 +3,14 @@ [[requirements]] name = "aiken-lang/stdlib" -version = "specialize-dict-key" +version = "main" source = "github" [[packages]] name = "aiken-lang/stdlib" -version = "specialize-dict-key" +version = "main" requirements = [] source = "github" [etags] -"aiken-lang/stdlib@specialize-dict-key" = [{ secs_since_epoch = 1714678897, nanos_since_epoch = 548816000 }, "2d7b2d2c079b953fd7e68406ed5e91ff64cb7e7fec2529882443649710fdc4ba"] +"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1714846143, nanos_since_epoch = 632455000 }, "5ee55dc5ccf269bb493f4cacb32096f0191a6adb2ef39d62a1f79b8c5a8fcc7f"] diff --git a/examples/acceptance_tests/089/aiken.toml b/examples/acceptance_tests/089/aiken.toml index 3e3d7dd1..ff0ea909 100644 --- a/examples/acceptance_tests/089/aiken.toml +++ b/examples/acceptance_tests/089/aiken.toml @@ -4,5 +4,5 @@ description = "" [[dependencies]] name = 'aiken-lang/stdlib' -version = 'specialize-dict-key' +version = 'main' source = 'github' diff --git a/examples/acceptance_tests/089/plutus.json b/examples/acceptance_tests/089/plutus.json index e9642af8..2420265c 100644 --- a/examples/acceptance_tests/089/plutus.json +++ b/examples/acceptance_tests/089/plutus.json @@ -5,7 +5,7 @@ "plutusVersion": "v2", "compiler": { "name": "Aiken", - "version": "v1.0.26-alpha+cdd7f67" + "version": "v1.0.26-alpha+a44ed4c" } }, "validators": [ diff --git a/examples/acceptance_tests/090/plutus.json b/examples/acceptance_tests/090/plutus.json index 3ae7255f..cdb728b4 100644 --- a/examples/acceptance_tests/090/plutus.json +++ b/examples/acceptance_tests/090/plutus.json @@ -5,7 +5,7 @@ "plutusVersion": "v2", "compiler": { "name": "Aiken", - "version": "v1.0.26-alpha+cdd7f67" + "version": "v1.0.26-alpha+a44ed4c" } }, "validators": [ diff --git a/examples/acceptance_tests/096/plutus.json b/examples/acceptance_tests/096/plutus.json index c6416ba7..4c151360 100644 --- a/examples/acceptance_tests/096/plutus.json +++ b/examples/acceptance_tests/096/plutus.json @@ -6,7 +6,7 @@ "plutusVersion": "v2", "compiler": { "name": "Aiken", - "version": "v1.0.26-alpha+cdd7f67" + "version": "v1.0.26-alpha+a44ed4c" }, "license": "Apache-2.0" }, diff --git a/examples/acceptance_tests/script_context/aiken.lock b/examples/acceptance_tests/script_context/aiken.lock index 26068886..27e19d02 100644 --- a/examples/acceptance_tests/script_context/aiken.lock +++ b/examples/acceptance_tests/script_context/aiken.lock @@ -3,14 +3,14 @@ [[requirements]] name = "aiken-lang/stdlib" -version = "specialize-dict-key" +version = "main" source = "github" [[packages]] name = "aiken-lang/stdlib" -version = "specialize-dict-key" +version = "main" requirements = [] source = "github" [etags] -"aiken-lang/stdlib@specialize-dict-key" = [{ secs_since_epoch = 1714679026, nanos_since_epoch = 100733000 }, "2d7b2d2c079b953fd7e68406ed5e91ff64cb7e7fec2529882443649710fdc4ba"] +"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1714846166, nanos_since_epoch = 809844000 }, "5ee55dc5ccf269bb493f4cacb32096f0191a6adb2ef39d62a1f79b8c5a8fcc7f"] diff --git a/examples/acceptance_tests/script_context/aiken.toml b/examples/acceptance_tests/script_context/aiken.toml index 0bbb62d3..f0bf62fc 100644 --- a/examples/acceptance_tests/script_context/aiken.toml +++ b/examples/acceptance_tests/script_context/aiken.toml @@ -4,5 +4,5 @@ description = '' [[dependencies]] name = 'aiken-lang/stdlib' -version = 'specialize-dict-key' +version = 'main' source = 'github' diff --git a/examples/acceptance_tests/script_context/plutus.json b/examples/acceptance_tests/script_context/plutus.json index 6fac6caa..8a09a632 100644 --- a/examples/acceptance_tests/script_context/plutus.json +++ b/examples/acceptance_tests/script_context/plutus.json @@ -5,7 +5,7 @@ "plutusVersion": "v2", "compiler": { "name": "Aiken", - "version": "v1.0.26-alpha+cdd7f67" + "version": "v1.0.26-alpha+a44ed4c" } }, "validators": [