From 4ac467c5600bec2bfcc2fc4516d8eb83050247e2 Mon Sep 17 00:00:00 2001 From: xunilrj Date: Mon, 15 Dec 2025 14:36:37 -0300 Subject: [PATCH] update tests --- .../json_abi_oracle_new_encoding.release.json | 288 +----------------- .../array_of_structs_caller/src/main.sw | 2 +- .../src/main.sw | 2 +- 3 files changed, 18 insertions(+), 274 deletions(-) diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/configurable_consts/json_abi_oracle_new_encoding.release.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/configurable_consts/json_abi_oracle_new_encoding.release.json index 2d1dda213c..96ff3b360b 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/configurable_consts/json_abi_oracle_new_encoding.release.json +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/configurable_consts/json_abi_oracle_new_encoding.release.json @@ -63,353 +63,97 @@ "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903", "indirect": false, "name": "BOOL", -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "offset": 4616 -======= - "offset": 4472 ->>>>>>> b9739dfc7 (update tests) -======= - "offset": 4608 ->>>>>>> 5072c4675 (auto-impl for is_trivial) -======= - "offset": 4408 ->>>>>>> b5b612fcb (update tests) -======= - "offset": 4272 ->>>>>>> e97c5cafe (update tests) + "offset": 4216 }, { "concreteTypeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b", "indirect": false, "name": "U8", -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "offset": 4808 -======= - "offset": 4664 ->>>>>>> b9739dfc7 (update tests) -======= - "offset": 4800 ->>>>>>> 5072c4675 (auto-impl for is_trivial) -======= - "offset": 4600 ->>>>>>> b5b612fcb (update tests) -======= - "offset": 4464 ->>>>>>> e97c5cafe (update tests) + "offset": 4408 }, { "concreteTypeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b", "indirect": false, "name": "ANOTHER_U8", -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "offset": 4544 -======= - "offset": 4400 ->>>>>>> b9739dfc7 (update tests) -======= - "offset": 4536 ->>>>>>> 5072c4675 (auto-impl for is_trivial) -======= - "offset": 4336 ->>>>>>> b5b612fcb (update tests) -======= - "offset": 4200 ->>>>>>> e97c5cafe (update tests) + "offset": 4144 }, { "concreteTypeId": "29881aad8730c5ab11d275376323d8e4ff4179aae8ccb6c13fe4902137e162ef", "indirect": false, "name": "U16", -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "offset": 4752 -======= - "offset": 4608 ->>>>>>> b9739dfc7 (update tests) -======= - "offset": 4744 ->>>>>>> 5072c4675 (auto-impl for is_trivial) -======= - "offset": 4544 ->>>>>>> b5b612fcb (update tests) -======= - "offset": 4408 ->>>>>>> e97c5cafe (update tests) + "offset": 4352 }, { "concreteTypeId": "d7649d428b9ff33d188ecbf38a7e4d8fd167fa01b2e10fe9a8f9308e52f1d7cc", "indirect": false, "name": "U32", -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "offset": 4792 -======= - "offset": 4648 ->>>>>>> b9739dfc7 (update tests) -======= - "offset": 4784 ->>>>>>> 5072c4675 (auto-impl for is_trivial) -======= - "offset": 4584 ->>>>>>> b5b612fcb (update tests) -======= - "offset": 4448 ->>>>>>> e97c5cafe (update tests) + "offset": 4392 }, { "concreteTypeId": "d7649d428b9ff33d188ecbf38a7e4d8fd167fa01b2e10fe9a8f9308e52f1d7cc", "indirect": false, "name": "U64", -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "offset": 4800 -======= - "offset": 4656 ->>>>>>> b9739dfc7 (update tests) -======= - "offset": 4792 ->>>>>>> 5072c4675 (auto-impl for is_trivial) -======= - "offset": 4592 ->>>>>>> b5b612fcb (update tests) -======= - "offset": 4456 ->>>>>>> e97c5cafe (update tests) + "offset": 4400 }, { "concreteTypeId": "1b5759d94094368cfd443019e7ca5ec4074300e544e5ea993a979f5da627261e", "indirect": false, "name": "U256", -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "offset": 4760 -======= - "offset": 4616 ->>>>>>> b9739dfc7 (update tests) -======= - "offset": 4752 ->>>>>>> 5072c4675 (auto-impl for is_trivial) -======= - "offset": 4552 ->>>>>>> b5b612fcb (update tests) -======= - "offset": 4416 ->>>>>>> e97c5cafe (update tests) + "offset": 4360 }, { "concreteTypeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b", "indirect": false, "name": "B256", -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "offset": 4584 -======= - "offset": 4440 ->>>>>>> b9739dfc7 (update tests) -======= - "offset": 4576 ->>>>>>> 5072c4675 (auto-impl for is_trivial) -======= - "offset": 4376 ->>>>>>> b5b612fcb (update tests) -======= - "offset": 4240 ->>>>>>> e97c5cafe (update tests) + "offset": 4184 }, { "concreteTypeId": "81fc10c4681a3271cf2d66b2ec6fbc8ed007a442652930844fcf11818c295bff", "indirect": false, "name": "CONFIGURABLE_STRUCT", -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "offset": 4704 -======= - "offset": 4560 ->>>>>>> b9739dfc7 (update tests) -======= - "offset": 4696 ->>>>>>> 5072c4675 (auto-impl for is_trivial) -======= - "offset": 4496 ->>>>>>> b5b612fcb (update tests) -======= - "offset": 4360 ->>>>>>> e97c5cafe (update tests) + "offset": 4304 }, { "concreteTypeId": "a2922861f03be8a650595dd76455b95383a61b46dd418f02607fa2e00dc39d5c", "indirect": false, "name": "CONFIGURABLE_ENUM_A", -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "offset": 4624 -======= - "offset": 4480 ->>>>>>> b9739dfc7 (update tests) -======= - "offset": 4616 ->>>>>>> 5072c4675 (auto-impl for is_trivial) -======= - "offset": 4416 ->>>>>>> b5b612fcb (update tests) -======= - "offset": 4280 ->>>>>>> e97c5cafe (update tests) + "offset": 4224 }, { "concreteTypeId": "a2922861f03be8a650595dd76455b95383a61b46dd418f02607fa2e00dc39d5c", "indirect": false, "name": "CONFIGURABLE_ENUM_B", -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "offset": 4664 -======= - "offset": 4520 ->>>>>>> b9739dfc7 (update tests) -======= - "offset": 4656 ->>>>>>> 5072c4675 (auto-impl for is_trivial) -======= - "offset": 4456 ->>>>>>> b5b612fcb (update tests) -======= - "offset": 4320 ->>>>>>> e97c5cafe (update tests) + "offset": 4264 }, { "concreteTypeId": "4926d35d1a5157936b0a29bc126b8aace6d911209a5c130e9b716b0c73643ea6", "indirect": false, "name": "ARRAY_BOOL", -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "offset": 4552 -======= - "offset": 4408 ->>>>>>> b9739dfc7 (update tests) -======= - "offset": 4544 ->>>>>>> 5072c4675 (auto-impl for is_trivial) -======= - "offset": 4344 ->>>>>>> b5b612fcb (update tests) -======= - "offset": 4208 ->>>>>>> e97c5cafe (update tests) + "offset": 4152 }, { "concreteTypeId": "776fb5a3824169d6736138565fdc20aad684d9111266a5ff6d5c675280b7e199", "indirect": false, "name": "ARRAY_U64", -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "offset": 4560 -======= - "offset": 4416 ->>>>>>> b9739dfc7 (update tests) -======= - "offset": 4552 ->>>>>>> 5072c4675 (auto-impl for is_trivial) -======= - "offset": 4352 ->>>>>>> b5b612fcb (update tests) -======= - "offset": 4216 ->>>>>>> e97c5cafe (update tests) + "offset": 4160 }, { "concreteTypeId": "c998ca9a5f221fe7b5c66ae70c8a9562b86d964408b00d17f883c906bc1fe4be", "indirect": false, "name": "TUPLE_BOOL_U64", -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "offset": 4736 -======= - "offset": 4592 ->>>>>>> b9739dfc7 (update tests) -======= - "offset": 4728 ->>>>>>> 5072c4675 (auto-impl for is_trivial) -======= - "offset": 4528 ->>>>>>> b5b612fcb (update tests) -======= - "offset": 4392 ->>>>>>> e97c5cafe (update tests) + "offset": 4336 }, { "concreteTypeId": "94f0fa95c830be5e4f711963e83259fe7e8bc723278ab6ec34449e791a99b53a", "indirect": false, "name": "STR_4", -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "offset": 4728 -======= - "offset": 4584 ->>>>>>> b9739dfc7 (update tests) -======= - "offset": 4720 ->>>>>>> 5072c4675 (auto-impl for is_trivial) -======= - "offset": 4520 ->>>>>>> b5b612fcb (update tests) -======= - "offset": 4384 ->>>>>>> e97c5cafe (update tests) + "offset": 4328 }, { "concreteTypeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b", "indirect": false, "name": "NOT_USED", -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "offset": 4720 -======= - "offset": 4576 ->>>>>>> b9739dfc7 (update tests) -======= - "offset": 4712 ->>>>>>> 5072c4675 (auto-impl for is_trivial) -======= - "offset": 4512 ->>>>>>> b5b612fcb (update tests) -======= - "offset": 4376 ->>>>>>> e97c5cafe (update tests) + "offset": 4320 } ], "encodingVersion": "1", diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/array_of_structs_caller/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/array_of_structs_caller/src/main.sw index 04f9c2ebcf..90215eee91 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/array_of_structs_caller/src/main.sw +++ b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/array_of_structs_caller/src/main.sw @@ -6,7 +6,7 @@ use std::hash::*; #[cfg(experimental_new_encoding = false)] const CONTRACT_ID = 0x14ed3cd06c2947248f69d54bfa681fe40d26267be84df7e19e253622b7921bbe; #[cfg(experimental_new_encoding = true)] -const CONTRACT_ID = 0x8e1807b241c47c373541480e2b6c52609852f21ecddee6731f69c3395846a836; // AUTO-CONTRACT-ID ../../test_contracts/array_of_structs_contract --release +const CONTRACT_ID = 0xb8389774d4875bfb5fd0fd0d4c2e3e14519197f3299f229421db364b01a34a1f; // AUTO-CONTRACT-ID ../../test_contracts/array_of_structs_contract --release fn get_address() -> Option { Some(CONTRACT_ID.into()) diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_contract_with_type_aliases/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_contract_with_type_aliases/src/main.sw index 16f98e39a1..29b4a66960 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_contract_with_type_aliases/src/main.sw +++ b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_contract_with_type_aliases/src/main.sw @@ -5,7 +5,7 @@ use contract_with_type_aliases_abi::*; #[cfg(experimental_new_encoding = false)] const CONTRACT_ID = 0x0cbeb6efe3104b460be769bdc4ea101ebf16ccc16f2d7b667ec3e1c7f5ce35b5; #[cfg(experimental_new_encoding = true)] -const CONTRACT_ID = 0x941533de91ef68807a2150ed36d2ef53a3a4f0977a0211d67e9865c50b0a5654; // AUTO-CONTRACT-ID ../../test_contracts/contract_with_type_aliases --release +const CONTRACT_ID = 0x4a576c6e48a8d90fb95d12cd28833ef5a22c831ae29df9a5968081f4bc952ef9; // AUTO-CONTRACT-ID ../../test_contracts/contract_with_type_aliases --release fn main() { let caller = abi(MyContract, CONTRACT_ID);