From 99c35a64590d251f0d79203a1af8cbe9e7aa991e Mon Sep 17 00:00:00 2001 From: KtorZ Date: Sun, 5 May 2024 14:26:27 +0200 Subject: [PATCH] Add now-necessary type-annotations in tests --- examples/acceptance_tests/077/aiken.lock | 2 +- examples/acceptance_tests/077/validators/spend2.ak | 2 +- examples/acceptance_tests/script_context/aiken.lock | 2 +- examples/acceptance_tests/script_context/plutus.json | 2 +- .../script_context/validators/basic.ak | 12 ++++++------ .../script_context/validators/deploy.ak | 10 +++++----- .../script_context/validators/mint.ak | 8 ++++---- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/examples/acceptance_tests/077/aiken.lock b/examples/acceptance_tests/077/aiken.lock index d6b90d41..c7a3211d 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 = 1714846140, nanos_since_epoch = 960222000 }, "5ee55dc5ccf269bb493f4cacb32096f0191a6adb2ef39d62a1f79b8c5a8fcc7f"] +"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1714911372, nanos_since_epoch = 250896000 }, "5ee55dc5ccf269bb493f4cacb32096f0191a6adb2ef39d62a1f79b8c5a8fcc7f"] diff --git a/examples/acceptance_tests/077/validators/spend2.ak b/examples/acceptance_tests/077/validators/spend2.ak index 08533914..1e84d996 100644 --- a/examples/acceptance_tests/077/validators/spend2.ak +++ b/examples/acceptance_tests/077/validators/spend2.ak @@ -9,7 +9,7 @@ validator { } } -fn find_stuff(context) -> Output { +fn find_stuff(context: ScriptContext) -> Output { expect Some(stuff) = list.find(context.transaction.outputs, fn(_) { True }) stuff } diff --git a/examples/acceptance_tests/script_context/aiken.lock b/examples/acceptance_tests/script_context/aiken.lock index 27e19d02..d390de9f 100644 --- a/examples/acceptance_tests/script_context/aiken.lock +++ b/examples/acceptance_tests/script_context/aiken.lock @@ -13,4 +13,4 @@ requirements = [] source = "github" [etags] -"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1714846166, nanos_since_epoch = 809844000 }, "5ee55dc5ccf269bb493f4cacb32096f0191a6adb2ef39d62a1f79b8c5a8fcc7f"] +"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1714913251, nanos_since_epoch = 578539000 }, "5ee55dc5ccf269bb493f4cacb32096f0191a6adb2ef39d62a1f79b8c5a8fcc7f"] diff --git a/examples/acceptance_tests/script_context/plutus.json b/examples/acceptance_tests/script_context/plutus.json index 8a09a632..354c667a 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+a44ed4c" + "version": "v1.0.26-alpha+f8607b8" } }, "validators": [ diff --git a/examples/acceptance_tests/script_context/validators/basic.ak b/examples/acceptance_tests/script_context/validators/basic.ak index 0a923df9..8f33ec40 100644 --- a/examples/acceptance_tests/script_context/validators/basic.ak +++ b/examples/acceptance_tests/script_context/validators/basic.ak @@ -1,5 +1,6 @@ use aiken/option -use aiken/transaction.{NoDatum, ScriptContext, Spend, TransactionId} +use aiken/transaction.{NoDatum, + ScriptContext, Spend, Transaction, TransactionId} use aiken/transaction/credential.{VerificationKeyCredential} use aiken/transaction/value @@ -14,7 +15,7 @@ validator { } } -fn assert_id(transaction) { +fn assert_id(transaction: Transaction) { transaction.id != TransactionId( #"0000000000000000000000000000000000000000000000000000000000000000", ) @@ -30,14 +31,13 @@ fn assert_purpose(purpose) { } } -fn assert_fee(transaction) { +fn assert_fee(transaction: Transaction) { transaction.fee == value.from_lovelace(42) } -fn assert_outputs(transaction) { +fn assert_outputs(transaction: Transaction) { when transaction.outputs is { - [output] -> - and { + [output] -> and { output.value == value.from_lovelace(1000000000), output.address.payment_credential == VerificationKeyCredential( #"11111111111111111111111111111111111111111111111111111111", diff --git a/examples/acceptance_tests/script_context/validators/deploy.ak b/examples/acceptance_tests/script_context/validators/deploy.ak index 1bdf78cd..7003d412 100644 --- a/examples/acceptance_tests/script_context/validators/deploy.ak +++ b/examples/acceptance_tests/script_context/validators/deploy.ak @@ -1,7 +1,7 @@ use aiken/builtin -use aiken/dict +use aiken/dict.{Dict} use aiken/hash.{blake2b_256} -use aiken/transaction.{DatumHash, InlineDatum, ScriptContext} +use aiken/transaction.{DatumHash, InlineDatum, Output, ScriptContext} use aiken/transaction/credential.{Inline, VerificationKeyCredential} validator { @@ -23,7 +23,7 @@ type MyDatum { MyDatum(Int) } -fn assert_datums(datums) { +fn assert_datums(datums: Dict) { let my_datum = MyDatum(42) expect Some(datum) = @@ -42,7 +42,7 @@ fn assert_outputs(outputs) { } } -fn assert_first_output(output) { +fn assert_first_output(output: Output) { and { output.datum == DatumHash( #"fcaa61fb85676101d9e3398a484674e71c45c3fd41b492682f3b0054f4cf3273", @@ -53,7 +53,7 @@ fn assert_first_output(output) { } } -fn assert_second_output(output) { +fn assert_second_output(output: Output) { and { output.address.stake_credential == Some( Inline( diff --git a/examples/acceptance_tests/script_context/validators/mint.ak b/examples/acceptance_tests/script_context/validators/mint.ak index b2f7d100..c2c28245 100644 --- a/examples/acceptance_tests/script_context/validators/mint.ak +++ b/examples/acceptance_tests/script_context/validators/mint.ak @@ -1,6 +1,6 @@ use aiken/dict use aiken/list -use aiken/transaction.{Mint, ScriptContext} +use aiken/transaction.{Mint, ScriptContext, Transaction} use aiken/transaction/value validator { @@ -13,7 +13,7 @@ validator { } } -fn assert_purpose(ctx) { +fn assert_purpose(ctx: ScriptContext) { expect [my_policy_id] = ctx.transaction.mint |> value.from_minted_value @@ -25,7 +25,7 @@ fn assert_purpose(ctx) { my_policy_id == policy_id } -fn assert_mint(purpose, transaction) { +fn assert_mint(purpose, transaction: Transaction) { expect Mint(policy_id) = purpose let tokens = value.tokens(transaction.mint |> value.from_minted_value, policy_id) @@ -36,7 +36,7 @@ fn assert_mint(purpose, transaction) { } } -fn assert_redeemers(ctx, my_redeemer) { +fn assert_redeemers(ctx: ScriptContext, my_redeemer) { expect Some(Pair(_, redeemer)) = list.find(ctx.transaction.redeemers, fn(kv) { kv.1st == ctx.purpose }) my_redeemer == redeemer && list.length(ctx.transaction.redeemers) == 1