From 9f6daa8cd5b966981b53368f7597a3761b84d86a Mon Sep 17 00:00:00 2001 From: KtorZ Date: Sun, 1 Sep 2024 18:16:39 +0200 Subject: [PATCH] Refresh gift_card and hello_world examples. --- examples/acceptance_tests/054/lib/tests.ak | 6 +++--- examples/acceptance_tests/067/lib/tests.ak | 6 +++--- examples/acceptance_tests/068/lib/tests.ak | 19 ++++++++----------- examples/acceptance_tests/074/lib/tests.ak | 6 +++--- examples/acceptance_tests/084/lib/tests.ak | 2 +- .../acceptance_tests/089/validators/test2.ak | 6 +++--- examples/acceptance_tests/099/lib/bar.ak | 2 +- examples/gift_card/aiken.lock | 2 +- examples/gift_card/plutus.json | 2 +- examples/gift_card/validators/multi.ak | 4 ++-- examples/gift_card/validators/oneshot.ak | 2 +- examples/hello_world/aiken.lock | 2 +- .../hello_world/validators/hello_world.ak | 4 ++-- 13 files changed, 30 insertions(+), 33 deletions(-) diff --git a/examples/acceptance_tests/054/lib/tests.ak b/examples/acceptance_tests/054/lib/tests.ak index 59ae8fe7..3cd920c5 100644 --- a/examples/acceptance_tests/054/lib/tests.ak +++ b/examples/acceptance_tests/054/lib/tests.ak @@ -1,6 +1,6 @@ -use aiken/transaction/value +use cardano/assets test test_quantity_of_1() { - let x = value.from_asset(#"000000", #"000020e05363726970744f776e6572", -1) - value.quantity_of(x, #"000000", #"000020e05363726970744f776e6572") < 0 + let x = assets.from_asset(#"000000", #"000020e05363726970744f776e6572", -1) + assets.quantity_of(x, #"000000", #"000020e05363726970744f776e6572") < 0 } diff --git a/examples/acceptance_tests/067/lib/tests.ak b/examples/acceptance_tests/067/lib/tests.ak index c4a66f5c..9d42c37b 100644 --- a/examples/acceptance_tests/067/lib/tests.ak +++ b/examples/acceptance_tests/067/lib/tests.ak @@ -1,7 +1,7 @@ -use aiken/bytearray.{from_string} -use aiken/hash.{Hash, Sha2_256, sha2_256} -use aiken/list +use aiken/collection/list +use aiken/crypto.{Hash, Sha2_256, sha2_256} use aiken/option.{choice, is_none} +use aiken/primitive/bytearray.{from_string} // Construction of the merkle tree shouldn't be done by hand, but via // 'from_list'. diff --git a/examples/acceptance_tests/068/lib/tests.ak b/examples/acceptance_tests/068/lib/tests.ak index 6398dddf..42dd13f6 100644 --- a/examples/acceptance_tests/068/lib/tests.ak +++ b/examples/acceptance_tests/068/lib/tests.ak @@ -1,7 +1,6 @@ -use aiken/bytearray -use aiken/dict.{Dict} -use aiken/hash.{Blake2b_224, Hash} -use aiken/transaction/credential.{Script} +use aiken/collection/dict.{Dict} +use aiken/crypto.{Blake2b_224, Hash, Script} +use aiken/primitive/bytearray pub type PolicyId = Hash @@ -13,9 +12,7 @@ pub opaque type Value { inner: Dict>, } -pub fn zero() -> Value { - Value { inner: dict.new() } -} +pub const zero: Value = Value { inner: dict.empty } pub fn from_asset( policy_id: PolicyId, @@ -23,9 +20,9 @@ pub fn from_asset( quantity: Int, ) -> Value { let asset = - dict.new() + dict.empty |> dict.insert(asset_name, quantity) - dict.new() + dict.empty |> dict.insert(policy_id, asset) |> Value } @@ -86,12 +83,12 @@ pub fn flatten_with( } test flatten_with_1() { - flatten_with(zero(), fn(p, a, q) { Some((p, a, q)) }) == [] + flatten_with(zero, fn(p, a, q) { Some((p, a, q)) }) == [] } test flatten_with_2() { let v = - zero() + zero |> add(from_asset("a", "1", 14)) |> add(from_asset("b", "", 42)) |> add(from_asset("a", "2", 42)) diff --git a/examples/acceptance_tests/074/lib/tests.ak b/examples/acceptance_tests/074/lib/tests.ak index e71f9b5d..57216614 100644 --- a/examples/acceptance_tests/074/lib/tests.ak +++ b/examples/acceptance_tests/074/lib/tests.ak @@ -1,7 +1,7 @@ -use aiken/bytearray.{from_string} -use aiken/hash.{Hash, Sha2_256, sha2_256} -use aiken/list +use aiken/collection/list +use aiken/crypto.{Hash, Sha2_256, sha2_256} use aiken/option.{choice, is_none} +use aiken/primitive/bytearray.{from_string} /// Variant of MerkleTree with only hash but without actual value pub type MerkleTree { diff --git a/examples/acceptance_tests/084/lib/tests.ak b/examples/acceptance_tests/084/lib/tests.ak index 36ea112f..438aded4 100644 --- a/examples/acceptance_tests/084/lib/tests.ak +++ b/examples/acceptance_tests/084/lib/tests.ak @@ -1,6 +1,6 @@ use aiken/builtin.{snd_pair} use aiken/cbor -use aiken/list +use aiken/collection/list test tuple_when() { let items = diff --git a/examples/acceptance_tests/089/validators/test2.ak b/examples/acceptance_tests/089/validators/test2.ak index 20a73eaa..b6cf143e 100644 --- a/examples/acceptance_tests/089/validators/test2.ak +++ b/examples/acceptance_tests/089/validators/test2.ak @@ -1,6 +1,6 @@ use aiken/collection/list -use cardano/assets use cardano/address.{Address, VerificationKey} +use cardano/assets use cardano/transaction.{Input, NoDatum, Output, OutputReference, Transaction} pub const own_hash = #"01020304050607080910111213140102030405060708091011121314" @@ -46,7 +46,7 @@ test test_simple_oneshot() { let output = Output { address: beneficiary_address(), - value: assets.zero(), + value: assets.zero, datum: NoDatum, reference_script: None, } @@ -59,7 +59,7 @@ test test_simple_oneshot() { let tx = Transaction { - ..transaction.placeholder(), + ..transaction.placeholder, mint: mint, extra_signatories: [other_hash], inputs: [input], diff --git a/examples/acceptance_tests/099/lib/bar.ak b/examples/acceptance_tests/099/lib/bar.ak index 57fd9c28..359ad4ab 100644 --- a/examples/acceptance_tests/099/lib/bar.ak +++ b/examples/acceptance_tests/099/lib/bar.ak @@ -1,4 +1,4 @@ -use aiken/list.{count as my_count} as native_list +use aiken/collection/list.{count as my_count} as native_list test thing_1() { let x = diff --git a/examples/gift_card/aiken.lock b/examples/gift_card/aiken.lock index 89d1a4d8..5a7316f5 100644 --- a/examples/gift_card/aiken.lock +++ b/examples/gift_card/aiken.lock @@ -13,4 +13,4 @@ requirements = [] source = "github" [etags] -"aiken-lang/stdlib@v2" = [{ secs_since_epoch = 1725021962, nanos_since_epoch = 944823000 }, "cdbbce58b61deb385e7ea787a2e0fc2dc8fe94db9999e0e6275bc9c70e5796be"] +"aiken-lang/stdlib@v2" = [{ secs_since_epoch = 1725207295, nanos_since_epoch = 895782000 }, "d79382d2b6ecb3aee9b0755c31d8a5bbafe88a7b3706d7fb8a52fd4d05818501"] diff --git a/examples/gift_card/plutus.json b/examples/gift_card/plutus.json index f9311d0a..39c857cc 100644 --- a/examples/gift_card/plutus.json +++ b/examples/gift_card/plutus.json @@ -6,7 +6,7 @@ "plutusVersion": "v3", "compiler": { "name": "Aiken", - "version": "v1.1.0+9407b67" + "version": "v1.1.0+ddfe01e" }, "license": "Apache-2.0" }, diff --git a/examples/gift_card/validators/multi.ak b/examples/gift_card/validators/multi.ak index 41af34cd..35fbd8f3 100644 --- a/examples/gift_card/validators/multi.ak +++ b/examples/gift_card/validators/multi.ak @@ -1,10 +1,10 @@ use aiken/builtin use aiken/collection/dict use aiken/collection/list -use aiken/hash.{blake2b_256} +use aiken/crypto.{blake2b_256} use aiken/primitive/bytearray +use cardano/address.{Address, PaymentCredential, Script} use cardano/assets.{PolicyId} -use cardano/credential.{Address, PaymentCredential, Script} use cardano/transaction.{ InlineDatum, Input, Output, OutputReference, Transaction, } as tx diff --git a/examples/gift_card/validators/oneshot.ak b/examples/gift_card/validators/oneshot.ak index 07054593..cb02b3fa 100644 --- a/examples/gift_card/validators/oneshot.ak +++ b/examples/gift_card/validators/oneshot.ak @@ -1,7 +1,7 @@ use aiken/collection/dict use aiken/collection/list +use cardano/address.{Script} use cardano/assets.{PolicyId} -use cardano/credential.{Script} use cardano/transaction.{OutputReference, Transaction} as tx pub type Action { diff --git a/examples/hello_world/aiken.lock b/examples/hello_world/aiken.lock index 91d0b6a5..bd88ecef 100644 --- a/examples/hello_world/aiken.lock +++ b/examples/hello_world/aiken.lock @@ -13,4 +13,4 @@ requirements = [] source = "github" [etags] -"aiken-lang/stdlib@v2" = [{ secs_since_epoch = 1725021976, nanos_since_epoch = 403974000 }, "cdbbce58b61deb385e7ea787a2e0fc2dc8fe94db9999e0e6275bc9c70e5796be"] +"aiken-lang/stdlib@v2" = [{ secs_since_epoch = 1725207187, nanos_since_epoch = 801664000 }, "d79382d2b6ecb3aee9b0755c31d8a5bbafe88a7b3706d7fb8a52fd4d05818501"] diff --git a/examples/hello_world/validators/hello_world.ak b/examples/hello_world/validators/hello_world.ak index 19ccf4ff..e889364c 100644 --- a/examples/hello_world/validators/hello_world.ak +++ b/examples/hello_world/validators/hello_world.ak @@ -1,5 +1,5 @@ use aiken/collection/list -use cardano/credential.{VerificationKeyHash} +use aiken/crypto.{VerificationKeyHash} use cardano/transaction.{OutputReference, Transaction} pub type Datum { @@ -16,7 +16,7 @@ validator hello_world { redeemer: Redeemer, _: OutputReference, transaction: Transaction, - ) -> Bool { + ) { let must_say_hello = redeemer.msg == "Hello, World!" expect Some(Datum { owner }) = datum