From 330c03369916a3af3b2ae216c913cd5613584946 Mon Sep 17 00:00:00 2001 From: Fiiranek Date: Tue, 27 Aug 2024 16:05:10 +0200 Subject: [PATCH 1/4] Check contracts formatting in `compile_contracts.sh` --- starknet_py/tests/e2e/mock/compile_contracts.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/starknet_py/tests/e2e/mock/compile_contracts.sh b/starknet_py/tests/e2e/mock/compile_contracts.sh index dc5a42c29..7ffd5b20c 100755 --- a/starknet_py/tests/e2e/mock/compile_contracts.sh +++ b/starknet_py/tests/e2e/mock/compile_contracts.sh @@ -28,9 +28,11 @@ compile_contracts_with_scarb() { setup_scarb "$SCARB_VERSION" - echo "Compiling Cairo contracts with scarb $SCARB_VERSION" - pushd "$CONTRACTS_DIRECTORY" >/dev/null || exit 1 + + scarb fmt --check + + echo "Compiling Cairo contracts with scarb $SCARB_VERSION" scarb clean && scarb build popd >/dev/null || exit 1 } From aac8d6edf1bf20c810e953ecb2ceab8b6095a55f Mon Sep 17 00:00:00 2001 From: Fiiranek Date: Tue, 27 Aug 2024 16:11:53 +0200 Subject: [PATCH 2/4] Temporarily broke contract formatting --- starknet_py/tests/e2e/mock/contracts_v2/src/l1_l2.cairo | 1 + 1 file changed, 1 insertion(+) diff --git a/starknet_py/tests/e2e/mock/contracts_v2/src/l1_l2.cairo b/starknet_py/tests/e2e/mock/contracts_v2/src/l1_l2.cairo index 1e8a9f058..294e22d93 100644 --- a/starknet_py/tests/e2e/mock/contracts_v2/src/l1_l2.cairo +++ b/starknet_py/tests/e2e/mock/contracts_v2/src/l1_l2.cairo @@ -7,6 +7,7 @@ #[starknet::contract] mod l1_l2 { + const MESSAGE_WITHDRAW: felt252 = 0; #[storage] From e5fb3ed26b54fe773252633cfc7bbdc4ae8e6f15 Mon Sep 17 00:00:00 2001 From: Fiiranek Date: Tue, 27 Aug 2024 16:17:59 +0200 Subject: [PATCH 3/4] Revert "Temporarily broke contract formatting" This reverts commit aac8d6edf1bf20c810e953ecb2ceab8b6095a55f. --- starknet_py/tests/e2e/mock/contracts_v2/src/l1_l2.cairo | 1 - 1 file changed, 1 deletion(-) diff --git a/starknet_py/tests/e2e/mock/contracts_v2/src/l1_l2.cairo b/starknet_py/tests/e2e/mock/contracts_v2/src/l1_l2.cairo index 294e22d93..1e8a9f058 100644 --- a/starknet_py/tests/e2e/mock/contracts_v2/src/l1_l2.cairo +++ b/starknet_py/tests/e2e/mock/contracts_v2/src/l1_l2.cairo @@ -7,7 +7,6 @@ #[starknet::contract] mod l1_l2 { - const MESSAGE_WITHDRAW: felt252 = 0; #[storage] From f4052370fd0b459777f414719ea6e1dc5fc10bcd Mon Sep 17 00:00:00 2001 From: Fiiranek Date: Wed, 28 Aug 2024 10:52:57 +0200 Subject: [PATCH 4/4] Add helper message before running `scarb fmt --check` --- starknet_py/tests/e2e/mock/compile_contracts.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/starknet_py/tests/e2e/mock/compile_contracts.sh b/starknet_py/tests/e2e/mock/compile_contracts.sh index 7ffd5b20c..ecf963f3c 100755 --- a/starknet_py/tests/e2e/mock/compile_contracts.sh +++ b/starknet_py/tests/e2e/mock/compile_contracts.sh @@ -30,6 +30,7 @@ compile_contracts_with_scarb() { pushd "$CONTRACTS_DIRECTORY" >/dev/null || exit 1 + echo "Checking Cairo contracts formatting" scarb fmt --check echo "Compiling Cairo contracts with scarb $SCARB_VERSION"