Merge branch 'master' into vaivaswatha/ir_switch

Author: ironcev

.github/workflows/ci.yml

@@ -217,7 +217,7 @@ jobs:
 
       - name: Read and compare versions
         env:
-          PACKAGE_NAMES: "fuel-core-client" # multiple packages can be specified delimeted with `,`.
+          PACKAGE_NAMES: "fuel-core-client" # multiple packages can be specified delimited with `,`.
         run: |
           .github/workflows/scripts/check-sdk-harness-version.sh
 
@@ -448,17 +448,29 @@ jobs:
       - uses: Swatinem/rust-cache@v2
         with:
           cache-provider: "warpbuild"
-      - name: Build All Tests
-        run: cargo run --locked --release -p forc -- build --release --locked --path ./test/src/sdk-harness
-      - name: Test All Tests
-        run: cargo run --locked --release -p forc -- test --release --locked --path ./test/src/sdk-harness
-      - name: Cargo Test sway-lib-std
+      - name: Build All Test Projects (Debug)
+        run: cargo run --locked --release -p forc -- build --locked --path ./test/src/sdk-harness --output-directory ./test/src/sdk-harness/out
+      - name: Run All SDK Tests (Debug)
+        run: cargo test --locked --release --manifest-path ./test/src/sdk-harness/Cargo.toml -- --skip can_get_predicate_address --nocapture
+      - name: Build All Test Projects (Release)
+        run: cargo run --locked --release -p forc -- build --release --locked --path ./test/src/sdk-harness --output-directory ./test/src/sdk-harness/out
+      - name: Run All SDK Tests (Release)
         run: cargo test --locked --release --manifest-path ./test/src/sdk-harness/Cargo.toml -- --nocapture
-      - name: Build All Tests - Experimental Feature 'new_hashing' disabled
-        run: cargo run --locked --release -p forc -- build --release --locked --path ./test/src/sdk-harness --no-experimental new_hashing
-      - name: Test All Tests - Experimental Feature 'new_hashing' disabled
-        run: cargo run --locked --release -p forc -- test --release --locked --path ./test/src/sdk-harness --no-experimental new_hashing
-      - name: Cargo Test sway-lib-std - Experimental Feature 'new_hashing' disabled
+      - name: Build All Test Projects - ['new_hashing' disabled] (Debug)
+        run: cargo run --locked --release -p forc -- build --locked --path ./test/src/sdk-harness --no-experimental new_hashing --output-directory ./test/src/sdk-harness/out
+      - name: Run All SDK Tests - ['new_hashing' disabled] (Debug)
+        run: cargo test --locked --release --manifest-path ./test/src/sdk-harness/Cargo.toml -- --skip can_get_predicate_address --nocapture
+      - name: Build All Test Projects - ['new_hashing' disabled] (Release)
+        run: cargo run --locked --release -p forc -- build --release --locked --path ./test/src/sdk-harness --no-experimental new_hashing --output-directory ./test/src/sdk-harness/out
+      - name: Run All SDK Tests - ['new_hashing' disabled] (Release)
+        run: cargo test --locked --release --manifest-path ./test/src/sdk-harness/Cargo.toml -- --nocapture
+      - name: Build All Test Projects - ['str_array_no_padding' enabled] (Debug)
+        run: cargo run --locked --release -p forc -- build --locked --path ./test/src/sdk-harness --experimental str_array_no_padding --output-directory ./test/src/sdk-harness/out
+      - name: Run All SDK Tests - ['str_array_no_padding' enabled] (Debug)
+        run: cargo test --locked --release --manifest-path ./test/src/sdk-harness/Cargo.toml -- --skip can_get_predicate_address --nocapture
+      - name: Build All Test Projects - ['str_array_no_padding' enabled] (Release)
+        run: cargo run --locked --release -p forc -- build --release --locked --path ./test/src/sdk-harness --experimental str_array_no_padding --output-directory ./test/src/sdk-harness/out
+      - name: Run All SDK Tests - ['str_array_no_padding' enabled] (Release)
         run: cargo test --locked --release --manifest-path ./test/src/sdk-harness/Cargo.toml -- --nocapture
 
   forc-run-benchmarks:
