From 6f591c633dd7934e392de8ef10b100fe073ad7b5 Mon Sep 17 00:00:00 2001 From: rvcas Date: Thu, 9 Feb 2023 00:57:14 -0500 Subject: [PATCH] chore: fmt most of the acceptance tests --- examples/acceptance_tests/008/lib/tests.ak | 8 ++--- examples/acceptance_tests/009/lib/tests.ak | 2 +- examples/acceptance_tests/016/lib/tests.ak | 4 +-- examples/acceptance_tests/017/lib/tests.ak | 2 +- examples/acceptance_tests/023/lib/tests.ak | 6 +--- examples/acceptance_tests/029/lib/tests.ak | 6 +--- .../acceptance_tests/035/lib/aiken/dict.ak | 2 +- examples/acceptance_tests/035/lib/tests.ak | 2 +- .../acceptance_tests/036/validators/spend.ak | 2 +- examples/acceptance_tests/039/lib/tests.ak | 36 +++++++++---------- examples/acceptance_tests/047/lib/tests.ak | 1 + examples/acceptance_tests/fmt | 26 ++++++++++++++ examples/acceptance_tests/fmt-all | 3 ++ 13 files changed, 61 insertions(+), 39 deletions(-) create mode 100755 examples/acceptance_tests/fmt create mode 100755 examples/acceptance_tests/fmt-all diff --git a/examples/acceptance_tests/008/lib/tests.ak b/examples/acceptance_tests/008/lib/tests.ak index 689fb805..d9fcc3ed 100644 --- a/examples/acceptance_tests/008/lib/tests.ak +++ b/examples/acceptance_tests/008/lib/tests.ak @@ -5,17 +5,17 @@ pub fn is_empty(bytes: ByteArray) -> Bool { } test is_empty_1() { - is_empty(#[]) == True + is_empty(#"") == True } test is_empty_1_alt() { - is_empty(#[]) + is_empty(#"") } test is_empty_2() { - is_empty(#[1]) == False + is_empty(#"01") == False } test is_empty_2_alt() { - !is_empty(#[1]) + !is_empty(#"01") } diff --git a/examples/acceptance_tests/009/lib/tests.ak b/examples/acceptance_tests/009/lib/tests.ak index b4ef2b0d..c3384d04 100644 --- a/examples/acceptance_tests/009/lib/tests.ak +++ b/examples/acceptance_tests/009/lib/tests.ak @@ -5,5 +5,5 @@ pub fn is_empty(bytes: ByteArray) -> Bool { } test is_empty_1() { - is_empty(#[]) == True + is_empty(#"") == True } diff --git a/examples/acceptance_tests/016/lib/tests.ak b/examples/acceptance_tests/016/lib/tests.ak index 9c658c82..72462cea 100644 --- a/examples/acceptance_tests/016/lib/tests.ak +++ b/examples/acceptance_tests/016/lib/tests.ak @@ -13,6 +13,6 @@ pub fn drop(bytes: ByteArray, n: Int) -> ByteArray { } test drop_1() { - let x = #[1, 2, 3, 4, 5, 6, 7] - drop(x, 2) == #[3, 4, 5, 6, 7] + let x = #"01020304050607" + drop(x, 2) == #"0304050607" } diff --git a/examples/acceptance_tests/017/lib/tests.ak b/examples/acceptance_tests/017/lib/tests.ak index af71db7b..62863b0d 100644 --- a/examples/acceptance_tests/017/lib/tests.ak +++ b/examples/acceptance_tests/017/lib/tests.ak @@ -9,5 +9,5 @@ pub fn take(bytes: ByteArray, n: Int) -> ByteArray { } test take_1() { - take(#[1, 2, 3], 2) == #[1, 2] + take(#"010203", 2) == #"0102" } diff --git a/examples/acceptance_tests/023/lib/tests.ak b/examples/acceptance_tests/023/lib/tests.ak index cdafc006..761e86ef 100644 --- a/examples/acceptance_tests/023/lib/tests.ak +++ b/examples/acceptance_tests/023/lib/tests.ak @@ -18,11 +18,7 @@ pub fn insert( AssocList { inner: do_insert(m.inner, k, v) } } -fn do_insert( - elems: List<(key, value)>, - k: key, - v: value, -) -> List<(key, value)> { +fn do_insert(elems: List<(key, value)>, k: key, v: value) -> List<(key, value)> { when elems is { [] -> [(k, v)] [(k2, v2), ..rest] -> diff --git a/examples/acceptance_tests/029/lib/tests.ak b/examples/acceptance_tests/029/lib/tests.ak index 6d74cfac..bc3f1835 100644 --- a/examples/acceptance_tests/029/lib/tests.ak +++ b/examples/acceptance_tests/029/lib/tests.ak @@ -25,11 +25,7 @@ pub fn insert( AssocList { inner: do_insert(m.inner, k, v) } } -fn do_insert( - elems: List<(key, value)>, - k: key, - v: value, -) -> List<(key, value)> { +fn do_insert(elems: List<(key, value)>, k: key, v: value) -> List<(key, value)> { when elems is { [] -> [(k, v)] [(k2, v2), ..rest] -> diff --git a/examples/acceptance_tests/035/lib/aiken/dict.ak b/examples/acceptance_tests/035/lib/aiken/dict.ak index 9640ff8f..a2bbcc2f 100644 --- a/examples/acceptance_tests/035/lib/aiken/dict.ak +++ b/examples/acceptance_tests/035/lib/aiken/dict.ak @@ -20,7 +20,7 @@ pub fn insert( ) -> Dict { Dict { inner: do_insert_with(self.inner, k, v, fn(_, left, _right) { Some(left) })} - + } pub fn union_with( diff --git a/examples/acceptance_tests/035/lib/tests.ak b/examples/acceptance_tests/035/lib/tests.ak index 60279bab..2cf7eade 100644 --- a/examples/acceptance_tests/035/lib/tests.ak +++ b/examples/acceptance_tests/035/lib/tests.ak @@ -22,7 +22,7 @@ pub fn from_asset( } pub fn from_lovelace(quantity: Int) -> Value { - from_asset(#[], #[], quantity) + from_asset(#"", #"", quantity) } pub fn add(left v0: Value, right v1: Value) -> Value { diff --git a/examples/acceptance_tests/036/validators/spend.ak b/examples/acceptance_tests/036/validators/spend.ak index 23094f20..f68427db 100644 --- a/examples/acceptance_tests/036/validators/spend.ak +++ b/examples/acceptance_tests/036/validators/spend.ak @@ -3,7 +3,7 @@ use aiken/list use aiken/transaction.{Output, ScriptContext} use aiken/transaction/value.{PolicyId} -const my_policy_id: PolicyId = #[0, 0, 0, 0, 0] +const my_policy_id: PolicyId = #"0000000000" pub fn has_policy_id(self: Output, policy_id: PolicyId) -> Bool { self.value diff --git a/examples/acceptance_tests/039/lib/tests.ak b/examples/acceptance_tests/039/lib/tests.ak index 22b1bc55..66c5933b 100644 --- a/examples/acceptance_tests/039/lib/tests.ak +++ b/examples/acceptance_tests/039/lib/tests.ak @@ -37,52 +37,52 @@ pub fn update_door_locked_and_wheels( test update_owner1() { let initial_car = Car { - owner: #[], + owner: #"", wheels: 4, - vin: #[1, 1, 1, 1, 1, 1, 1], + vin: #"01010101010101", door: Door { locked: False, hinge_angle: 45 }, } let final_car = Car { - owner: #[244, 244, 244, 244], + owner: #"f4f4f4f4", wheels: 4, - vin: #[1, 1, 1, 1, 1, 1, 1], + vin: #"01010101010101", door: Door { locked: False, hinge_angle: 45 }, } - update_owner(#[244, 244, 244, 244], initial_car) == final_car + update_owner(#"f4f4f4f4", initial_car) == final_car } test update_vin1() { let initial_car = Car { - owner: #[], + owner: #"", wheels: 4, - vin: #[1, 1, 1, 1, 1, 1, 1], + vin: #"01010101010101", door: Door { locked: False, hinge_angle: 45 }, } let final_car = Car { - owner: #[], + owner: #"", wheels: 4, - vin: #[2, 2, 2, 2, 2, 2, 2, 2, 2], + vin: #"020202020202020202", door: Door { locked: False, hinge_angle: 45 }, } - update_vin(#[2, 2, 2, 2, 2, 2, 2, 2, 2], initial_car) == final_car + update_vin(#"020202020202020202", initial_car) == final_car } test update_door_angle1() { let initial_car = Car { - owner: #[], + owner: #"", wheels: 4, - vin: #[1, 1, 1, 1, 1, 1, 1], + vin: #"01010101010101", door: Door { locked: False, hinge_angle: 45 }, } let final_car = Car { - owner: #[], + owner: #"", wheels: 4, - vin: #[1, 1, 1, 1, 1, 1, 1], + vin: #"01010101010101", door: Door { locked: False, hinge_angle: 90 }, } update_door_angle(90, initial_car) == final_car @@ -91,16 +91,16 @@ test update_door_angle1() { test update_door_locked_and_wheels1() { let initial_car = Car { - owner: #[], + owner: #"", wheels: 4, - vin: #[1, 1, 1, 1, 1, 1, 1], + vin: #"01010101010101", door: Door { locked: False, hinge_angle: 45 }, } let final_car = Car { - owner: #[], + owner: #"", wheels: 5, - vin: #[1, 1, 1, 1, 1, 1, 1], + vin: #"01010101010101", door: Door { locked: True, hinge_angle: 45 }, } update_door_locked_and_wheels(True, 5, initial_car) == final_car diff --git a/examples/acceptance_tests/047/lib/tests.ak b/examples/acceptance_tests/047/lib/tests.ak index e69de29b..8b137891 100644 --- a/examples/acceptance_tests/047/lib/tests.ak +++ b/examples/acceptance_tests/047/lib/tests.ak @@ -0,0 +1 @@ + diff --git a/examples/acceptance_tests/fmt b/examples/acceptance_tests/fmt new file mode 100755 index 00000000..4e424e97 --- /dev/null +++ b/examples/acceptance_tests/fmt @@ -0,0 +1,26 @@ +#!/usr/bin/env bash + +if [ -z $1 ]; then + echo -e "\033[31mMissing argument: \033[1mACCEPTANCE_TEST\033[0m" + echo "" + echo -e "\033[1mUsage: \033[0m" + echo " run.sh {ACCEPTANCE_TEST}" + echo "" + echo -e "\033[1mExample: \033[0m" + echo " run.sh 034" + exit 1 +fi + +WORKDIR="$(dirname -- "${BASH_SOURCE[0]}")" +TARGET="$WORKDIR/$(basename $1)" + +TMP=$(mktemp) +RESULT=$(cargo run --quiet -- fmt $TARGET 2>$TMP) + +if [ "$?" -eq "0" ]; then + echo "✅ $(basename $TARGET)" +else + echo "❌ $(basename $TARGET)" + cat $TMP + exit 1 +fi diff --git a/examples/acceptance_tests/fmt-all b/examples/acceptance_tests/fmt-all new file mode 100755 index 00000000..fd06db44 --- /dev/null +++ b/examples/acceptance_tests/fmt-all @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +find . -regex ".*[0-9]\{3\}" -type d | xargs -P 8 -I {} -- ./fmt {}