From 5132110d4bc3bec99354fb8e50702e6766262125 Mon Sep 17 00:00:00 2001 From: KtorZ Date: Sat, 18 Feb 2023 09:48:05 +0100 Subject: [PATCH] Fix acceptance tests to use new syntax. --- examples/acceptance_tests/032/lib/tests.ak | 4 ++-- examples/acceptance_tests/036/aiken.lock | 4 ++-- examples/acceptance_tests/036/aiken.toml | 7 ++++--- examples/acceptance_tests/054/aiken.lock | 4 ++-- examples/acceptance_tests/054/aiken.toml | 7 ++++--- examples/acceptance_tests/055/aiken.lock | 4 ++-- examples/acceptance_tests/055/aiken.toml | 7 ++++--- examples/acceptance_tests/062/tmp | 2 -- examples/acceptance_tests/063/aiken.toml | 2 +- examples/acceptance_tests/063/lib/tests.ak | 2 +- .../acceptance_tests/script_context/validators/basic.ak | 4 ++-- .../acceptance_tests/script_context/validators/deploy.ak | 4 ++-- .../acceptance_tests/script_context/validators/mint.ak | 2 +- .../script_context/validators/withdrawals.ak | 4 ++-- examples/hello_world/aiken.lock | 4 ++-- examples/hello_world/aiken.toml | 8 +++++--- examples/hello_world/validators/hello_world.ak | 4 +--- 17 files changed, 37 insertions(+), 36 deletions(-) delete mode 100644 examples/acceptance_tests/062/tmp diff --git a/examples/acceptance_tests/032/lib/tests.ak b/examples/acceptance_tests/032/lib/tests.ak index 2c2326b4..8ad32f16 100644 --- a/examples/acceptance_tests/032/lib/tests.ak +++ b/examples/acceptance_tests/032/lib/tests.ak @@ -10,10 +10,10 @@ fn concat(left: String, right: String) -> String { fn is_negative(i: Int) -> Bool { if i < 0 { - trace "is negative" + trace @"is negative" True } else { - trace concat("is", concat(" ", "non-negative")) + trace concat(@"is", concat(@" ", @"non-negative")) False } } diff --git a/examples/acceptance_tests/036/aiken.lock b/examples/acceptance_tests/036/aiken.lock index 550023f7..0423f31b 100644 --- a/examples/acceptance_tests/036/aiken.lock +++ b/examples/acceptance_tests/036/aiken.lock @@ -3,11 +3,11 @@ [[requirements]] name = "aiken-lang/stdlib" -version = "3b47c89006e7580c2213370d7426ed2a38d2836e" +version = "main" source = "github" [[packages]] name = "aiken-lang/stdlib" -version = "3b47c89006e7580c2213370d7426ed2a38d2836e" +version = "main" requirements = [] source = "github" diff --git a/examples/acceptance_tests/036/aiken.toml b/examples/acceptance_tests/036/aiken.toml index 32640c11..8147c157 100644 --- a/examples/acceptance_tests/036/aiken.toml +++ b/examples/acceptance_tests/036/aiken.toml @@ -1,6 +1,7 @@ name = "aiken-lang/acceptance_test_036" version = "0.0.0" -dependencies = [ - { name = "aiken-lang/stdlib", version = "3b47c89006e7580c2213370d7426ed2a38d2836e", source = "github" }, -] +[[dependencies]] +name = 'aiken-lang/stdlib' +version = 'main' +source = 'github' diff --git a/examples/acceptance_tests/054/aiken.lock b/examples/acceptance_tests/054/aiken.lock index d9cf5aff..0423f31b 100644 --- a/examples/acceptance_tests/054/aiken.lock +++ b/examples/acceptance_tests/054/aiken.lock @@ -3,11 +3,11 @@ [[requirements]] name = "aiken-lang/stdlib" -version = "1cedbe85b7c7e9c4036d63d45cad4ced27b0d50b" +version = "main" source = "github" [[packages]] name = "aiken-lang/stdlib" -version = "1cedbe85b7c7e9c4036d63d45cad4ced27b0d50b" +version = "main" requirements = [] source = "github" diff --git a/examples/acceptance_tests/054/aiken.toml b/examples/acceptance_tests/054/aiken.toml index e2810ab2..17ae1181 100644 --- a/examples/acceptance_tests/054/aiken.toml +++ b/examples/acceptance_tests/054/aiken.toml @@ -1,6 +1,7 @@ name = "aiken-lang/acceptance_test_054" version = "0.0.0" -dependencies = [ - { name = "aiken-lang/stdlib", version = "1cedbe85b7c7e9c4036d63d45cad4ced27b0d50b", source = "github" }, -] +[[dependencies]] +name = 'aiken-lang/stdlib' +version = 'main' +source = 'github' diff --git a/examples/acceptance_tests/055/aiken.lock b/examples/acceptance_tests/055/aiken.lock index 550023f7..0423f31b 100644 --- a/examples/acceptance_tests/055/aiken.lock +++ b/examples/acceptance_tests/055/aiken.lock @@ -3,11 +3,11 @@ [[requirements]] name = "aiken-lang/stdlib" -version = "3b47c89006e7580c2213370d7426ed2a38d2836e" +version = "main" source = "github" [[packages]] name = "aiken-lang/stdlib" -version = "3b47c89006e7580c2213370d7426ed2a38d2836e" +version = "main" requirements = [] source = "github" diff --git a/examples/acceptance_tests/055/aiken.toml b/examples/acceptance_tests/055/aiken.toml index 1a35f90d..97e0ed2e 100644 --- a/examples/acceptance_tests/055/aiken.toml +++ b/examples/acceptance_tests/055/aiken.toml @@ -1,6 +1,7 @@ name = "aiken-lang/acceptance_test_055" version = "0.0.0" -dependencies = [ - { name = "aiken-lang/stdlib", version="3b47c89006e7580c2213370d7426ed2a38d2836e", source = "github" }, -] +[[dependencies]] +name = 'aiken-lang/stdlib' +version = 'main' +source = 'github' diff --git a/examples/acceptance_tests/062/tmp b/examples/acceptance_tests/062/tmp deleted file mode 100644 index 1f301610..00000000 --- a/examples/acceptance_tests/062/tmp +++ /dev/null @@ -1,2 +0,0 @@ - -let foo = Module { name: "tests", docs: [], type_info: (), definitions: [Fn(Function { arguments: [Arg { arg_name: Named { name: "signatories", label: "signatories", location: 18..29 }, location: 18..29, annotation: None, tipo: () }], body: When { location: 35..154, subjects: [Var { location: 40..51, name: "signatories" }], clauses: [Clause { location: 61..115, pattern: [List { location: 61..63, elements: [], tail: None }], alternative_patterns: [], guard: None, then: Trace { kind: Trace, location: 75..109, then: Var { location: 104..109, name: "False" }, text: String { location: 81..97, value: "no signatories" } } }, Clause { location: 120..150, pattern: [List { location: 120..129, elements: [Var { location: 121..124, name: "sig" }], tail: Some(Discard { name: "_", location: 128..129 }) }], alternative_patterns: [], guard: None, then: TraceIfFalse { location: 133..150, value: BinOp { location: 134..148, name: Eq, left: Var { location: 134..137, name: "sig" }, right: String { location: 141..148, value: "#ffff" } } } }] }, doc: None, location: 0..30, name: "must_be_signed", public: false, return_annotation: None, return_type: (), end_position: 155 }), Fn(Function { arguments: [], body: Var { location: 182..186, name: "True" }, doc: None, location: 158..177, name: "must_say_hello", public: false, return_annotation: None, return_type: (), end_position: 187 }), Test(Function { arguments: [], body: BinOp { location: 205..260, name: Or, left: BinOp { location: 205..252, name: And, left: TraceIfFalse { location: 205..231, value: Call { arguments: [CallArg { label: None, location: 220..229, value: List { location: 220..229, elements: [String { location: 221..228, value: "#f000" }], tail: None } }], fun: Var { location: 205..219, name: "must_be_signed" }, location: 205..230 } }, right: TraceIfFalse { location: 235..252, value: Call { arguments: [], fun: Var { location: 235..249, name: "must_say_hello" }, location: 235..251 } } }, right: Var { location: 256..260, name: "True" } }, doc: None, location: 190..200, name: "foo", public: false, return_annotation: None, return_type: (), end_position: 261 })], kind: Lib }; diff --git a/examples/acceptance_tests/063/aiken.toml b/examples/acceptance_tests/063/aiken.toml index 1b2e4d85..7ddf487c 100644 --- a/examples/acceptance_tests/063/aiken.toml +++ b/examples/acceptance_tests/063/aiken.toml @@ -1,4 +1,4 @@ -name = 'aiken-lang/acceptance_test_061' +name = 'aiken-lang/acceptance_test_063' version = '0.0.0' description = '' diff --git a/examples/acceptance_tests/063/lib/tests.ak b/examples/acceptance_tests/063/lib/tests.ak index e6175dd0..60afb373 100644 --- a/examples/acceptance_tests/063/lib/tests.ak +++ b/examples/acceptance_tests/063/lib/tests.ak @@ -1,7 +1,7 @@ fn must_be_signed(signatories) { when signatories is { [] -> { - trace "no signatories" + trace @"no signatories" False } [sig, ..] -> (sig == "#ffff")? diff --git a/examples/acceptance_tests/script_context/validators/basic.ak b/examples/acceptance_tests/script_context/validators/basic.ak index a2575c42..57b3f37a 100644 --- a/examples/acceptance_tests/script_context/validators/basic.ak +++ b/examples/acceptance_tests/script_context/validators/basic.ak @@ -28,7 +28,7 @@ fn assert_purpose(purpose) { ref.transaction_id == TransactionId( #"0000000000000000000000000000000000000000000000000000000000000000", ) && ref.output_index == 0 - _ -> error "script purpose isn't 'Spend'" + _ -> error @"script purpose isn't 'Spend'" } } @@ -49,6 +49,6 @@ fn assert_outputs(transaction) { output.reference_script == None, ] |> list.and - _ -> error "unexpected number of outputs" + _ -> error @"unexpected number of outputs" } } diff --git a/examples/acceptance_tests/script_context/validators/deploy.ak b/examples/acceptance_tests/script_context/validators/deploy.ak index c753b45f..dd7f9ae5 100644 --- a/examples/acceptance_tests/script_context/validators/deploy.ak +++ b/examples/acceptance_tests/script_context/validators/deploy.ak @@ -40,7 +40,7 @@ fn assert_outputs(outputs) { when outputs is { [output_1, output_2, ..] -> assert_first_output(output_1) && assert_second_output(output_2) - _ -> error "expected transaction to have (at least) 2 outputs" + _ -> error @"expected transaction to have (at least) 2 outputs" } } @@ -67,7 +67,7 @@ fn assert_second_output(output) { ), when output.datum is { InlineDatum(_) -> True - _ -> error "expected inline datum" + _ -> error @"expected inline datum" }, ] |> list.and diff --git a/examples/acceptance_tests/script_context/validators/mint.ak b/examples/acceptance_tests/script_context/validators/mint.ak index 734c80a4..d55a5fb5 100644 --- a/examples/acceptance_tests/script_context/validators/mint.ak +++ b/examples/acceptance_tests/script_context/validators/mint.ak @@ -29,7 +29,7 @@ fn assert_mint(purpose, transaction) { let tokens = value.tokens(transaction.mint, policy_id) when dict.get(tokens, #"666f6f") is { - None -> error "token not found" + None -> error @"token not found" Some(quantity) -> quantity == 1337 } } diff --git a/examples/acceptance_tests/script_context/validators/withdrawals.ak b/examples/acceptance_tests/script_context/validators/withdrawals.ak index 1c8ce18b..8c19e01e 100644 --- a/examples/acceptance_tests/script_context/validators/withdrawals.ak +++ b/examples/acceptance_tests/script_context/validators/withdrawals.ak @@ -23,11 +23,11 @@ validator spend { [ when dict.get(ctx.transaction.withdrawals, alice) is { - None -> error "alice's withdrawal not found" + None -> error @"alice's withdrawal not found" Some(value) -> value == 42 }, when dict.get(ctx.transaction.withdrawals, bob) is { - None -> error "bob's withdrawal not found" + None -> error @"bob's withdrawal not found" Some(value) -> value == 14 }, dict.keys(ctx.transaction.withdrawals) == [alice, bob], diff --git a/examples/hello_world/aiken.lock b/examples/hello_world/aiken.lock index 36ae1dc8..0423f31b 100644 --- a/examples/hello_world/aiken.lock +++ b/examples/hello_world/aiken.lock @@ -3,11 +3,11 @@ [[requirements]] name = "aiken-lang/stdlib" -version = "43d8e740ffdf5febc59e51b7f0d5f8506115340c" +version = "main" source = "github" [[packages]] name = "aiken-lang/stdlib" -version = "43d8e740ffdf5febc59e51b7f0d5f8506115340c" +version = "main" requirements = [] source = "github" diff --git a/examples/hello_world/aiken.toml b/examples/hello_world/aiken.toml index f8495550..3b523f22 100644 --- a/examples/hello_world/aiken.toml +++ b/examples/hello_world/aiken.toml @@ -2,6 +2,8 @@ name = "aiken-lang/hello_world" version = "1.0.0" licences = ["Apache-2.0"] description = "Aiken contracts for project 'aiken-lang/hello_world'" -dependencies = [ - { name = "aiken-lang/stdlib", version = "43d8e740ffdf5febc59e51b7f0d5f8506115340c", source = "github" }, -] + +[[dependencies]] +name = "aiken-lang/stdlib" +version = "main" +source = "github" diff --git a/examples/hello_world/validators/hello_world.ak b/examples/hello_world/validators/hello_world.ak index 1fe1b788..1d4066b4 100644 --- a/examples/hello_world/validators/hello_world.ak +++ b/examples/hello_world/validators/hello_world.ak @@ -1,6 +1,5 @@ use aiken/hash.{Blake2b_224, Hash} use aiken/list -use aiken/string use aiken/transaction.{ScriptContext} use aiken/transaction/credential.{VerificationKey} @@ -14,7 +13,7 @@ type Redeemer { validator spend { fn(datum: Datum, redeemer: Redeemer, context: ScriptContext) -> Bool { - let must_say_hello = string.from_bytearray(redeemer.msg) == "Hello, World!" + let must_say_hello = redeemer.msg == "Hello, World!" let must_be_signed = list.has(context.transaction.extra_signatories, datum.owner) @@ -22,4 +21,3 @@ validator spend { must_say_hello && must_be_signed } } -