@@ -526,34 +538,26 @@ jobs:
         run: forc test --path sway-lib-std
       - name: Run Std Unit Tests (Release)
         run: forc test --release --path sway-lib-std
-      - name: Run Std Unit Tests - Experimental feature 'const_generics' (Debug)
-        run: forc test --path sway-lib-std --experimental const_generics
-      - name: Run Std Unit Tests - Experimental feature 'const_generics' (Release)
-        run: forc test --release --path sway-lib-std --experimental const_generics
-      - name: Run Std Unit Tests - Experimental feature 'new_hashing' (Debug)
+      - name: Run Std Unit Tests - ['new_hashing' disabled] (Debug)
         run: forc test --path sway-lib-std --no-experimental new_hashing
-      - name: Run Std Unit Tests - Experimental feature 'new_hashing' (Release)
+      - name: Run Std Unit Tests - ['new_hashing' disabled] (Release)
         run: forc test --release --path sway-lib-std --no-experimental new_hashing
-      - name: Run Std Unit Tests - Experimental feature 'const_generics,new_hashing' (Debug)
-        run: forc test --path sway-lib-std --experimental const_generics --no-experimental new_hashing
-      - name: Run Std Unit Tests - Experimental feature 'const_generics,new_hashing' (Release)
-        run: forc test --release --path sway-lib-std --experimental const_generics --no-experimental new_hashing
+      - name: Run Std Unit Tests - ['str_array_no_padding' enabled] (Debug)
+        run: forc test --path sway-lib-std --experimental str_array_no_padding
+      - name: Run Std Unit Tests - ['str_array_no_padding' enabled] (Release)
+        run: forc test --release --path sway-lib-std --experimental str_array_no_padding
       - name: Run In Language Unit Tests (Debug)
         run: forc test --error-on-warnings --path test/src/in_language_tests
       - name: Run In Language Unit Tests (Release)
         run: forc test --error-on-warnings --release --path test/src/in_language_tests
-      - name: Run In Language Unit Tests - Experimental feature 'const_generics' (Debug)
-        run: forc test --error-on-warnings --path test/src/in_language_tests --experimental const_generics
-      - name: Run In Language Unit Tests - Experimental feature 'const_generics' (Release)
-        run: forc test --error-on-warnings --release --path test/src/in_language_tests --experimental const_generics
-      - name: Run In Language Unit Tests - Experimental feature 'new_hashing' (Debug)
+      - name: Run In Language Unit Tests - ['new_hashing' disabled] (Debug)
         run: forc test --error-on-warnings --path test/src/in_language_tests --no-experimental new_hashing
-      - name: Run In Language Unit Tests - Experimental feature 'new_hashing' (Release)
+      - name: Run In Language Unit Tests - ['new_hashing' disabled] (Release)
         run: forc test --error-on-warnings --release --path test/src/in_language_tests --no-experimental new_hashing
-      - name: Run In Language Unit Tests - Experimental feature 'const_generics,new_hashing' (Debug)
-        run: forc test --error-on-warnings --path test/src/in_language_tests --experimental const_generics --no-experimental new_hashing
-      - name: Run In Language Unit Tests - Experimental feature 'const_generics,new_hashing' (Release)
-        run: forc test --error-on-warnings --release --path test/src/in_language_tests --experimental const_generics --no-experimental new_hashing
+      - name: Run In Language Unit Tests - ['str_array_no_padding' enabled] (Debug)
+        run: forc test --error-on-warnings --path test/src/in_language_tests --experimental str_array_no_padding
+      - name: Run In Language Unit Tests - ['str_array_no_padding' enabled] (Release)
+        run: forc test --error-on-warnings --release --path test/src/in_language_tests --experimental str_array_no_padding
 
   forc-pkg-fuels-deps-check:
     runs-on: ubuntu-latest

test/src/in_language_tests/test_programs/primitive_conversions_str_inline_tests/src/main.sw

@@ -2,13 +2,28 @@ library;
 
 use std::primitive_conversions::str::*;
 
