From c1c2cd97b7b3367466e63708c124ba6aaca563bf Mon Sep 17 00:00:00 2001 From: microproofs Date: Tue, 21 May 2024 11:56:12 -0400 Subject: [PATCH] New test 103 and clippy fixes --- crates/aiken-project/src/config.rs | 2 +- crates/aiken-project/src/lib.rs | 2 +- crates/aiken-project/src/tests/mod.rs | 2 +- crates/aiken/Cargo.toml | 2 +- examples/acceptance_tests/036/aiken.lock | 2 +- examples/acceptance_tests/036/plutus.json | 2 +- examples/acceptance_tests/047/plutus.json | 2 +- examples/acceptance_tests/054/aiken.lock | 2 +- examples/acceptance_tests/068/aiken.lock | 2 +- examples/acceptance_tests/071/aiken.lock | 2 +- examples/acceptance_tests/071/plutus.json | 2 +- examples/acceptance_tests/073/aiken.lock | 2 +- examples/acceptance_tests/077/aiken.lock | 2 +- examples/acceptance_tests/077/plutus.json | 2 +- examples/acceptance_tests/079/plutus.json | 2 +- examples/acceptance_tests/086/aiken.lock | 2 +- examples/acceptance_tests/086/plutus.json | 2 +- examples/acceptance_tests/089/aiken.lock | 2 +- examples/acceptance_tests/089/plutus.json | 2 +- examples/acceptance_tests/090/plutus.json | 2 +- examples/acceptance_tests/096/plutus.json | 2 +- examples/acceptance_tests/101/aiken.lock | 2 +- examples/acceptance_tests/103/aiken.lock | 7 +++++++ examples/acceptance_tests/103/aiken.toml | 9 +++++++++ examples/acceptance_tests/103/lib/tests.ak | 13 +++++++++++++ examples/acceptance_tests/script_context/aiken.lock | 2 +- .../acceptance_tests/script_context/plutus.json | 2 +- 27 files changed, 53 insertions(+), 24 deletions(-) create mode 100644 examples/acceptance_tests/103/aiken.lock create mode 100644 examples/acceptance_tests/103/aiken.toml create mode 100644 examples/acceptance_tests/103/lib/tests.ak diff --git a/crates/aiken-project/src/config.rs b/crates/aiken-project/src/config.rs index 3089a78f..b1d8b10a 100644 --- a/crates/aiken-project/src/config.rs +++ b/crates/aiken-project/src/config.rs @@ -105,7 +105,7 @@ impl Config { for existing in self.dependencies.iter_mut() { if existing.name == dependency.name { return if and_replace { - existing.version = dependency.version.clone(); + existing.version.clone_from(&dependency.version); Some(self) } else { None diff --git a/crates/aiken-project/src/lib.rs b/crates/aiken-project/src/lib.rs index 064c5d11..816fa0a4 100644 --- a/crates/aiken-project/src/lib.rs +++ b/crates/aiken-project/src/lib.rs @@ -625,7 +625,7 @@ where match aiken_lang::parser::module(&code, kind) { Ok((mut ast, extra)) => { // Store the name - ast.name = name.clone(); + ast.name.clone_from(&name); let module = ParsedModule { kind, diff --git a/crates/aiken-project/src/tests/mod.rs b/crates/aiken-project/src/tests/mod.rs index 04ada429..5486dc16 100644 --- a/crates/aiken-project/src/tests/mod.rs +++ b/crates/aiken-project/src/tests/mod.rs @@ -72,7 +72,7 @@ impl TestProject { let kind = ModuleKind::Validator; let name = "test_module".to_owned(); let (mut ast, extra) = parser::module(source_code, kind).expect("Failed to parse module"); - ast.name = name.clone(); + ast.name.clone_from(&name); ParsedModule { kind, diff --git a/crates/aiken/Cargo.toml b/crates/aiken/Cargo.toml index ad98b2af..4412c405 100644 --- a/crates/aiken/Cargo.toml +++ b/crates/aiken/Cargo.toml @@ -11,7 +11,7 @@ authors = [ "Kasey White ", "KtorZ ", ] -rust-version = "1.66.1" +rust-version = "1.70.0" [package.metadata.wix] upgrade-guid = "288B160D-418A-4558-91B9-7C38CFD789C7" diff --git a/examples/acceptance_tests/036/aiken.lock b/examples/acceptance_tests/036/aiken.lock index c8a2c366..991e8e48 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 = 1715360630, nanos_since_epoch = 528712000 }, "3d3d948e66503986746dfdf33ca5e80ac634b356c928321987188473d813b2db"] +"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1716306925, nanos_since_epoch = 780731000 }, "3d3d948e66503986746dfdf33ca5e80ac634b356c928321987188473d813b2db"] diff --git a/examples/acceptance_tests/036/plutus.json b/examples/acceptance_tests/036/plutus.json index ee3450cd..394ebdb9 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+c5de9ad" + "version": "v1.0.26-alpha+a3c14d8" } }, "validators": [ diff --git a/examples/acceptance_tests/047/plutus.json b/examples/acceptance_tests/047/plutus.json index 8266736a..06d3d716 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+c5de9ad" + "version": "v1.0.26-alpha+a3c14d8" } }, "validators": [ diff --git a/examples/acceptance_tests/054/aiken.lock b/examples/acceptance_tests/054/aiken.lock index 19ce514f..6337b4e1 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 = 1715360646, nanos_since_epoch = 661135000 }, "3d3d948e66503986746dfdf33ca5e80ac634b356c928321987188473d813b2db"] +"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1716306848, nanos_since_epoch = 135217000 }, "3d3d948e66503986746dfdf33ca5e80ac634b356c928321987188473d813b2db"] diff --git a/examples/acceptance_tests/068/aiken.lock b/examples/acceptance_tests/068/aiken.lock index 7403e1d8..c3f39986 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 = 1715360649, nanos_since_epoch = 486348000 }, "3d3d948e66503986746dfdf33ca5e80ac634b356c928321987188473d813b2db"] +"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1716306849, nanos_since_epoch = 424208000 }, "3d3d948e66503986746dfdf33ca5e80ac634b356c928321987188473d813b2db"] diff --git a/examples/acceptance_tests/071/aiken.lock b/examples/acceptance_tests/071/aiken.lock index 28771ba5..87368087 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 = 1715360636, nanos_since_epoch = 76441000 }, "3d3d948e66503986746dfdf33ca5e80ac634b356c928321987188473d813b2db"] +"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1716306847, nanos_since_epoch = 531983000 }, "3d3d948e66503986746dfdf33ca5e80ac634b356c928321987188473d813b2db"] diff --git a/examples/acceptance_tests/071/plutus.json b/examples/acceptance_tests/071/plutus.json index b71af6d1..7a5bf1c4 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+c5de9ad" + "version": "v1.0.26-alpha+a3c14d8" } }, "validators": [ diff --git a/examples/acceptance_tests/073/aiken.lock b/examples/acceptance_tests/073/aiken.lock index 388821a7..35dd8369 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 = 1715360626, nanos_since_epoch = 672734000 }, "3d3d948e66503986746dfdf33ca5e80ac634b356c928321987188473d813b2db"] +"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1716306848, nanos_since_epoch = 948852000 }, "3d3d948e66503986746dfdf33ca5e80ac634b356c928321987188473d813b2db"] diff --git a/examples/acceptance_tests/077/aiken.lock b/examples/acceptance_tests/077/aiken.lock index 13de14e5..35208f5e 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 = 1715360634, nanos_since_epoch = 50435000 }, "3d3d948e66503986746dfdf33ca5e80ac634b356c928321987188473d813b2db"] +"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1716306933, nanos_since_epoch = 371471000 }, "3d3d948e66503986746dfdf33ca5e80ac634b356c928321987188473d813b2db"] diff --git a/examples/acceptance_tests/077/plutus.json b/examples/acceptance_tests/077/plutus.json index a38eb0fe..1c19181e 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+c5227a2" + "version": "v1.0.26-alpha+a3c14d8" } }, "validators": [ diff --git a/examples/acceptance_tests/079/plutus.json b/examples/acceptance_tests/079/plutus.json index d736c8cb..99118ebf 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+c5de9ad" + "version": "v1.0.26-alpha+a3c14d8" } }, "validators": [ diff --git a/examples/acceptance_tests/086/aiken.lock b/examples/acceptance_tests/086/aiken.lock index d11a1394..5bd2cb74 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 = 1715360644, nanos_since_epoch = 768993000 }, "3d3d948e66503986746dfdf33ca5e80ac634b356c928321987188473d813b2db"] +"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1716306902, nanos_since_epoch = 886531000 }, "3d3d948e66503986746dfdf33ca5e80ac634b356c928321987188473d813b2db"] diff --git a/examples/acceptance_tests/086/plutus.json b/examples/acceptance_tests/086/plutus.json index e2b1f7db..5d72dcdc 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+c5de9ad" + "version": "v1.0.26-alpha+a3c14d8" } }, "validators": [ diff --git a/examples/acceptance_tests/089/aiken.lock b/examples/acceptance_tests/089/aiken.lock index 4330877a..2e6132cd 100644 --- a/examples/acceptance_tests/089/aiken.lock +++ b/examples/acceptance_tests/089/aiken.lock @@ -13,4 +13,4 @@ requirements = [] source = "github" [etags] -"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1715360640, nanos_since_epoch = 500977000 }, "3d3d948e66503986746dfdf33ca5e80ac634b356c928321987188473d813b2db"] +"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1716306912, nanos_since_epoch = 954678000 }, "3d3d948e66503986746dfdf33ca5e80ac634b356c928321987188473d813b2db"] diff --git a/examples/acceptance_tests/089/plutus.json b/examples/acceptance_tests/089/plutus.json index a59ac19a..512530bd 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+c5de9ad" + "version": "v1.0.26-alpha+a3c14d8" } }, "validators": [ diff --git a/examples/acceptance_tests/090/plutus.json b/examples/acceptance_tests/090/plutus.json index 3a052fc3..db4e3ff0 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+c5de9ad" + "version": "v1.0.26-alpha+a3c14d8" } }, "validators": [ diff --git a/examples/acceptance_tests/096/plutus.json b/examples/acceptance_tests/096/plutus.json index ad5bf27c..1f36d133 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+c5de9ad" + "version": "v1.0.26-alpha+a3c14d8" }, "license": "Apache-2.0" }, diff --git a/examples/acceptance_tests/101/aiken.lock b/examples/acceptance_tests/101/aiken.lock index e47f191d..e73033f2 100644 --- a/examples/acceptance_tests/101/aiken.lock +++ b/examples/acceptance_tests/101/aiken.lock @@ -24,5 +24,5 @@ requirements = [] source = "github" [etags] -"aiken-lang/fuzz@main" = [{ secs_since_epoch = 1715360637, nanos_since_epoch = 157363000 }, "d7aadd4a9b25589bd6d5e3bbedcd809cdf97fe3eddb365cf89cd6ac6bc829643"] +"aiken-lang/fuzz@main" = [{ secs_since_epoch = 1716306920, nanos_since_epoch = 138088000 }, "d7aadd4a9b25589bd6d5e3bbedcd809cdf97fe3eddb365cf89cd6ac6bc829643"] "aiken-lang/stdlib@main" = [{ secs_since_epoch = 1715360636, nanos_since_epoch = 821658000 }, "3d3d948e66503986746dfdf33ca5e80ac634b356c928321987188473d813b2db"] diff --git a/examples/acceptance_tests/103/aiken.lock b/examples/acceptance_tests/103/aiken.lock new file mode 100644 index 00000000..6e350cda --- /dev/null +++ b/examples/acceptance_tests/103/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/103/aiken.toml b/examples/acceptance_tests/103/aiken.toml new file mode 100644 index 00000000..46990544 --- /dev/null +++ b/examples/acceptance_tests/103/aiken.toml @@ -0,0 +1,9 @@ +name = "aiken-lang/103" +version = "0.0.0" +license = "Apache-2.0" +description = "Aiken contracts for project 'aiken-lang/102'" + +[repository] +user = "aiken-lang" +project = "103" +platform = "github" diff --git a/examples/acceptance_tests/103/lib/tests.ak b/examples/acceptance_tests/103/lib/tests.ak new file mode 100644 index 00000000..6fd03f6b --- /dev/null +++ b/examples/acceptance_tests/103/lib/tests.ak @@ -0,0 +1,13 @@ +fn do_diagnostic(self: Data) -> ByteArray { + let builder = 2 + + from_int(builder) +} + +fn from_int(i: Int) -> ByteArray { + "dddd" +} + +test other() { + do_diagnostic(1) != "thing" +} diff --git a/examples/acceptance_tests/script_context/aiken.lock b/examples/acceptance_tests/script_context/aiken.lock index e9860709..bb05f854 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 = 1715360661, nanos_since_epoch = 854771000 }, "3d3d948e66503986746dfdf33ca5e80ac634b356c928321987188473d813b2db"] +"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1716306936, nanos_since_epoch = 675892000 }, "3d3d948e66503986746dfdf33ca5e80ac634b356c928321987188473d813b2db"] diff --git a/examples/acceptance_tests/script_context/plutus.json b/examples/acceptance_tests/script_context/plutus.json index 0f99712c..1b22b634 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+c5de9ad" + "version": "v1.0.26-alpha+a3c14d8" } }, "validators": [