+#[cfg(experimental_str_array_no_padding = false)]
 #[test]
 fn str_slice_to_str_array() {
     let a = "abcd";
     let b: str[4] = a.try_as_str_array().unwrap();
-    assert(__size_of_str_array::<str[4]>() == a.len() && __size_of_val(b) == 8);
+    assert_eq(__size_of_str_array::<str[4]>(), a.len());
+    assert_eq(__size_of_val(b), 8);
 
     let c = from_str_array(b);
 
-    assert(a == c);
+    assert_eq(a, c);
+}
+
+#[cfg(experimental_str_array_no_padding = true)]
+#[test]
+fn str_slice_to_str_array() {
+    let a = "abcd";
+    let b: str[4] = a.try_as_str_array().unwrap();
+    assert_eq(__size_of_str_array::<str[4]>(), a.len());
+    assert_eq(__size_of_val(b), a.len());
+
+    let c = from_str_array(b);
+
+    assert_eq(a, c);
 }

test/src/sdk-harness/test_projects/abi_impl_methods_callable/mod.rs

@@ -2,13 +2,13 @@ use fuels::prelude::*;
 
 abigen!(Contract(
     name = "AbiImplMethodsCallable",
-    abi = "test_projects/abi_impl_methods_callable/out/release/abi_impl_methods_callable-abi.json"
+    abi = "out/abi_impl_methods_callable-abi.json"
 ));
 
 async fn get_abi_impl_methods_callable_instance() -> AbiImplMethodsCallable<Wallet> {
     let wallet = launch_provider_and_get_wallet().await.unwrap();
     let id = Contract::load_from(
-        "test_projects/abi_impl_methods_callable/out/release/abi_impl_methods_callable.bin",
+        "out/abi_impl_methods_callable.bin",
         LoadConfiguration::default(),
     )
     .unwrap()

test/src/sdk-harness/test_projects/asset_id/mod.rs

@@ -2,7 +2,7 @@ use fuels::prelude::*;
 
 abigen!(Contract(
     name = "TestAssetId",
-    abi = "test_projects/asset_id/out/release/asset_id-abi.json"
+    abi = "out/asset_id-abi.json"
 ));
 
 #[tokio::test]
@@ -25,7 +25,7 @@ async fn can_get_base_asset_id() {
 
 async fn get_instance(wallet: Wallet) -> (TestAssetId<Wallet>, ContractId) {
     let fuelcontract_id = Contract::load_from(
-        "test_projects/asset_id/out/release/asset_id.bin",
+        "out/asset_id.bin",
         LoadConfiguration::default(),
     )
     .unwrap()

test/src/sdk-harness/test_projects/asset_ops/mod.rs

@@ -7,7 +7,7 @@ use std::str::FromStr;
 
 abigen!(Contract(
     name = "TestFuelCoinContract",
-    abi = "test_projects/asset_ops/out/release/asset_ops-abi.json"
+    abi = "out/asset_ops-abi.json"
 ));
 
 #[tokio::test]
@@ -502,7 +502,7 @@ async fn can_send_message_output_without_data() {
 
 async fn get_fuelcoin_instance(wallet: Wallet) -> (TestFuelCoinContract<Wallet>, ContractId) {
     let fuelcontract_id = Contract::load_from(
-        "test_projects/asset_ops/out/release/asset_ops.bin",
+        "out/asset_ops.bin",
         LoadConfiguration::default(),
     )
     .unwrap()
@@ -522,7 +522,7 @@ async fn get_fuelcoin_instance(wallet: Wallet) -> (TestFuelCoinContract<Wallet>,
 
 async fn get_balance_contract_id(wallet: Wallet) -> ContractId {
     let balance_id = Contract::load_from(
-        "test_artifacts/balance_contract/out/release/balance_contract.bin",
+        "out/balance_contract.bin",
         LoadConfiguration::default(),
     )
     .unwrap()

test/src/sdk-harness/test_projects/auth/mod.rs

@@ -15,15 +15,15 @@ use std::str::FromStr;
 abigen!(
     Contract(
         name = "AuthContract",
-        abi = "test_artifacts/auth_testing_contract/out/release/auth_testing_contract-abi.json"
+        abi = "out/auth_testing_contract-abi.json"
     ),
     Contract(
         name = "AuthCallerContract",
-        abi = "test_artifacts/auth_caller_contract/out/release/auth_caller_contract-abi.json"
+        abi = "out/auth_caller_contract-abi.json"
     ),
     Predicate(
         name = "AuthPredicate",
-        abi = "test_artifacts/auth_predicate/out/release/auth_predicate-abi.json"
+        abi = "out/auth_predicate-abi.json"
     ),
 );
 
@@ -95,7 +95,7 @@ async fn input_message_msg_sender_from_contract() {
 
     // Setup contract
     let id = Contract::load_from(
-        "test_artifacts/auth_testing_contract/out/release/auth_testing_contract.bin",
+        "out/auth_testing_contract.bin",
         LoadConfiguration::default(),
     )
     .unwrap()
@@ -198,7 +198,7 @@ async fn caller_addresses_from_messages() {
     let wallet4 = Wallet::new(signer_4, provider.clone());
 
     let id_1 = Contract::load_from(
-        "test_artifacts/auth_testing_contract/out/release/auth_testing_contract.bin",
+        "out/auth_testing_contract.bin",
         LoadConfiguration::default(),
     )
     .unwrap()
@@ -325,7 +325,7 @@ async fn caller_addresses_from_coins() {
     let wallet4 = Wallet::new(signer_4, provider.clone());
 
     let id_1 = Contract::load_from(
-        "test_artifacts/auth_testing_contract/out/release/auth_testing_contract.bin",
+        "out/auth_testing_contract.bin",
         LoadConfiguration::default(),
     )
     .unwrap()
@@ -454,7 +454,7 @@ async fn caller_addresses_from_coins_and_messages() {
     let wallet4 = Wallet::new(signer_4, provider.clone());
 
     let id_1 = Contract::load_from(
-        "test_artifacts/auth_testing_contract/out/release/auth_testing_contract.bin",
+        "out/auth_testing_contract.bin",
         LoadConfiguration::default(),
     )
     .unwrap()
@@ -538,7 +538,7 @@ async fn get_contracts() -> (
     let wallet = launch_provider_and_get_wallet().await.unwrap();
 
     let id_1 = Contract::load_from(
-        "test_artifacts/auth_testing_contract/out/release/auth_testing_contract.bin",
+        "out/auth_testing_contract.bin",
         LoadConfiguration::default(),
     )
     .unwrap()
@@ -548,7 +548,7 @@ async fn get_contracts() -> (
     .contract_id;
 
     let id_2 = Contract::load_from(
-        "test_artifacts/auth_caller_contract/out/release/auth_caller_contract.bin",
+        "out/auth_caller_contract.bin",
         LoadConfiguration::default(),
     )
     .unwrap()
@@ -592,7 +592,7 @@ async fn can_get_predicate_address() {
         .encode_data(predicate_address)
         .unwrap();
     let predicate: Predicate =
-        Predicate::load_from("test_artifacts/auth_predicate/out/release/auth_predicate.bin")
+        Predicate::load_from("out/auth_predicate.bin")
             .unwrap()
             .with_provider(first_wallet.try_provider().unwrap().clone())
             .with_data(predicate_data);
@@ -672,7 +672,7 @@ async fn when_incorrect_predicate_address_passed() {
         .encode_data(predicate_address)
         .unwrap();
     let predicate: Predicate =
-        Predicate::load_from("test_artifacts/auth_predicate/out/release/auth_predicate.bin")
+        Predicate::load_from("out/auth_predicate.bin")
             .unwrap()
             .with_provider(first_wallet.try_provider().unwrap().clone())
             .with_data(predicate_data);
@@ -751,7 +751,7 @@ async fn can_get_predicate_address_in_message() {
         .encode_data(predicate_address)
         .unwrap();
     let predicate: Predicate =
-        Predicate::load_from("test_artifacts/auth_predicate/out/release/auth_predicate.bin")
+        Predicate::load_from("out/auth_predicate.bin")
             .unwrap()
             .with_provider(wallet.try_provider().unwrap().clone())
             .with_data(predicate_data);

test/src/sdk-harness/test_projects/block/mod.rs

@@ -4,14 +4,14 @@ use tokio::time::{sleep, Duration};
 
 abigen!(Contract(
     name = "BlockTestContract",
-    abi = "test_projects/block/out/release/block-abi.json"
+    abi = "out/block-abi.json"
 ));
 
 async fn get_block_instance() -> (BlockTestContract<Wallet>, ContractId, Provider) {
     let wallet = launch_provider_and_get_wallet().await.unwrap();
     let provider = wallet.provider();
     let id = Contract::load_from(
-        "test_projects/block/out/release/block.bin",
+        "out/block.bin",
         LoadConfiguration::default(),
     )
     .unwrap()

test/src/sdk-harness/test_projects/call_frames/mod.rs

@@ -2,13 +2,13 @@ use fuels::{prelude::*, types::ContractId};
 
 abigen!(Contract(
     name = "CallFramesTestContract",
-    abi = "test_projects/call_frames/out/release/call_frames-abi.json"
+    abi = "out/call_frames-abi.json"
 ));
 
 async fn get_call_frames_instance() -> (CallFramesTestContract<Wallet>, ContractId) {
     let wallet = launch_provider_and_get_wallet().await.unwrap();
     let id = Contract::load_from(
-        "test_projects/call_frames/out/release/call_frames.bin",
+        "out/call_frames.bin",
         LoadConfiguration::default(),
     )
     .unwrap()

test/src/sdk-harness/test_projects/configurables_in_contract/mod.rs

@@ -8,13 +8,13 @@ async fn contract_uses_default_configurables() -> Result<()> {
     abigen!(Contract(
         name = "MyContract",
         abi =
-            "test_projects/configurables_in_contract/out/release/configurables_in_contract-abi.json"
+            "out/configurables_in_contract-abi.json"
     ));
 
     let wallet = launch_provider_and_get_wallet().await.unwrap();
 
     let contract_id = Contract::load_from(
-        "test_projects/configurables_in_contract/out/release/configurables_in_contract.bin",
+        "out/configurables_in_contract.bin",
         LoadConfiguration::default(),
     )
     .unwrap()
@@ -57,7 +57,7 @@ async fn contract_configurables() -> Result<()> {
     abigen!(Contract(
         name = "MyContract",
         abi =
-            "test_projects/configurables_in_contract/out/release/configurables_in_contract-abi.json"
+            "out/configurables_in_contract-abi.json"
     ));
 
     let wallet = launch_provider_and_get_wallet().await.unwrap();
@@ -79,7 +79,7 @@ async fn contract_configurables() -> Result<()> {
         .with_MY_CONTRACT_ID(new_contract_id.clone())?;
 
     let contract_id = Contract::load_from(
-        "test_projects/configurables_in_contract/out/release/configurables_in_contract.bin",
+        "out/configurables_in_contract.bin",
         LoadConfiguration::default().with_configurables(configurables),
     )?
     .deploy(&wallet, TxPolicies::default())

test/src/sdk-harness/test_projects/configurables_in_script/mod.rs

@@ -7,11 +7,11 @@ use fuels::{prelude::*, types::SizedAsciiString};
 async fn script_uses_default_configurables() -> Result<()> {
     abigen!(Script(
         name = "MyScript",
-        abi = "test_projects/configurables_in_script/out/release/configurables_in_script-abi.json"
+        abi = "out/configurables_in_script-abi.json"
     ));
 
     let wallet = launch_provider_and_get_wallet().await.unwrap();
-    let bin_path = "test_projects/configurables_in_script/out/release/configurables_in_script.bin";
+    let bin_path = "out/configurables_in_script.bin";
     let instance = MyScript::new(wallet, bin_path);
 
     let response = instance.main().call().await?;
@@ -40,11 +40,11 @@ async fn script_uses_default_configurables() -> Result<()> {
 async fn script_configurables() -> Result<()> {
     abigen!(Script(
         name = "MyScript",
-        abi = "test_projects/configurables_in_script/out/release/configurables_in_script-abi.json"
+        abi = "out/configurables_in_script-abi.json"
     ));
 
     let wallet = launch_provider_and_get_wallet().await.unwrap();
-    let bin_path = "test_projects/configurables_in_script/out/release/configurables_in_script.bin";
+    let bin_path = "out/configurables_in_script.bin";
     let instance = MyScript::new(wallet, bin_path);
 
     let new_str: SizedAsciiString<4> = "FUEL".try_into()?;