From 7eab0cfc4a3c8d53c47e6b52f31e29cdf7aa5db8 Mon Sep 17 00:00:00 2001 From: xunilrj Date: Wed, 24 Apr 2024 16:06:51 +0100 Subject: [PATCH 01/11] set new encoding as true by default and allow it to be disabled --- forc-plugins/forc-client/src/cmd/deploy.rs | 3 ++- forc-plugins/forc-client/src/cmd/run.rs | 3 ++- forc-plugins/forc-client/src/op/deploy.rs | 2 +- forc-plugins/forc-client/src/op/run/mod.rs | 2 +- forc-plugins/forc-doc/src/cli.rs | 3 ++- forc-plugins/forc-doc/src/main.rs | 2 +- forc/src/cli/commands/build.rs | 4 ++-- forc/src/cli/commands/check.rs | 4 ++-- forc/src/cli/commands/contract_id.rs | 4 ++-- forc/src/cli/commands/predicate_root.rs | 4 ++-- forc/src/cli/commands/test.rs | 6 +++--- forc/src/ops/forc_build.rs | 2 +- forc/src/ops/forc_check.rs | 4 ++-- forc/src/ops/forc_contract_id.rs | 2 +- forc/src/ops/forc_predicate_root.rs | 2 +- test/src/e2e_vm_tests/harness.rs | 4 ++-- test/src/ir_generation/mod.rs | 2 +- test/src/main.rs | 6 +++--- 18 files changed, 31 insertions(+), 28 deletions(-) diff --git a/forc-plugins/forc-client/src/cmd/deploy.rs b/forc-plugins/forc-client/src/cmd/deploy.rs index 33336d135d8..01f97dad4a3 100644 --- a/forc-plugins/forc-client/src/cmd/deploy.rs +++ b/forc-plugins/forc-client/src/cmd/deploy.rs @@ -81,6 +81,7 @@ pub struct Command { #[clap(long, verbatim_doc_comment, name = "JSON_FILE_PATH")] pub override_storage_slots: Option, + /// Disable the "new encoding" feature #[clap(long)] - pub experimental_new_encoding: bool, + pub no_experimental_new_encoding: bool, } diff --git a/forc-plugins/forc-client/src/cmd/run.rs b/forc-plugins/forc-client/src/cmd/run.rs index 5a1e4f6ec34..872b96dbb61 100644 --- a/forc-plugins/forc-client/src/cmd/run.rs +++ b/forc-plugins/forc-client/src/cmd/run.rs @@ -59,6 +59,7 @@ pub struct Command { #[clap(long)] pub args: Option>, + /// Disable the "new encoding" feature #[clap(long)] - pub experimental_new_encoding: bool, + pub no_experimental_new_encoding: bool, } diff --git a/forc-plugins/forc-client/src/op/deploy.rs b/forc-plugins/forc-client/src/op/deploy.rs index 8c2259adaf0..ee2f2bef3c2 100644 --- a/forc-plugins/forc-client/src/op/deploy.rs +++ b/forc-plugins/forc-client/src/op/deploy.rs @@ -348,7 +348,7 @@ fn build_opts_from_cmd(cmd: &cmd::Deploy) -> pkg::BuildOpts { tests: false, member_filter: pkg::MemberFilter::only_contracts(), experimental: ExperimentalFlags { - new_encoding: cmd.experimental_new_encoding, + new_encoding: !cmd.no_experimental_new_encoding, }, } } diff --git a/forc-plugins/forc-client/src/op/run/mod.rs b/forc-plugins/forc-client/src/op/run/mod.rs index 4d87cca8f53..523f9dcd4e8 100644 --- a/forc-plugins/forc-client/src/op/run/mod.rs +++ b/forc-plugins/forc-client/src/op/run/mod.rs @@ -240,7 +240,7 @@ fn build_opts_from_cmd(cmd: &cmd::Run) -> pkg::BuildOpts { tests: false, member_filter: pkg::MemberFilter::only_scripts(), experimental: ExperimentalFlags { - new_encoding: cmd.experimental_new_encoding, + new_encoding: !cmd.no_experimental_new_encoding, }, } } diff --git a/forc-plugins/forc-doc/src/cli.rs b/forc-plugins/forc-doc/src/cli.rs index e35d0271576..220ef038bfd 100644 --- a/forc-plugins/forc-doc/src/cli.rs +++ b/forc-plugins/forc-doc/src/cli.rs @@ -53,6 +53,7 @@ pub struct Command { #[cfg(test)] pub(crate) doc_path: Option, + /// Disable the "new encoding" feature #[clap(long)] - pub experimental_new_encoding: bool, + pub no_experimental_new_encoding: bool, } diff --git a/forc-plugins/forc-doc/src/main.rs b/forc-plugins/forc-doc/src/main.rs index 38c9204bee9..fedaaa412d3 100644 --- a/forc-plugins/forc-doc/src/main.rs +++ b/forc-plugins/forc-doc/src/main.rs @@ -57,7 +57,7 @@ pub fn main() -> Result<()> { &build_instructions, &get_doc_dir, sway_core::ExperimentalFlags { - new_encoding: build_instructions.experimental_new_encoding, + new_encoding: !build_instructions.no_experimental_new_encoding, }, )?; diff --git a/forc/src/cli/commands/build.rs b/forc/src/cli/commands/build.rs index f92a73aebb3..85b6936a188 100644 --- a/forc/src/cli/commands/build.rs +++ b/forc/src/cli/commands/build.rs @@ -33,9 +33,9 @@ pub struct Command { #[clap(long)] pub tests: bool, + /// Disable the "new encoding" feature #[clap(long)] - /// Experimental flag for the "new encoding" feature - pub experimental_new_encoding: bool, + pub no_experimental_new_encoding: bool, } pub(crate) fn exec(command: Command) -> ForcResult<()> { diff --git a/forc/src/cli/commands/check.rs b/forc/src/cli/commands/check.rs index c25e05a478e..92808481fa1 100644 --- a/forc/src/cli/commands/check.rs +++ b/forc/src/cli/commands/check.rs @@ -45,9 +45,9 @@ pub struct Command { #[clap(long)] pub ipfs_node: Option, - /// Set of experimental flags + /// Disable the "new encoding" feature #[clap(long)] - pub experimental_new_encoding: bool, + pub no_experimental_new_encoding: bool, } pub(crate) fn exec(command: Command) -> ForcResult<()> { diff --git a/forc/src/cli/commands/contract_id.rs b/forc/src/cli/commands/contract_id.rs index f84771d30cf..23e1cfc02f8 100644 --- a/forc/src/cli/commands/contract_id.rs +++ b/forc/src/cli/commands/contract_id.rs @@ -29,9 +29,9 @@ pub struct Command { #[clap(flatten)] pub salt: Salt, + /// Disable the "new encoding" feature #[clap(long)] - /// Experimental flag for the "new encoding" feature - pub experimental_new_encoding: bool, + pub no_experimental_new_encoding: bool, } pub(crate) fn exec(cmd: Command) -> ForcResult<()> { diff --git a/forc/src/cli/commands/predicate_root.rs b/forc/src/cli/commands/predicate_root.rs index 93e948e3f5d..0bfa9a489d4 100644 --- a/forc/src/cli/commands/predicate_root.rs +++ b/forc/src/cli/commands/predicate_root.rs @@ -26,9 +26,9 @@ pub struct Command { #[clap(flatten)] pub build_profile: BuildProfile, + /// Disable the "new encoding" feature #[clap(long)] - /// Experimental flag for the "new encoding" feature - pub experimental_new_encoding: bool, + pub no_experimental_new_encoding: bool, } pub(crate) fn exec(cmd: Command) -> ForcResult<()> { diff --git a/forc/src/cli/commands/test.rs b/forc/src/cli/commands/test.rs index 2625b949b69..c9b99b1d7f9 100644 --- a/forc/src/cli/commands/test.rs +++ b/forc/src/cli/commands/test.rs @@ -50,9 +50,9 @@ pub struct Command { /// threads available in your system. pub test_threads: Option, + /// Disable the "new encoding" feature #[clap(long)] - /// Experimental flag for the "new encoding" feature - pub experimental_new_encoding: bool, + pub no_experimental_new_encoding: bool, } /// The set of options provided for controlling output of a test. @@ -232,7 +232,7 @@ fn opts_from_cmd(cmd: Command) -> forc_test::TestOpts { debug_outfile: cmd.build.output.debug_file, build_target: cmd.build.build_target, experimental: ExperimentalFlags { - new_encoding: cmd.experimental_new_encoding, + new_encoding: !cmd.no_experimental_new_encoding, }, } } diff --git a/forc/src/ops/forc_build.rs b/forc/src/ops/forc_build.rs index f350ebe1c00..f66fb46bb5e 100644 --- a/forc/src/ops/forc_build.rs +++ b/forc/src/ops/forc_build.rs @@ -44,7 +44,7 @@ fn opts_from_cmd(cmd: BuildCommand) -> pkg::BuildOpts { tests: cmd.tests, member_filter: Default::default(), experimental: ExperimentalFlags { - new_encoding: cmd.experimental_new_encoding, + new_encoding: !cmd.no_experimental_new_encoding, }, } } diff --git a/forc/src/ops/forc_check.rs b/forc/src/ops/forc_check.rs index 3236d16ab54..5bbb2959bae 100644 --- a/forc/src/ops/forc_check.rs +++ b/forc/src/ops/forc_check.rs @@ -16,7 +16,7 @@ pub fn check(command: CheckCommand, engines: &Engines) -> Result<(Option Result<(Option pkg::BuildOpts { tests: false, member_filter: pkg::MemberFilter::only_contracts(), experimental: ExperimentalFlags { - new_encoding: cmd.experimental_new_encoding, + new_encoding: !cmd.no_experimental_new_encoding, }, } } diff --git a/forc/src/ops/forc_predicate_root.rs b/forc/src/ops/forc_predicate_root.rs index aeb84291e14..cb5ab336f7a 100644 --- a/forc/src/ops/forc_predicate_root.rs +++ b/forc/src/ops/forc_predicate_root.rs @@ -48,7 +48,7 @@ fn build_opts_from_cmd(cmd: PredicateRootCommand) -> pkg::BuildOpts { tests: false, member_filter: pkg::MemberFilter::only_predicates(), experimental: ExperimentalFlags { - new_encoding: cmd.experimental_new_encoding, + new_encoding: !cmd.no_experimental_new_encoding, }, } } diff --git a/test/src/e2e_vm_tests/harness.rs b/test/src/e2e_vm_tests/harness.rs index eb3844ced69..c59aec4d34b 100644 --- a/test/src/e2e_vm_tests/harness.rs +++ b/test/src/e2e_vm_tests/harness.rs @@ -82,7 +82,7 @@ pub(crate) async fn deploy_contract(file_name: &str, run_config: &RunConfig) -> true => BuildProfile::RELEASE.to_string(), false => BuildProfile::DEBUG.to_string(), }, - experimental_new_encoding: run_config.experimental.new_encoding, + no_experimental_new_encoding: !run_config.experimental.new_encoding, ..Default::default() }) .await @@ -125,7 +125,7 @@ pub(crate) async fn runs_on_node( }, contract: Some(contracts), signing_key: Some(SecretKey::from_str(SECRET_KEY).unwrap()), - experimental_new_encoding: run_config.experimental.new_encoding, + no_experimental_new_encoding: !run_config.experimental.new_encoding, ..Default::default() }; run(command).await.map(|ran_scripts| { diff --git a/test/src/ir_generation/mod.rs b/test/src/ir_generation/mod.rs index 131e64ff40d..e209eca3e62 100644 --- a/test/src/ir_generation/mod.rs +++ b/test/src/ir_generation/mod.rs @@ -535,7 +535,7 @@ fn compile_core( disable_tests: false, locked: false, ipfs_node: None, - experimental_new_encoding: experimental.new_encoding, + no_experimental_new_encoding: !experimental.new_encoding, }; let res = match forc::test::forc_check::check(check_cmd, engines) { diff --git a/test/src/main.rs b/test/src/main.rs index 4841ed4cc05..196500976fa 100644 --- a/test/src/main.rs +++ b/test/src/main.rs @@ -52,9 +52,9 @@ struct Cli { #[arg(long, visible_alias = "target")] build_target: Option, - /// Experimental flag for new encoding + /// Disable the "new encoding" feature #[arg(long)] - experimental_new_encoding: bool, + no_experimental_new_encoding: bool, /// Update all output files #[arg(long)] @@ -108,7 +108,7 @@ async fn main() -> Result<()> { release: cli.release, build_target, experimental: sway_core::ExperimentalFlags { - new_encoding: cli.experimental_new_encoding, + new_encoding: !cli.no_experimental_new_encoding, }, update_output_files: cli.update_output_files, }; From daab9e61c6e54fb129cb86cc02f208311afbe68b Mon Sep 17 00:00:00 2001 From: xunilrj Date: Wed, 24 Apr 2024 16:08:44 +0100 Subject: [PATCH 02/11] better flag name --- forc-plugins/forc-client/src/cmd/deploy.rs | 2 +- forc-plugins/forc-client/src/cmd/run.rs | 2 +- forc-plugins/forc-client/src/op/deploy.rs | 2 +- forc-plugins/forc-client/src/op/run/mod.rs | 2 +- forc-plugins/forc-doc/src/cli.rs | 2 +- forc-plugins/forc-doc/src/main.rs | 2 +- forc/src/cli/commands/build.rs | 2 +- forc/src/cli/commands/check.rs | 2 +- forc/src/cli/commands/contract_id.rs | 2 +- forc/src/cli/commands/predicate_root.rs | 2 +- forc/src/cli/commands/test.rs | 4 ++-- forc/src/ops/forc_build.rs | 2 +- forc/src/ops/forc_check.rs | 4 ++-- forc/src/ops/forc_contract_id.rs | 2 +- forc/src/ops/forc_predicate_root.rs | 2 +- test/src/e2e_vm_tests/harness.rs | 4 ++-- test/src/ir_generation/mod.rs | 2 +- test/src/main.rs | 4 ++-- 18 files changed, 22 insertions(+), 22 deletions(-) diff --git a/forc-plugins/forc-client/src/cmd/deploy.rs b/forc-plugins/forc-client/src/cmd/deploy.rs index 01f97dad4a3..cf0e8cc67a2 100644 --- a/forc-plugins/forc-client/src/cmd/deploy.rs +++ b/forc-plugins/forc-client/src/cmd/deploy.rs @@ -83,5 +83,5 @@ pub struct Command { /// Disable the "new encoding" feature #[clap(long)] - pub no_experimental_new_encoding: bool, + pub no_encoding_v1: bool, } diff --git a/forc-plugins/forc-client/src/cmd/run.rs b/forc-plugins/forc-client/src/cmd/run.rs index 872b96dbb61..e23d9f6cb43 100644 --- a/forc-plugins/forc-client/src/cmd/run.rs +++ b/forc-plugins/forc-client/src/cmd/run.rs @@ -61,5 +61,5 @@ pub struct Command { /// Disable the "new encoding" feature #[clap(long)] - pub no_experimental_new_encoding: bool, + pub no_encoding_v1: bool, } diff --git a/forc-plugins/forc-client/src/op/deploy.rs b/forc-plugins/forc-client/src/op/deploy.rs index ee2f2bef3c2..79658af5b95 100644 --- a/forc-plugins/forc-client/src/op/deploy.rs +++ b/forc-plugins/forc-client/src/op/deploy.rs @@ -348,7 +348,7 @@ fn build_opts_from_cmd(cmd: &cmd::Deploy) -> pkg::BuildOpts { tests: false, member_filter: pkg::MemberFilter::only_contracts(), experimental: ExperimentalFlags { - new_encoding: !cmd.no_experimental_new_encoding, + new_encoding: !cmd.no_encoding_v1, }, } } diff --git a/forc-plugins/forc-client/src/op/run/mod.rs b/forc-plugins/forc-client/src/op/run/mod.rs index 523f9dcd4e8..19f0cf981ee 100644 --- a/forc-plugins/forc-client/src/op/run/mod.rs +++ b/forc-plugins/forc-client/src/op/run/mod.rs @@ -240,7 +240,7 @@ fn build_opts_from_cmd(cmd: &cmd::Run) -> pkg::BuildOpts { tests: false, member_filter: pkg::MemberFilter::only_scripts(), experimental: ExperimentalFlags { - new_encoding: !cmd.no_experimental_new_encoding, + new_encoding: !cmd.no_encoding_v1, }, } } diff --git a/forc-plugins/forc-doc/src/cli.rs b/forc-plugins/forc-doc/src/cli.rs index 220ef038bfd..d3cc76f8e40 100644 --- a/forc-plugins/forc-doc/src/cli.rs +++ b/forc-plugins/forc-doc/src/cli.rs @@ -55,5 +55,5 @@ pub struct Command { /// Disable the "new encoding" feature #[clap(long)] - pub no_experimental_new_encoding: bool, + pub no_encoding_v1: bool, } diff --git a/forc-plugins/forc-doc/src/main.rs b/forc-plugins/forc-doc/src/main.rs index fedaaa412d3..c3034c96b05 100644 --- a/forc-plugins/forc-doc/src/main.rs +++ b/forc-plugins/forc-doc/src/main.rs @@ -57,7 +57,7 @@ pub fn main() -> Result<()> { &build_instructions, &get_doc_dir, sway_core::ExperimentalFlags { - new_encoding: !build_instructions.no_experimental_new_encoding, + new_encoding: !build_instructions.no_encoding_v1, }, )?; diff --git a/forc/src/cli/commands/build.rs b/forc/src/cli/commands/build.rs index 85b6936a188..ae88dfebfdc 100644 --- a/forc/src/cli/commands/build.rs +++ b/forc/src/cli/commands/build.rs @@ -35,7 +35,7 @@ pub struct Command { /// Disable the "new encoding" feature #[clap(long)] - pub no_experimental_new_encoding: bool, + pub no_encoding_v1: bool, } pub(crate) fn exec(command: Command) -> ForcResult<()> { diff --git a/forc/src/cli/commands/check.rs b/forc/src/cli/commands/check.rs index 92808481fa1..4d5f41e76a3 100644 --- a/forc/src/cli/commands/check.rs +++ b/forc/src/cli/commands/check.rs @@ -47,7 +47,7 @@ pub struct Command { /// Disable the "new encoding" feature #[clap(long)] - pub no_experimental_new_encoding: bool, + pub no_encoding_v1: bool, } pub(crate) fn exec(command: Command) -> ForcResult<()> { diff --git a/forc/src/cli/commands/contract_id.rs b/forc/src/cli/commands/contract_id.rs index 23e1cfc02f8..55848428aa8 100644 --- a/forc/src/cli/commands/contract_id.rs +++ b/forc/src/cli/commands/contract_id.rs @@ -31,7 +31,7 @@ pub struct Command { /// Disable the "new encoding" feature #[clap(long)] - pub no_experimental_new_encoding: bool, + pub no_encoding_v1: bool, } pub(crate) fn exec(cmd: Command) -> ForcResult<()> { diff --git a/forc/src/cli/commands/predicate_root.rs b/forc/src/cli/commands/predicate_root.rs index 0bfa9a489d4..5c9cbb6bf04 100644 --- a/forc/src/cli/commands/predicate_root.rs +++ b/forc/src/cli/commands/predicate_root.rs @@ -28,7 +28,7 @@ pub struct Command { /// Disable the "new encoding" feature #[clap(long)] - pub no_experimental_new_encoding: bool, + pub no_encoding_v1: bool, } pub(crate) fn exec(cmd: Command) -> ForcResult<()> { diff --git a/forc/src/cli/commands/test.rs b/forc/src/cli/commands/test.rs index c9b99b1d7f9..3c36d628ffe 100644 --- a/forc/src/cli/commands/test.rs +++ b/forc/src/cli/commands/test.rs @@ -52,7 +52,7 @@ pub struct Command { /// Disable the "new encoding" feature #[clap(long)] - pub no_experimental_new_encoding: bool, + pub no_encoding_v1: bool, } /// The set of options provided for controlling output of a test. @@ -232,7 +232,7 @@ fn opts_from_cmd(cmd: Command) -> forc_test::TestOpts { debug_outfile: cmd.build.output.debug_file, build_target: cmd.build.build_target, experimental: ExperimentalFlags { - new_encoding: !cmd.no_experimental_new_encoding, + new_encoding: !cmd.no_encoding_v1, }, } } diff --git a/forc/src/ops/forc_build.rs b/forc/src/ops/forc_build.rs index f66fb46bb5e..6dc5afba490 100644 --- a/forc/src/ops/forc_build.rs +++ b/forc/src/ops/forc_build.rs @@ -44,7 +44,7 @@ fn opts_from_cmd(cmd: BuildCommand) -> pkg::BuildOpts { tests: cmd.tests, member_filter: Default::default(), experimental: ExperimentalFlags { - new_encoding: !cmd.no_experimental_new_encoding, + new_encoding: !cmd.no_encoding_v1, }, } } diff --git a/forc/src/ops/forc_check.rs b/forc/src/ops/forc_check.rs index 5bbb2959bae..7fdb7778e77 100644 --- a/forc/src/ops/forc_check.rs +++ b/forc/src/ops/forc_check.rs @@ -16,7 +16,7 @@ pub fn check(command: CheckCommand, engines: &Engines) -> Result<(Option Result<(Option pkg::BuildOpts { tests: false, member_filter: pkg::MemberFilter::only_contracts(), experimental: ExperimentalFlags { - new_encoding: !cmd.no_experimental_new_encoding, + new_encoding: !cmd.no_encoding_v1, }, } } diff --git a/forc/src/ops/forc_predicate_root.rs b/forc/src/ops/forc_predicate_root.rs index cb5ab336f7a..79c925100f6 100644 --- a/forc/src/ops/forc_predicate_root.rs +++ b/forc/src/ops/forc_predicate_root.rs @@ -48,7 +48,7 @@ fn build_opts_from_cmd(cmd: PredicateRootCommand) -> pkg::BuildOpts { tests: false, member_filter: pkg::MemberFilter::only_predicates(), experimental: ExperimentalFlags { - new_encoding: !cmd.no_experimental_new_encoding, + new_encoding: !cmd.no_encoding_v1, }, } } diff --git a/test/src/e2e_vm_tests/harness.rs b/test/src/e2e_vm_tests/harness.rs index c59aec4d34b..68187b18492 100644 --- a/test/src/e2e_vm_tests/harness.rs +++ b/test/src/e2e_vm_tests/harness.rs @@ -82,7 +82,7 @@ pub(crate) async fn deploy_contract(file_name: &str, run_config: &RunConfig) -> true => BuildProfile::RELEASE.to_string(), false => BuildProfile::DEBUG.to_string(), }, - no_experimental_new_encoding: !run_config.experimental.new_encoding, + no_encoding_v1: !run_config.experimental.new_encoding, ..Default::default() }) .await @@ -125,7 +125,7 @@ pub(crate) async fn runs_on_node( }, contract: Some(contracts), signing_key: Some(SecretKey::from_str(SECRET_KEY).unwrap()), - no_experimental_new_encoding: !run_config.experimental.new_encoding, + no_encoding_v1: !run_config.experimental.new_encoding, ..Default::default() }; run(command).await.map(|ran_scripts| { diff --git a/test/src/ir_generation/mod.rs b/test/src/ir_generation/mod.rs index e209eca3e62..5ec90c3a3c8 100644 --- a/test/src/ir_generation/mod.rs +++ b/test/src/ir_generation/mod.rs @@ -535,7 +535,7 @@ fn compile_core( disable_tests: false, locked: false, ipfs_node: None, - no_experimental_new_encoding: !experimental.new_encoding, + no_encoding_v1: !experimental.new_encoding, }; let res = match forc::test::forc_check::check(check_cmd, engines) { diff --git a/test/src/main.rs b/test/src/main.rs index 196500976fa..f9fbc31c8c7 100644 --- a/test/src/main.rs +++ b/test/src/main.rs @@ -54,7 +54,7 @@ struct Cli { /// Disable the "new encoding" feature #[arg(long)] - no_experimental_new_encoding: bool, + no_encoding_v1: bool, /// Update all output files #[arg(long)] @@ -108,7 +108,7 @@ async fn main() -> Result<()> { release: cli.release, build_target, experimental: sway_core::ExperimentalFlags { - new_encoding: !cli.no_experimental_new_encoding, + new_encoding: !cli.no_encoding_v1, }, update_output_files: cli.update_output_files, }; From ecfe5005321d4c49e8b70a62e14a7b60539466db Mon Sep 17 00:00:00 2001 From: xunilrj Date: Wed, 24 Apr 2024 16:35:35 +0100 Subject: [PATCH 03/11] fix examples to compile with encoding v1 --- examples/Forc.lock | 147 ++++++++++++++---- examples/Forc.toml | 2 +- examples/abi_supertraits/Forc.toml | 1 - examples/advanced_storage_variables/Forc.toml | 1 + examples/arrays/Forc.toml | 1 + examples/asm_return_tuple_pointer/Forc.toml | 1 + examples/basic_storage_variables/Forc.toml | 1 + examples/cei_analysis/Forc.toml | 1 + examples/configurable_constants/Forc.toml | 1 + examples/converting_types/Forc.toml | 1 + examples/counter/Forc.toml | 1 + examples/fizzbuzz/Forc.toml | 1 + examples/hashing/Forc.toml | 1 + examples/identity/Forc.toml | 1 + examples/liquidity_pool/Forc.toml | 1 + examples/match_expressions/Forc.toml | 1 + .../Forc.toml | 1 + examples/msg_sender/Forc.toml | 1 + .../multi_contract_calls/callee/Forc.toml | 1 + .../multi_contract_calls/caller/Forc.toml | 1 + examples/native_asset/Forc.toml | 1 + examples/nested_storage_variables/Forc.toml | 1 + examples/option/Forc.toml | 1 + examples/ownership/Forc.toml | 1 + examples/ref_mut_params/Forc.toml | 1 + examples/result/Forc.toml | 1 + examples/signatures/Forc.toml | 1 + examples/storage_example/Forc.toml | 1 + examples/storage_map/Forc.toml | 1 + examples/storage_namespace/Forc.toml | 1 + examples/storage_vec/Forc.toml | 1 + examples/struct_storage_variables/Forc.toml | 1 + examples/type_aliases/Forc.toml | 1 + examples/vec/Forc.toml | 1 + examples/wallet_abi/Forc.toml | 1 + .../wallet_contract_caller_script/Forc.toml | 1 + examples/wallet_smart_contract/Forc.toml | 1 + test/src/e2e_vm_tests/harness.rs | 2 +- 38 files changed, 151 insertions(+), 35 deletions(-) diff --git a/examples/Forc.lock b/examples/Forc.lock index 53da5a74a63..e48bfc248f0 100644 --- a/examples/Forc.lock +++ b/examples/Forc.lock @@ -1,26 +1,34 @@ -[[package]] -name = "abi_supertraits" -source = "member" - [[package]] name = "advanced_storage_variables" source = "member" -dependencies = ["std"] +dependencies = [ + "core", + "std", +] [[package]] name = "array" source = "member" -dependencies = ["std"] +dependencies = [ + "core", + "std", +] [[package]] name = "asm_return_tuple_pointer" source = "member" -dependencies = ["std"] +dependencies = [ + "core", + "std", +] [[package]] name = "basic_storage_variables" source = "member" -dependencies = ["std"] +dependencies = [ + "core", + "std", +] [[package]] name = "break_and_continue" @@ -30,16 +38,23 @@ dependencies = ["core"] [[package]] name = "cei_analysis" source = "member" -dependencies = ["std"] +dependencies = [ + "core", + "std", +] [[package]] name = "configurable_constants" source = "member" +dependencies = ["core"] [[package]] name = "converting_types" source = "member" -dependencies = ["std"] +dependencies = [ + "core", + "std", +] [[package]] name = "core" @@ -48,7 +63,10 @@ source = "path+from-root-70EE78029FACCEF1" [[package]] name = "counter" source = "member" -dependencies = ["std"] +dependencies = [ + "core", + "std", +] [[package]] name = "enums" @@ -57,72 +75,114 @@ source = "member" [[package]] name = "fizzbuzz" source = "member" -dependencies = ["std"] +dependencies = [ + "core", + "std", +] [[package]] name = "hashing" source = "member" -dependencies = ["std"] +dependencies = [ + "core", + "std", +] [[package]] name = "identity" source = "member" -dependencies = ["std"] +dependencies = [ + "core", + "std", +] [[package]] name = "liquidity_pool" source = "member" -dependencies = ["std"] +dependencies = [ + "core", + "std", +] [[package]] name = "match_expressions" source = "member" -dependencies = ["std"] +dependencies = [ + "core", + "std", +] [[package]] name = "methods_and_associated_functions" source = "member" -dependencies = ["std"] +dependencies = [ + "core", + "std", +] [[package]] name = "msg_sender" source = "member" -dependencies = ["std"] +dependencies = [ + "core", + "std", +] [[package]] name = "mut_ref_params" source = "member" -dependencies = ["std"] +dependencies = [ + "core", + "std", +] [[package]] name = "native_asset" source = "member" -dependencies = ["std"] +dependencies = [ + "core", + "std", +] [[package]] name = "nested_storage_variables" source = "member" -dependencies = ["std"] +dependencies = [ + "core", + "std", +] [[package]] name = "option" source = "member" -dependencies = ["std"] +dependencies = [ + "core", + "std", +] [[package]] name = "ownership" source = "member" -dependencies = ["std"] +dependencies = [ + "core", + "std", +] [[package]] name = "result" source = "member" -dependencies = ["std"] +dependencies = [ + "core", + "std", +] [[package]] name = "signatures" source = "member" -dependencies = ["std"] +dependencies = [ + "core", + "std", +] [[package]] name = "std" @@ -132,22 +192,34 @@ dependencies = ["core"] [[package]] name = "storage_example" source = "member" -dependencies = ["std"] +dependencies = [ + "core", + "std", +] [[package]] name = "storage_map" source = "member" -dependencies = ["std"] +dependencies = [ + "core", + "std", +] [[package]] name = "storage_vec" source = "member" -dependencies = ["std"] +dependencies = [ + "core", + "std", +] [[package]] name = "struct_storage_variables" source = "member" -dependencies = ["std"] +dependencies = [ + "core", + "std", +] [[package]] name = "structs" @@ -160,22 +232,32 @@ source = "member" [[package]] name = "type_aliases" source = "member" -dependencies = ["std"] +dependencies = [ + "core", + "std", +] [[package]] name = "vec" source = "member" -dependencies = ["std"] +dependencies = [ + "core", + "std", +] [[package]] name = "wallet_abi" source = "member" -dependencies = ["std"] +dependencies = [ + "core", + "std", +] [[package]] name = "wallet_contract_caller_script" source = "member" dependencies = [ + "core", "std", "wallet_abi", ] @@ -184,6 +266,7 @@ dependencies = [ name = "wallet_smart_contract" source = "member" dependencies = [ + "core", "std", "wallet_abi", ] diff --git a/examples/Forc.toml b/examples/Forc.toml index 164c580642e..22ad5196594 100644 --- a/examples/Forc.toml +++ b/examples/Forc.toml @@ -2,7 +2,7 @@ # in the Sway repo, where each example is a package member of the workspace. [workspace] members = [ - "abi_supertraits", + # "abi_supertraits", "advanced_storage_variables", "arrays", "methods_and_associated_functions", diff --git a/examples/abi_supertraits/Forc.toml b/examples/abi_supertraits/Forc.toml index 395d01a3046..20866fe9816 100644 --- a/examples/abi_supertraits/Forc.toml +++ b/examples/abi_supertraits/Forc.toml @@ -1,6 +1,5 @@ [project] authors = ["Fuel Labs "] entry = "main.sw" -implicit-std = false license = "Apache-2.0" name = "abi_supertraits" diff --git a/examples/advanced_storage_variables/Forc.toml b/examples/advanced_storage_variables/Forc.toml index 0969100ab32..48a765d460c 100644 --- a/examples/advanced_storage_variables/Forc.toml +++ b/examples/advanced_storage_variables/Forc.toml @@ -5,4 +5,5 @@ license = "Apache-2.0" name = "advanced_storage_variables" [dependencies] +core = { path = "../../sway-lib-core" } std = { path = "../../sway-lib-std" } diff --git a/examples/arrays/Forc.toml b/examples/arrays/Forc.toml index 988014ff958..fcf0b2a6588 100644 --- a/examples/arrays/Forc.toml +++ b/examples/arrays/Forc.toml @@ -5,4 +5,5 @@ license = "Apache-2.0" name = "array" [dependencies] +core = { path = "../../sway-lib-core" } std = { path = "../../sway-lib-std" } diff --git a/examples/asm_return_tuple_pointer/Forc.toml b/examples/asm_return_tuple_pointer/Forc.toml index ecc279d34aa..db3a4b1de2b 100644 --- a/examples/asm_return_tuple_pointer/Forc.toml +++ b/examples/asm_return_tuple_pointer/Forc.toml @@ -5,4 +5,5 @@ license = "Apache-2.0" name = "asm_return_tuple_pointer" [dependencies] +core = { path = "../../sway-lib-core" } std = { path = "../../sway-lib-std" } diff --git a/examples/basic_storage_variables/Forc.toml b/examples/basic_storage_variables/Forc.toml index 35a74c95d94..04fc13b74d3 100644 --- a/examples/basic_storage_variables/Forc.toml +++ b/examples/basic_storage_variables/Forc.toml @@ -5,4 +5,5 @@ license = "Apache-2.0" name = "basic_storage_variables" [dependencies] +core = { path = "../../sway-lib-core" } std = { path = "../../sway-lib-std" } diff --git a/examples/cei_analysis/Forc.toml b/examples/cei_analysis/Forc.toml index 5b539dfbb58..879f26ec02a 100644 --- a/examples/cei_analysis/Forc.toml +++ b/examples/cei_analysis/Forc.toml @@ -5,4 +5,5 @@ license = "Apache-2.0" name = "cei_analysis" [dependencies] +core = { path = "../../sway-lib-core" } std = { path = "../../sway-lib-std" } diff --git a/examples/configurable_constants/Forc.toml b/examples/configurable_constants/Forc.toml index 77093087307..a01d719609c 100644 --- a/examples/configurable_constants/Forc.toml +++ b/examples/configurable_constants/Forc.toml @@ -6,3 +6,4 @@ license = "Apache-2.0" name = "configurable_constants" [dependencies] +core = { path = "../../sway-lib-core" } diff --git a/examples/converting_types/Forc.toml b/examples/converting_types/Forc.toml index d5278ed445b..11051b2f56f 100644 --- a/examples/converting_types/Forc.toml +++ b/examples/converting_types/Forc.toml @@ -5,4 +5,5 @@ license = "Apache-2.0" name = "converting_types" [dependencies] +core = { path = "../../sway-lib-core" } std = { path = "../../sway-lib-std" } diff --git a/examples/counter/Forc.toml b/examples/counter/Forc.toml index dc50d3fe1f1..c06a112e05f 100644 --- a/examples/counter/Forc.toml +++ b/examples/counter/Forc.toml @@ -5,4 +5,5 @@ license = "Apache-2.0" name = "counter" [dependencies] +core = { path = "../../sway-lib-core" } std = { path = "../../sway-lib-std" } diff --git a/examples/fizzbuzz/Forc.toml b/examples/fizzbuzz/Forc.toml index 147999d0e1b..c5a80ddf4b2 100644 --- a/examples/fizzbuzz/Forc.toml +++ b/examples/fizzbuzz/Forc.toml @@ -5,4 +5,5 @@ license = "Apache-2.0" name = "fizzbuzz" [dependencies] +core = { path = "../../sway-lib-core" } std = { path = "../../sway-lib-std" } diff --git a/examples/hashing/Forc.toml b/examples/hashing/Forc.toml index a2637d5c84d..1d1ca9a3abf 100644 --- a/examples/hashing/Forc.toml +++ b/examples/hashing/Forc.toml @@ -5,4 +5,5 @@ license = "Apache-2.0" name = "hashing" [dependencies] +core = { path = "../../sway-lib-core" } std = { path = "../../sway-lib-std" } diff --git a/examples/identity/Forc.toml b/examples/identity/Forc.toml index dfeb9804136..f6e642d51c1 100644 --- a/examples/identity/Forc.toml +++ b/examples/identity/Forc.toml @@ -5,4 +5,5 @@ license = "Apache-2.0" name = "identity" [dependencies] +core = { path = "../../sway-lib-core" } std = { path = "../../sway-lib-std" } diff --git a/examples/liquidity_pool/Forc.toml b/examples/liquidity_pool/Forc.toml index 7f1561c5fbd..7a7e147313d 100644 --- a/examples/liquidity_pool/Forc.toml +++ b/examples/liquidity_pool/Forc.toml @@ -5,4 +5,5 @@ license = "Apache-2.0" name = "liquidity_pool" [dependencies] +core = { path = "../../sway-lib-core" } std = { path = "../../sway-lib-std" } diff --git a/examples/match_expressions/Forc.toml b/examples/match_expressions/Forc.toml index b3935ba1183..13a8e058163 100644 --- a/examples/match_expressions/Forc.toml +++ b/examples/match_expressions/Forc.toml @@ -5,4 +5,5 @@ license = "Apache-2.0" name = "match_expressions" [dependencies] +core = { path = "../../sway-lib-core" } std = { path = "../../sway-lib-std" } diff --git a/examples/methods_and_associated_functions/Forc.toml b/examples/methods_and_associated_functions/Forc.toml index afcb203f4d9..eb1a10d72d3 100644 --- a/examples/methods_and_associated_functions/Forc.toml +++ b/examples/methods_and_associated_functions/Forc.toml @@ -5,4 +5,5 @@ license = "Apache-2.0" name = "methods_and_associated_functions" [dependencies] +core = { path = "../../sway-lib-core" } std = { path = "../../sway-lib-std" } diff --git a/examples/msg_sender/Forc.toml b/examples/msg_sender/Forc.toml index f1e8a739b36..395cd8d0450 100644 --- a/examples/msg_sender/Forc.toml +++ b/examples/msg_sender/Forc.toml @@ -5,4 +5,5 @@ license = "Apache-2.0" name = "msg_sender" [dependencies] +core = { path = "../../sway-lib-core" } std = { path = "../../sway-lib-std" } diff --git a/examples/multi_contract_calls/callee/Forc.toml b/examples/multi_contract_calls/callee/Forc.toml index 9959c9fcb97..01c38ee3ab8 100644 --- a/examples/multi_contract_calls/callee/Forc.toml +++ b/examples/multi_contract_calls/callee/Forc.toml @@ -5,4 +5,5 @@ license = "Apache-2.0" name = "callee" [dependencies] +core = { path = "../../../sway-lib-core" } std = { path = "../../../sway-lib-std/" } diff --git a/examples/multi_contract_calls/caller/Forc.toml b/examples/multi_contract_calls/caller/Forc.toml index ec9ddce7d28..ca6bfbb8c31 100644 --- a/examples/multi_contract_calls/caller/Forc.toml +++ b/examples/multi_contract_calls/caller/Forc.toml @@ -6,6 +6,7 @@ license = "Apache-2.0" name = "caller" [dependencies] +core = { path = "../../../sway-lib-core" } std = { path = "../../../sway-lib-std/" } [contract-dependencies] diff --git a/examples/native_asset/Forc.toml b/examples/native_asset/Forc.toml index 9dffa5014ae..06e4057cf04 100644 --- a/examples/native_asset/Forc.toml +++ b/examples/native_asset/Forc.toml @@ -5,4 +5,5 @@ license = "Apache-2.0" name = "native_asset" [dependencies] +core = { path = "../../sway-lib-core" } std = { path = "../../sway-lib-std" } diff --git a/examples/nested_storage_variables/Forc.toml b/examples/nested_storage_variables/Forc.toml index 580a41a66dd..a73e93d79d2 100644 --- a/examples/nested_storage_variables/Forc.toml +++ b/examples/nested_storage_variables/Forc.toml @@ -5,4 +5,5 @@ license = "Apache-2.0" name = "nested_storage_variables" [dependencies] +core = { path = "../../sway-lib-core" } std = { path = "../../sway-lib-std" } diff --git a/examples/option/Forc.toml b/examples/option/Forc.toml index 293c23f4068..f8228bf3f7a 100644 --- a/examples/option/Forc.toml +++ b/examples/option/Forc.toml @@ -5,4 +5,5 @@ license = "Apache-2.0" name = "option" [dependencies] +core = { path = "../../sway-lib-core" } std = { path = "../../sway-lib-std" } diff --git a/examples/ownership/Forc.toml b/examples/ownership/Forc.toml index c4965df213e..ebc10743324 100644 --- a/examples/ownership/Forc.toml +++ b/examples/ownership/Forc.toml @@ -5,4 +5,5 @@ license = "Apache-2.0" name = "ownership" [dependencies] +core = { path = "../../sway-lib-core" } std = { path = "../../sway-lib-std" } diff --git a/examples/ref_mut_params/Forc.toml b/examples/ref_mut_params/Forc.toml index ad341c0b52c..e70e57a9004 100644 --- a/examples/ref_mut_params/Forc.toml +++ b/examples/ref_mut_params/Forc.toml @@ -5,4 +5,5 @@ license = "Apache-2.0" name = "mut_ref_params" [dependencies] +core = { path = "../../sway-lib-core" } std = { path = "../../sway-lib-std" } diff --git a/examples/result/Forc.toml b/examples/result/Forc.toml index f3aef8f1410..2fba8a0665f 100644 --- a/examples/result/Forc.toml +++ b/examples/result/Forc.toml @@ -5,4 +5,5 @@ license = "Apache-2.0" name = "result" [dependencies] +core = { path = "../../sway-lib-core" } std = { path = "../../sway-lib-std" } diff --git a/examples/signatures/Forc.toml b/examples/signatures/Forc.toml index 9323308b4a3..27548df1fb7 100644 --- a/examples/signatures/Forc.toml +++ b/examples/signatures/Forc.toml @@ -5,4 +5,5 @@ license = "Apache-2.0" name = "signatures" [dependencies] +core = { path = "../../sway-lib-core" } std = { path = "../../sway-lib-std" } diff --git a/examples/storage_example/Forc.toml b/examples/storage_example/Forc.toml index d6b710f9bb6..bd285a88d1b 100644 --- a/examples/storage_example/Forc.toml +++ b/examples/storage_example/Forc.toml @@ -5,4 +5,5 @@ license = "Apache-2.0" name = "storage_example" [dependencies] +core = { path = "../../sway-lib-core" } std = { path = "../../sway-lib-std" } diff --git a/examples/storage_map/Forc.toml b/examples/storage_map/Forc.toml index ff297be54bc..60b8db1f392 100644 --- a/examples/storage_map/Forc.toml +++ b/examples/storage_map/Forc.toml @@ -5,4 +5,5 @@ license = "Apache-2.0" name = "storage_map" [dependencies] +core = { path = "../../sway-lib-core" } std = { path = "../../sway-lib-std" } diff --git a/examples/storage_namespace/Forc.toml b/examples/storage_namespace/Forc.toml index 35de0d1b073..cf85f8cce64 100644 --- a/examples/storage_namespace/Forc.toml +++ b/examples/storage_namespace/Forc.toml @@ -5,4 +5,5 @@ license = "Apache-2.0" name = "storage_namespace" [dependencies] +core = { path = "../../sway-lib-core" } std = { path = "../../sway-lib-std" } diff --git a/examples/storage_vec/Forc.toml b/examples/storage_vec/Forc.toml index fb4b3b88dbb..0cd00b7f471 100644 --- a/examples/storage_vec/Forc.toml +++ b/examples/storage_vec/Forc.toml @@ -5,4 +5,5 @@ license = "Apache-2.0" name = "storage_vec" [dependencies] +core = { path = "../../sway-lib-core" } std = { path = "../../sway-lib-std" } diff --git a/examples/struct_storage_variables/Forc.toml b/examples/struct_storage_variables/Forc.toml index 2112c2708ff..3f2997e49f8 100644 --- a/examples/struct_storage_variables/Forc.toml +++ b/examples/struct_storage_variables/Forc.toml @@ -5,4 +5,5 @@ license = "Apache-2.0" name = "struct_storage_variables" [dependencies] +core = { path = "../../sway-lib-core" } std = { path = "../../sway-lib-std" } diff --git a/examples/type_aliases/Forc.toml b/examples/type_aliases/Forc.toml index 26c78d2c01d..29ece587331 100644 --- a/examples/type_aliases/Forc.toml +++ b/examples/type_aliases/Forc.toml @@ -5,4 +5,5 @@ license = "Apache-2.0" name = "type_aliases" [dependencies] +core = { path = "../../sway-lib-core" } std = { path = "../../sway-lib-std" } diff --git a/examples/vec/Forc.toml b/examples/vec/Forc.toml index eab8e351288..62afd0c6ddf 100644 --- a/examples/vec/Forc.toml +++ b/examples/vec/Forc.toml @@ -5,4 +5,5 @@ license = "Apache-2.0" name = "vec" [dependencies] +core = { path = "../../sway-lib-core" } std = { path = "../../sway-lib-std" } diff --git a/examples/wallet_abi/Forc.toml b/examples/wallet_abi/Forc.toml index 81436867576..957d2c314ab 100644 --- a/examples/wallet_abi/Forc.toml +++ b/examples/wallet_abi/Forc.toml @@ -5,4 +5,5 @@ license = "Apache-2.0" name = "wallet_abi" [dependencies] +core = { path = "../../sway-lib-core" } std = { path = "../../sway-lib-std" } diff --git a/examples/wallet_contract_caller_script/Forc.toml b/examples/wallet_contract_caller_script/Forc.toml index f26b7b4ee1a..4b8d87ed804 100644 --- a/examples/wallet_contract_caller_script/Forc.toml +++ b/examples/wallet_contract_caller_script/Forc.toml @@ -5,5 +5,6 @@ license = "Apache-2.0" name = "wallet_contract_caller_script" [dependencies] +core = { path = "../../sway-lib-core" } std = { path = "../../sway-lib-std" } wallet_abi = { path = "../wallet_abi" } diff --git a/examples/wallet_smart_contract/Forc.toml b/examples/wallet_smart_contract/Forc.toml index 8abfa09f6eb..0b26e317149 100644 --- a/examples/wallet_smart_contract/Forc.toml +++ b/examples/wallet_smart_contract/Forc.toml @@ -5,5 +5,6 @@ license = "Apache-2.0" name = "wallet_smart_contract" [dependencies] +core = { path = "../../sway-lib-core" } std = { path = "../../sway-lib-std" } wallet_abi = { path = "../wallet_abi" } diff --git a/test/src/e2e_vm_tests/harness.rs b/test/src/e2e_vm_tests/harness.rs index 68187b18492..34cd7a680e1 100644 --- a/test/src/e2e_vm_tests/harness.rs +++ b/test/src/e2e_vm_tests/harness.rs @@ -82,7 +82,7 @@ pub(crate) async fn deploy_contract(file_name: &str, run_config: &RunConfig) -> true => BuildProfile::RELEASE.to_string(), false => BuildProfile::DEBUG.to_string(), }, - no_encoding_v1: !run_config.experimental.new_encoding, + no_encoding_v1: !dbg!(run_config.experimental.new_encoding), ..Default::default() }) .await From a476069eac05c264b8ee1a423f4bac2378e819f3 Mon Sep 17 00:00:00 2001 From: xunilrj Date: Wed, 24 Apr 2024 17:00:34 +0100 Subject: [PATCH 04/11] fix abi with super traits for encoding v1 --- .../ast_node/declaration/declaration.rs | 36 +++++++++++-------- sway-core/src/type_system/info.rs | 4 +++ 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/sway-core/src/semantic_analysis/ast_node/declaration/declaration.rs b/sway-core/src/semantic_analysis/ast_node/declaration/declaration.rs index cc94a7f3003..764c2b74299 100644 --- a/sway-core/src/semantic_analysis/ast_node/declaration/declaration.rs +++ b/sway-core/src/semantic_analysis/ast_node/declaration/declaration.rs @@ -278,20 +278,12 @@ impl TyDecl { Err(err) => return Ok(ty::TyDecl::ErrorRecovery(span, err)), }; - // if this ImplTrait implements a trait and not an ABI, - // we insert its methods into the context - // otherwise, if it implements an ABI, - // we insert its methods with a prefix - let emp_vec = vec![]; - let impl_trait_items = if let Ok(ty::TyDecl::TraitDecl { .. }) = - ctx.namespace().resolve_call_path_typed( - &Handler::default(), - engines, - &impl_trait.trait_name, - ctx.self_type(), - ) { - &impl_trait.items - } else { + // Insert prefixed symbols when implementing_for is Contract + let is_contract = engines + .te() + .get(impl_trait.implementing_for.type_id) + .is_contract(); + if is_contract { for i in &impl_trait.items { if let ty::TyTraitItem::Fn(f) = i { let decl = engines.de().get(f.id()); @@ -314,8 +306,22 @@ impl TyDecl { }); } } + } - &emp_vec + // Choose which items are going to be visible depending if this is an abi impl + // or trait impl + let t = ctx.namespace().resolve_call_path_typed( + &Handler::default(), + engines, + &impl_trait.trait_name, + ctx.self_type(), + ); + + let empty_vec = vec![]; + let impl_trait_items = if let Ok(ty::TyDecl::TraitDecl { .. }) = t { + &impl_trait.items + } else { + &empty_vec }; ctx.insert_trait_implementation( diff --git a/sway-core/src/type_system/info.rs b/sway-core/src/type_system/info.rs index 430278d9eb2..aab9c217b72 100644 --- a/sway-core/src/type_system/info.rs +++ b/sway-core/src/type_system/info.rs @@ -1164,6 +1164,10 @@ impl TypeInfo { matches!(self, TypeInfo::Array(_, _)) } + pub fn is_contract(&self) -> bool { + matches!(self, TypeInfo::Contract) + } + pub fn is_struct(&self) -> bool { matches!(self, TypeInfo::Struct(_)) } From 272240e3c536b447321d906e3ae5239f79b31055 Mon Sep 17 00:00:00 2001 From: xunilrj Date: Wed, 24 Apr 2024 17:41:17 +0100 Subject: [PATCH 05/11] fix docs projects --- docs/reference/src/code/Forc.lock | 327 +++++++++--------- .../traits/associated-consts/Forc.toml | 1 - .../src/code/operations/namespace/Forc.toml | 1 + .../src/code/operations/namespace/src/lib.sw | 3 + 4 files changed, 174 insertions(+), 158 deletions(-) diff --git a/docs/reference/src/code/Forc.lock b/docs/reference/src/code/Forc.lock index 452e710f181..5331b9fb9e3 100644 --- a/docs/reference/src/code/Forc.lock +++ b/docs/reference/src/code/Forc.lock @@ -1,268 +1,281 @@ [[package]] -name = 'annotation_style' -source = 'member' -dependencies = ['std'] +name = "annotation_style" +source = "member" +dependencies = ["std path+from-root-0F28276288D2432C"] [[package]] -name = 'annotations' -source = 'member' -dependencies = ['std'] +name = "annotations" +source = "member" +dependencies = ["std path+from-root-0F28276288D2432C"] [[package]] -name = 'arrays' -source = 'member' -dependencies = ['std'] +name = "arrays" +source = "member" +dependencies = ["std path+from-root-0F28276288D2432C"] [[package]] -name = 'assertions' -source = 'member' -dependencies = ['std'] +name = "assertions" +source = "member" +dependencies = ["std path+from-root-0F28276288D2432C"] [[package]] -name = 'asset_operations' -source = 'member' -dependencies = ['std'] +name = "asset_operations" +source = "member" +dependencies = ["std path+from-root-0F28276288D2432C"] [[package]] -name = 'associated-consts' -source = 'member' +name = "associated-consts" +source = "member" +dependencies = ["std git+https://github.com/fuellabs/sway?tag=v0.55.0#60ea55e692f4f70730b500735e13c29df2ac727e"] [[package]] -name = 'booleans' -source = 'member' -dependencies = ['std'] +name = "booleans" +source = "member" +dependencies = ["std path+from-root-0F28276288D2432C"] [[package]] -name = 'bytes' -source = 'member' -dependencies = ['std'] +name = "bytes" +source = "member" +dependencies = ["std path+from-root-0F28276288D2432C"] [[package]] -name = 'call' -source = 'member' +name = "call" +source = "member" dependencies = [ - 'contract_interface', - 'std', + "contract_interface", + "std path+from-root-0F28276288D2432C", ] [[package]] -name = 'call_data' -source = 'member' -dependencies = ['std'] +name = "call_data" +source = "member" +dependencies = ["std path+from-root-0F28276288D2432C"] [[package]] -name = 'comments' -source = 'member' -dependencies = ['std'] +name = "comments" +source = "member" +dependencies = ["std path+from-root-0F28276288D2432C"] [[package]] -name = 'constants' -source = 'member' +name = "constants" +source = "member" [[package]] -name = 'contract_interface' -source = 'member' -dependencies = ['std'] +name = "contract_interface" +source = "member" +dependencies = ["std path+from-root-0F28276288D2432C"] [[package]] -name = 'control_flow' -source = 'member' -dependencies = ['std'] +name = "control_flow" +source = "member" +dependencies = ["std path+from-root-0F28276288D2432C"] [[package]] -name = 'core' -source = 'path+from-root-0F28276288D2432C' +name = "core" +source = "path+from-root-0F28276288D2432C" [[package]] -name = 'counter' -source = 'member' -dependencies = ['std'] +name = "core" +source = "path+from-root-6074AE318B2A365C" [[package]] -name = 'empty_storage_init' -source = 'member' -dependencies = ['std'] +name = "counter" +source = "member" +dependencies = ["std path+from-root-0F28276288D2432C"] [[package]] -name = 'enum-advanced' -source = 'member' -dependencies = ['std'] +name = "empty_storage_init" +source = "member" +dependencies = ["std path+from-root-0F28276288D2432C"] [[package]] -name = 'enum_style' -source = 'member' -dependencies = ['std'] +name = "enum-advanced" +source = "member" +dependencies = ["std path+from-root-0F28276288D2432C"] [[package]] -name = 'enums' -source = 'member' -dependencies = ['std'] +name = "enum_style" +source = "member" +dependencies = ["std path+from-root-0F28276288D2432C"] [[package]] -name = 'fizzbuzz' -source = 'member' -dependencies = ['std'] +name = "enums" +source = "member" +dependencies = ["std path+from-root-0F28276288D2432C"] [[package]] -name = 'functions' -source = 'member' -dependencies = ['std'] +name = "fizzbuzz" +source = "member" +dependencies = ["std path+from-root-0F28276288D2432C"] [[package]] -name = 'getters' -source = 'member' -dependencies = ['std'] +name = "functions" +source = "member" +dependencies = ["std path+from-root-0F28276288D2432C"] [[package]] -name = 'hashing' -source = 'member' -dependencies = ['std'] +name = "getters" +source = "member" +dependencies = ["std path+from-root-0F28276288D2432C"] [[package]] -name = 'interface' -source = 'member' -dependencies = ['std'] +name = "hashing" +source = "member" +dependencies = ["std path+from-root-0F28276288D2432C"] [[package]] -name = 'intermediate_variables' -source = 'member' +name = "interface" +source = "member" +dependencies = ["std path+from-root-0F28276288D2432C"] + +[[package]] +name = "intermediate_variables" +source = "member" dependencies = [ - 'core', - 'std', + "core path+from-root-0F28276288D2432C", + "std path+from-root-0F28276288D2432C", ] [[package]] -name = 'letter_casing' -source = 'member' -dependencies = ['std'] +name = "letter_casing" +source = "member" +dependencies = ["std path+from-root-0F28276288D2432C"] [[package]] -name = 'logging' -source = 'member' -dependencies = ['std'] +name = "logging" +source = "member" +dependencies = ["std path+from-root-0F28276288D2432C"] [[package]] -name = 'my_lib' -source = 'member' -dependencies = ['std'] +name = "my_lib" +source = "member" +dependencies = ["std path+from-root-0F28276288D2432C"] [[package]] -name = 'my_library' -source = 'member' +name = "my_library" +source = "member" dependencies = [ - 'my_other_library', - 'std', + "my_other_library", + "std path+from-root-0F28276288D2432C", ] [[package]] -name = 'my_other_library' -source = 'member' -dependencies = ['std'] +name = "my_other_library" +source = "member" +dependencies = ["std path+from-root-0F28276288D2432C"] + +[[package]] +name = "namespace" +source = "member" +dependencies = [ + "core path+from-root-0F28276288D2432C", + "std path+from-root-0F28276288D2432C", +] [[package]] -name = 'namespace' -source = 'member' -dependencies = ['std'] +name = "numerics" +source = "member" +dependencies = ["std path+from-root-0F28276288D2432C"] [[package]] -name = 'numerics' -source = 'member' -dependencies = ['std'] +name = "ownership" +source = "member" +dependencies = ["std path+from-root-0F28276288D2432C"] [[package]] -name = 'ownership' -source = 'member' -dependencies = ['std'] +name = "pattern_matching" +source = "member" +dependencies = ["std path+from-root-0F28276288D2432C"] [[package]] -name = 'pattern_matching' -source = 'member' -dependencies = ['std'] +name = "reading_writing_to_storage" +source = "member" +dependencies = ["std path+from-root-0F28276288D2432C"] [[package]] -name = 'reading_writing_to_storage' -source = 'member' -dependencies = ['std'] +name = "simple_predicate" +source = "member" +dependencies = ["std path+from-root-0F28276288D2432C"] [[package]] -name = 'simple_predicate' -source = 'member' -dependencies = ['std'] +name = "simple_script" +source = "member" +dependencies = ["std path+from-root-0F28276288D2432C"] [[package]] -name = 'simple_script' -source = 'member' -dependencies = ['std'] +name = "std" +source = "git+https://github.com/fuellabs/sway?tag=v0.55.0#60ea55e692f4f70730b500735e13c29df2ac727e" +dependencies = ["core path+from-root-6074AE318B2A365C"] [[package]] -name = 'std' -source = 'path+from-root-0F28276288D2432C' -dependencies = ['core'] +name = "std" +source = "path+from-root-0F28276288D2432C" +dependencies = ["core path+from-root-0F28276288D2432C"] [[package]] -name = 'storage_init' -source = 'member' -dependencies = ['std'] +name = "storage_init" +source = "member" +dependencies = ["std path+from-root-0F28276288D2432C"] [[package]] -name = 'storage_map' -source = 'member' -dependencies = ['std'] +name = "storage_map" +source = "member" +dependencies = ["std path+from-root-0F28276288D2432C"] [[package]] -name = 'storage_vec' -source = 'member' -dependencies = ['std'] +name = "storage_vec" +source = "member" +dependencies = ["std path+from-root-0F28276288D2432C"] [[package]] -name = 'store_get' -source = 'member' -dependencies = ['std'] +name = "store_get" +source = "member" +dependencies = ["std path+from-root-0F28276288D2432C"] [[package]] -name = 'string_issue' -source = 'member' -dependencies = ['std'] +name = "string_issue" +source = "member" +dependencies = ["std path+from-root-0F28276288D2432C"] [[package]] -name = 'strings' -source = 'member' -dependencies = ['std'] +name = "strings" +source = "member" +dependencies = ["std path+from-root-0F28276288D2432C"] [[package]] -name = 'struct_shorthand' -source = 'member' -dependencies = ['std'] +name = "struct_shorthand" +source = "member" +dependencies = ["std path+from-root-0F28276288D2432C"] [[package]] -name = 'structs' -source = 'member' -dependencies = ['std'] +name = "structs" +source = "member" +dependencies = ["std path+from-root-0F28276288D2432C"] [[package]] -name = 'tuples' -source = 'member' -dependencies = ['std'] +name = "tuples" +source = "member" +dependencies = ["std path+from-root-0F28276288D2432C"] [[package]] -name = 'unused_variables' -source = 'member' -dependencies = ['std'] +name = "unused_variables" +source = "member" +dependencies = ["std path+from-root-0F28276288D2432C"] [[package]] -name = 'variables' -source = 'member' -dependencies = ['std'] +name = "variables" +source = "member" +dependencies = ["std path+from-root-0F28276288D2432C"] [[package]] -name = 'wallet' -source = 'member' +name = "wallet" +source = "member" dependencies = [ - 'interface', - 'std', + "interface", + "std path+from-root-0F28276288D2432C", ] [[package]] -name = 'wallet_example' -source = 'member' -dependencies = ['std'] +name = "wallet_example" +source = "member" +dependencies = ["std path+from-root-0F28276288D2432C"] diff --git a/docs/reference/src/code/language/traits/associated-consts/Forc.toml b/docs/reference/src/code/language/traits/associated-consts/Forc.toml index 0b38d540886..27d00236c0c 100644 --- a/docs/reference/src/code/language/traits/associated-consts/Forc.toml +++ b/docs/reference/src/code/language/traits/associated-consts/Forc.toml @@ -3,6 +3,5 @@ authors = ["Fuel Labs "] entry = "lib.sw" license = "Apache-2.0" name = "associated-consts" -implicit-std = false [dependencies] diff --git a/docs/reference/src/code/operations/namespace/Forc.toml b/docs/reference/src/code/operations/namespace/Forc.toml index f371938aa58..87e21ea0094 100644 --- a/docs/reference/src/code/operations/namespace/Forc.toml +++ b/docs/reference/src/code/operations/namespace/Forc.toml @@ -5,4 +5,5 @@ license = "Apache-2.0" name = "namespace" [dependencies] +core = { path = "../../../../../../sway-lib-core" } std = { path = "../../../../../../sway-lib-std" } diff --git a/docs/reference/src/code/operations/namespace/src/lib.sw b/docs/reference/src/code/operations/namespace/src/lib.sw index b6f15db9896..343e59dc049 100644 --- a/docs/reference/src/code/operations/namespace/src/lib.sw +++ b/docs/reference/src/code/operations/namespace/src/lib.sw @@ -1,5 +1,6 @@ library; +/* External declarations // ANCHOR: address pub struct Address { bits: b256, @@ -16,6 +17,8 @@ pub enum Identity { ContractId: ContractId, } // ANCHOR_END: identity +*/ + fn address_cast() { // ANCHOR: address_cast let variable1 = 0x000000000000000000000000000000000000000000000000000000000000002A; From 108d6430fbccf83521f15a031f7697357535e442 Mon Sep 17 00:00:00 2001 From: xunilrj Date: Wed, 24 Apr 2024 17:52:56 +0100 Subject: [PATCH 06/11] fix for evm and midenvm. and other fixes for envoding v1 --- .github/workflows/ci.yml | 4 ++-- .../should_pass/conditional_compilation/compile/Forc.lock | 5 +++++ .../should_pass/conditional_compilation/compile/Forc.toml | 3 ++- .../test_programs/should_pass/supertraits_for_abis/Forc.toml | 4 +++- .../src/sdk-harness/test_projects/low_level_call/src/main.sw | 4 ++-- 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 617a7aeeb25..a95920384ee 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -353,7 +353,7 @@ jobs: toolchain: ${{ env.RUST_VERSION }} - uses: Swatinem/rust-cache@v2 - name: Cargo Run E2E Tests (EVM) - run: cargo run --locked --release --bin test -- --target evm --locked + run: cargo run --locked --release --bin test -- --target evm --locked --no-encoding-v1 cargo-run-e2e-test-midenvm: runs-on: ubuntu-latest @@ -365,7 +365,7 @@ jobs: toolchain: ${{ env.RUST_VERSION }} - uses: Swatinem/rust-cache@v2 - name: Cargo Run E2E Tests (EVM) - run: cargo run --locked --release --bin test -- --target midenvm --locked + run: cargo run --locked --release --bin test -- --target midenvm --locked --no-encoding-v1 # TODO: Remove this upon merging std tests with the rest of the E2E tests. cargo-test-lib-std: diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/conditional_compilation/compile/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_pass/conditional_compilation/compile/Forc.lock index 2debe09d980..69b0ee59fa0 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/conditional_compilation/compile/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_pass/conditional_compilation/compile/Forc.lock @@ -1,3 +1,8 @@ [[package]] name = "compile" source = "member" +dependencies = ["core"] + +[[package]] +name = "core" +source = "path+from-root-562067C9B9733E2A" diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/conditional_compilation/compile/Forc.toml b/test/src/e2e_vm_tests/test_programs/should_pass/conditional_compilation/compile/Forc.toml index 45cff3bb85a..99c60acb5d4 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/conditional_compilation/compile/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/conditional_compilation/compile/Forc.toml @@ -1,7 +1,8 @@ [project] authors = ["Fuel Labs "] entry = "main.sw" -implicit-std = false license = "Apache-2.0" name = "compile" +[dependencies] +core = { path = "../../../../../../../sway-lib-core" } diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/supertraits_for_abis/Forc.toml b/test/src/e2e_vm_tests/test_programs/should_pass/supertraits_for_abis/Forc.toml index 8c187021260..132a8617f8c 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/supertraits_for_abis/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/supertraits_for_abis/Forc.toml @@ -3,4 +3,6 @@ name = "supertraits_for_abis" authors = ["Fuel Labs "] entry = "main.sw" license = "Apache-2.0" -implicit-std = false + +[dependencies] +core = { path = "../../../../../../sway-lib-core" } diff --git a/test/src/sdk-harness/test_projects/low_level_call/src/main.sw b/test/src/sdk-harness/test_projects/low_level_call/src/main.sw index 3a14cd495f6..b8cc400cc2e 100644 --- a/test/src/sdk-harness/test_projects/low_level_call/src/main.sw +++ b/test/src/sdk-harness/test_projects/low_level_call/src/main.sw @@ -14,12 +14,12 @@ fn main( asset_id: AssetId::base(), gas: 10_000_000, }; - + call_with_function_selector( target, function_selector, calldata, - single_value_type_arg, + // single_value_type_arg, call_params, ); } From 9aa1988c2c657347959d43f75f46d8c899c7f5cc Mon Sep 17 00:00:00 2001 From: xunilrj Date: Wed, 24 Apr 2024 19:40:39 +0100 Subject: [PATCH 07/11] asserts for e2e tests --- .../ast_node/declaration/auto_impl.rs | 144 +++++++++++------- test/src/e2e_vm_tests/mod.rs | 2 +- test/src/e2e_vm_tests/test_programs/a.sh | 102 +++++++++++++ .../arith_overflow/u16_add_overflow/test.toml | 1 + .../arith_overflow/u16_mul_overflow/test.toml | 1 + .../u16_sub_underflow/test.toml | 1 + .../arith_overflow/u32_add_overflow/test.toml | 1 + .../arith_overflow/u32_mul_overflow/test.toml | 1 + .../u32_sub_underflow/test.toml | 1 + .../arith_overflow/u64_add_overflow/test.toml | 1 + .../arith_overflow/u64_mul_overflow/test.toml | 1 + .../u64_sub_underflow/test.toml | 1 + .../arith_overflow/u8_add_overflow/test.toml | 1 + .../arith_overflow/u8_mul_overflow/test.toml | 1 + .../arith_overflow/u8_sub_underflow/test.toml | 1 + .../should_fail/array_oob/Forc.lock | 9 +- .../should_fail/array_oob/Forc.toml | 3 + .../configurables_in_lib/Forc.lock | 9 +- .../configurables_in_lib/Forc.toml | 3 + .../const_eval_bad_struct/Forc.lock | 9 +- .../const_eval_bad_struct/Forc.toml | 1 + .../Forc.lock | 9 +- .../Forc.toml | 3 + .../double_underscore_trait_fn/Forc.lock | 5 + .../double_underscore_trait_fn/Forc.toml | 3 + .../double_underscore_var/Forc.lock | 9 +- .../double_underscore_var/Forc.toml | 4 +- .../should_fail/error_deduplication/Forc.lock | 9 +- .../should_fail/error_deduplication/Forc.toml | 3 + .../should_fail/illegal_continue/Forc.lock | 9 +- .../should_fail/illegal_continue/Forc.toml | 1 + .../insufficient_type_info_fnret/Forc.lock | 5 + .../insufficient_type_info_fnret/Forc.toml | 5 +- .../should_fail/script_calls_impure/Forc.lock | 9 +- .../should_fail/script_calls_impure/Forc.toml | 3 + .../should_fail/storage_in_library/Forc.lock | 9 +- .../should_fail/storage_in_library/Forc.toml | 2 +- .../should_fail/str_slice_contract/Forc.lock | 5 + .../should_fail/str_slice_contract/Forc.toml | 4 +- .../should_fail/str_slice_script/Forc.lock | 5 + .../should_fail/str_slice_script/Forc.toml | 4 +- .../vec_set_index_out_of_bounds/Forc.lock | 19 ++- .../vec_set_index_out_of_bounds/Forc.toml | 1 + .../vec_set_index_out_of_bounds/test.toml | 3 +- .../vec_swap_param1_out_of_bounds/test.toml | 3 +- .../vec_swap_param2_out_of_bounds/test.toml | 3 +- .../while_explicit_ret_1/Forc.lock | 9 +- .../while_explicit_ret_1/Forc.toml | 3 + .../while_explicit_ret_2/Forc.lock | 9 +- .../while_explicit_ret_2/Forc.toml | 3 + .../should_pass/blanket_impl/test.toml | 1 + .../should_pass/blanket_impl_u16/test.toml | 1 + .../break_in_strange_positions/test.toml | 1 + .../conditional_compilation/run/test.toml | 1 + .../continue_in_strange_positions/test.toml | 2 + .../forc/dependency_package_field/test.toml | 1 + .../abort_control_flow_good/test.toml | 1 + .../language/addrof_intrinsic/test.toml | 1 + .../language/aliased_imports/test.toml | 1 + .../language/args_on_stack/test.toml | 3 +- .../language/array_basics/test.toml | 1 + .../language/array_generics/test.toml | 1 + .../language/asm_expr_basic/test.toml | 1 + .../language/asm_without_return/test.toml | 1 + .../language/associated_const_abi/test.toml | 1 + .../associated_const_abi_default/test.toml | 1 + .../associated_const_abi_multiple/test.toml | 1 + .../language/associated_const_impl/test.toml | 1 + .../associated_const_impl_generic/test.toml | 1 + .../test.toml | 1 + .../associated_const_impl_multiple/test.toml | 1 + .../associated_const_impl_self/test.toml | 1 + .../test.toml | 1 + .../language/associated_const_trait/test.toml | 1 + .../associated_const_trait_const/test.toml | 1 + .../associated_const_trait_default/test.toml | 1 + .../test.toml | 1 + .../associated_const_trait_method/test.toml | 1 + .../test.toml | 1 + .../associated_type_ascription/test.toml | 1 + .../associated_type_container/test.toml | 1 + .../test.toml | 1 + .../associated_type_fully_qualified/test.toml | 1 + .../associated_type_iterator/test.toml | 1 + .../language/associated_type_method/test.toml | 1 + .../associated_type_parameter/test.toml | 1 + .../language/b256_bad_jumps/test.toml | 1 + .../language/b256_bitwise_ops/test.toml | 1 + .../should_pass/language/b256_ops/test.toml | 3 +- .../language/basic_func_decl/test.toml | 1 + .../language/basic_predicate/test.toml | 1 + .../binary_and_hex_literals/test.toml | 1 + .../language/binop_intrinsics/test.toml | 1 + .../language/bitwise_not/test.toml | 1 + .../language/blanket_trait/test.toml | 1 + .../language/bool_and_or/test.toml | 1 + .../language/break_and_continue/test.toml | 1 + .../builtin_type_method_call/test.toml | 1 + .../language/chained_if_let/test.toml | 1 + .../language/complex_cfg/test.toml | 1 + .../language/configurable_consts/test.toml | 3 +- .../should_pass/language/const_decl/test.toml | 1 + .../const_decl_and_use_in_library/test.toml | 1 + .../language/const_decl_in_library/test.toml | 1 + .../const_decl_with_call_path/test.toml | 1 + .../language/const_inits/test.toml | 1 + .../contract_caller_dynamic_address/test.toml | 1 + .../language/diverging_exprs/test.toml | 1 + .../language/dummy_method_issue/test.toml | 1 + .../empty_method_initializer/test.toml | 1 + .../language/enum_destructuring/test.toml | 1 + .../language/enum_if_let/test.toml | 1 + .../language/enum_if_let_large_type/test.toml | 1 + .../language/enum_in_fn_decl/test.toml | 1 + .../language/enum_init_fn_call/test.toml | 1 + .../language/enum_instantiation/test.toml | 3 +- .../language/enum_padding/test.toml | 1 + .../language/enum_type_inference/test.toml | 1 + .../language/enum_variant_imports/test.toml | 1 + .../should_pass/language/eq_and_neq/test.toml | 1 + .../language/eq_intrinsic/test.toml | 1 + .../language/far_jumps/many_blobs/test.toml | 1 + .../language/far_jumps/single_blob/test.toml | 1 + .../language/fix_opcode_bug/test.toml | 1 + .../should_pass/language/for_loops/test.toml | 1 + .../funcs_with_generic_types/test.toml | 1 + .../language/generic_functions/test.toml | 1 + .../language/generic_impl_self/test.toml | 1 + .../generic_impl_self_where/test.toml | 1 + .../language/generic_inside_generic/test.toml | 1 + .../language/generic_result_method/test.toml | 1 + .../language/generic_struct/test.toml | 1 + .../generic_struct_instantiation/test.toml | 1 + .../language/generic_structs/test.toml | 1 + .../generic_trait_constraints/test.toml | 1 + .../language/generic_traits/test.toml | 1 + .../language/generic_transpose/test.toml | 1 + .../language/generic_tuple_trait/test.toml | 3 +- .../language/generic_type_inference/test.toml | 1 + .../generic_where_in_impl_self/test.toml | 3 +- .../generic_where_in_impl_self2/test.toml | 3 +- .../language/gtf_intrinsic/test.toml | 3 +- .../language/if_elseif_enum/test.toml | 1 + .../language/if_implicit_unit/test.toml | 1 + .../language/if_let_no_side_effects/test.toml | 1 + .../language/impl_self_method/test.toml | 1 + .../impl_self_method_multiple/test.toml | 1 + .../language/impl_self_method_order/test.toml | 1 + .../language/implicit_casting/test.toml | 2 +- .../language/implicit_return/test.toml | 1 + .../import_method_from_other_file/test.toml | 1 + .../language/import_trailing_comma/test.toml | 1 + .../import_with_different_callpaths/test.toml | 1 + .../should_pass/language/impure_ifs/test.toml | 1 + .../language/inline_if_expr_const/test.toml | 1 + .../insert_element_reg_reuse/test.toml | 1 + .../language/integer_type_inference/test.toml | 1 + .../should_pass/language/is_prime/test.toml | 1 + .../language/is_reference_type/test.toml | 1 + .../test.toml | 1 + .../language/local_impl_for_ord/test.toml | 1 + .../should_pass/language/logging/test.toml | 1 + .../language/main_returns_unit/test.toml | 1 + .../language/many_stack_variables/test.toml | 1 + .../language/match_expressions/test.toml | 1 + .../match_expressions_constants/test.toml | 1 + .../match_expressions_empty_enums/test.toml | 1 + .../match_expressions_enums/test.toml | 1 + .../match_expressions_explicit_rets/test.toml | 1 + .../test.toml | 1 + .../match_expressions_mismatched/test.toml | 1 + .../match_expressions_nested/test.toml | 1 + .../language/match_expressions_or/test.toml | 5 +- .../language/match_expressions_rest/test.toml | 1 + .../match_expressions_simple/test.toml | 1 + .../match_expressions_structs/test.toml | 1 + .../match_expressions_with_self/test.toml | 1 + .../should_pass/language/memcpy/test.toml | 3 +- .../method_indirect_inference/test.toml | 1 + .../language/method_on_empty_struct/test.toml | 1 + .../language/method_type_args/test.toml | 1 + .../language/method_unambiguous/test.toml | 1 + .../should_pass/language/module_dep/test.toml | 1 + .../language/module_dep_multiple/test.toml | 1 + .../language/module_dep_self/test.toml | 1 + .../language/modulo_uint_test/test.toml | 1 + .../language/multi_impl_self/test.toml | 1 + .../language/multi_item_import/test.toml | 1 + .../language/mut_ref_empty_type/test.toml | 3 +- .../language/mutable_and_initd/test.toml | 1 + .../mutable_arrays_multiple_nested/test.toml | 1 + .../revert_in_first_if_branch/test.toml | 1 + .../json_abi_oracle_new_encoding.json | 26 ++++ .../language/where_clause_methods/test.toml | 1 + .../midenvm/midenvm_trivial/test.toml | 1 + .../json_abi_oracle_new_encoding.json | 26 ++++ .../return_in_strange_positions/test.toml | 10 +- .../should_pass/return_into/test.toml | 1 + .../should_pass/stdlib/address_test/test.toml | 1 + .../should_pass/stdlib/alloc_test/test.toml | 1 + .../should_pass/stdlib/assert_eq/test.toml | 1 + .../stdlib/assert_eq_revert/test.toml | 3 +- .../should_pass/stdlib/assert_ne/test.toml | 1 + .../stdlib/assert_ne_revert/test.toml | 3 +- .../should_pass/stdlib/assert_test/test.toml | 1 + .../stdlib/b512_struct_alignment/test.toml | 1 + .../should_pass/stdlib/b512_test/test.toml | 1 + .../should_pass/stdlib/block_height/test.toml | 1 + .../should_pass/stdlib/chess/test.toml | 1 + .../stdlib/contract_id_test/test.toml | 1 + .../stdlib/contract_id_type/test.toml | 1 + .../stdlib/eq_custom_type/test.toml | 1 + .../should_pass/stdlib/eq_generic/test.toml | 1 + .../should_pass/stdlib/ge_test/test.toml | 1 + .../test.toml | 1 + .../should_pass/stdlib/identity_eq/test.toml | 1 + .../stdlib/if_type_revert/test.toml | 4 +- .../should_pass/stdlib/intrinsics/test.toml | 1 + .../should_pass/stdlib/iterator/test.toml | 1 + .../should_pass/stdlib/option/test.toml | 3 +- .../should_pass/stdlib/option_eq/test.toml | 3 +- .../should_pass/stdlib/raw_ptr/test.toml | 1 + .../should_pass/stdlib/require/test.toml | 1 + .../should_pass/stdlib/result/test.toml | 1 + .../should_pass/stdlib/sha256/test.toml | 1 + .../stdlib/u128_div_test/test.toml | 1 + .../stdlib/u128_log_test/test.toml | 1 + .../stdlib/u128_mul_test/test.toml | 1 + .../stdlib/u128_root_test/test.toml | 1 + .../should_pass/stdlib/u128_test/test.toml | 1 + .../should_pass/stdlib/vec/test.toml | 1 + .../should_pass/stdlib/vec_swap/test.toml | 1 + .../unit_tests/regalloc_spill/test.toml | 1 + 233 files changed, 615 insertions(+), 117 deletions(-) create mode 100644 test/src/e2e_vm_tests/test_programs/a.sh create mode 100644 test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_methods/json_abi_oracle_new_encoding.json create mode 100644 test/src/e2e_vm_tests/test_programs/should_pass/return_in_strange_positions/json_abi_oracle_new_encoding.json diff --git a/sway-core/src/semantic_analysis/ast_node/declaration/auto_impl.rs b/sway-core/src/semantic_analysis/ast_node/declaration/auto_impl.rs index 85dee15d4c5..04682893864 100644 --- a/sway-core/src/semantic_analysis/ast_node/declaration/auto_impl.rs +++ b/sway-core/src/semantic_analysis/ast_node/declaration/auto_impl.rs @@ -186,31 +186,39 @@ where code } - fn generate_abi_decode_struct_body(&self, engines: &Engines, decl: &TyStructDecl) -> String { + fn generate_abi_decode_struct_body( + &self, + engines: &Engines, + decl: &TyStructDecl, + ) -> Option { let mut code = String::new(); for f in decl.fields.iter() { code.push_str(&format!( "{field_name}: buffer.decode::<{field_type_name}>(),", field_name = f.name.as_str(), - field_type_name = Self::generate_type(engines, f.type_argument.type_id), + field_type_name = Self::generate_type(engines, f.type_argument.type_id)?, )); } - format!("Self {{ {code} }}") + Some(format!("Self {{ {code} }}")) } - fn generate_abi_decode_enum_body(&self, engines: &Engines, decl: &TyEnumDecl) -> String { + fn generate_abi_decode_enum_body( + &self, + engines: &Engines, + decl: &TyEnumDecl, + ) -> Option { let enum_name = decl.call_path.suffix.as_str(); let arms = decl.variants.iter() .map(|x| { let name = x.name.as_str(); - match &*engines.te().get(x.type_argument.type_id) { + Some(match &*engines.te().get(x.type_argument.type_id) { // unit TypeInfo::Tuple(fiels) if fiels.is_empty() => { format!("{} => {}::{}, \n", x.tag, enum_name, name) }, _ => { - let variant_type_name = Self::generate_type(engines, x.type_argument.type_id); + let variant_type_name = Self::generate_type(engines, x.type_argument.type_id)?; format!("{tag_value} => {enum_name}::{variant_name}(buffer.decode::<{variant_type}>()), \n", tag_value = x.tag, enum_name = enum_name, @@ -218,16 +226,16 @@ where variant_type = variant_type_name ) } - } + }) }) - .collect::(); + .collect::>()?; use std::fmt::Write; let mut code = String::new(); writeln!(&mut code, "let variant: u64 = buffer.decode::();").unwrap(); writeln!(&mut code, "match variant {{ {arms} _ => __revert(0), }}").unwrap(); - code + Some(code) } fn generate_abi_encode_enum_body(&self, engines: &Engines, decl: &TyEnumDecl) -> String { @@ -391,10 +399,10 @@ where &mut self, engines: &Engines, decl: &TyDecl, - ) -> (Option, Option) { + ) -> Option<(Option, Option)> { if matches!(self.ctx.namespace.root().module.read(engines, |m| m.name.clone()).as_ref(), Some(x) if x.as_str() == "core") { - return (None, None); + return Some((None, None)); } let implementing_for_decl_ref = decl.get_struct_decl_ref().unwrap(); @@ -415,22 +423,22 @@ where let abi_decode_code = self.generate_abi_decode_code( struct_decl.name(), &struct_decl.type_parameters, - abi_decode_body, + abi_decode_body?, ); let abi_decode_node = self.parse_impl_trait_to_ty_ast_node(engines, module_id, &abi_decode_code); - (abi_encode_node.ok(), abi_decode_node.ok()) + Some((abi_encode_node.ok(), abi_decode_node.ok())) } fn auto_impl_enum( &mut self, engines: &Engines, decl: &TyDecl, - ) -> (Option, Option) { + ) -> Option<(Option, Option)> { if matches!(self.ctx.namespace.root().module.read(engines, |m| m.name.clone()).as_ref(), Some(x) if x.as_str() == "core") { - return (None, None); + return Some((None, None)); } let enum_decl_ref = decl.get_enum_decl_ref().unwrap(); @@ -451,12 +459,12 @@ where let abi_decode_code = self.generate_abi_decode_code( enum_decl.name(), &enum_decl.type_parameters, - abi_decode_body, + abi_decode_body?, ); let abi_decode_node = self.parse_impl_trait_to_ty_ast_node(engines, module_id, &abi_decode_code); - (abi_encode_node.ok(), abi_decode_node.ok()) + Some((abi_encode_node.ok(), abi_decode_node.ok())) } pub fn generate( @@ -465,14 +473,14 @@ where decl: &ty::TyDecl, ) -> (Option, Option) { match decl { - TyDecl::StructDecl(_) => self.auto_impl_struct(engines, decl), - TyDecl::EnumDecl(_) => self.auto_impl_enum(engines, decl), + TyDecl::StructDecl(_) => self.auto_impl_struct(engines, decl).unwrap_or((None, None)), + TyDecl::EnumDecl(_) => self.auto_impl_enum(engines, decl).unwrap_or((None, None)), _ => (None, None), } } - fn generate_type(engines: &Engines, type_id: TypeId) -> String { - match &*engines.te().get(type_id) { + fn generate_type(engines: &Engines, type_id: TypeId) -> Option { + let name = match &*engines.te().get(type_id) { TypeInfo::UnknownGeneric { name, .. } => name.to_string(), TypeInfo::Placeholder(type_param) => type_param.name_ident.to_string(), TypeInfo::StringSlice => "str".into(), @@ -492,12 +500,12 @@ where } => call_path.call_path.suffix.to_string(), TypeInfo::Tuple(fields) => { if fields.is_empty() { - return "()".into(); + return Some("()".into()); } let field_strs = fields .iter() .map(|field| Self::generate_type(engines, field.type_id)) - .collect::>(); + .collect::>>()?; format!("({},)", field_strs.join(", ")) } TypeInfo::B256 => "b256".into(), @@ -508,6 +516,7 @@ where .type_parameters .iter() .map(|x| Self::generate_type(engines, x.type_id)) + .collect::>>()? .join(", "); let type_parameters = if !type_parameters.is_empty() { @@ -525,6 +534,7 @@ where .type_parameters .iter() .map(|x| Self::generate_type(engines, x.type_id)) + .collect::>>()? .join(", "); let type_parameters = if !type_parameters.is_empty() { @@ -538,15 +548,17 @@ where TypeInfo::Array(elem_ty, count) => { format!( "[{}; {}]", - Self::generate_type(engines, elem_ty.type_id), + Self::generate_type(engines, elem_ty.type_id)?, count.val() ) } TypeInfo::RawUntypedPtr => "raw_ptr".into(), TypeInfo::RawUntypedSlice => "raw_slice".into(), TypeInfo::Alias { name, .. } => name.to_string(), - _ => todo!(), - } + x => return None, + }; + + Some(name) } pub(crate) fn generate_contract_entry( @@ -575,13 +587,18 @@ where } } - let args_types = itertools::intersperse( - decl.parameters - .iter() - .map(|x| Self::generate_type(engines, x.type_argument.type_id)), - ", ".into(), - ) - .collect::(); + let Some(args_types) = decl + .parameters + .iter() + .map(|x| Self::generate_type(engines, x.type_argument.type_id)) + .collect::>>() + else { + let err = handler.emit_err(CompileError::UnknownType { + span: Span::dummy(), + }); + return Err(err); + }; + let args_types = itertools::intersperse(args_types, ", ".into()).collect::(); let args_types = if args_types.is_empty() { "()".into() @@ -598,7 +615,12 @@ where ) .collect::(); - let return_type = Self::generate_type(engines, decl.return_type.type_id); + let Some(return_type) = Self::generate_type(engines, decl.return_type.type_id) else { + let err = handler.emit_err(CompileError::UnknownType { + span: Span::dummy(), + }); + return Err(err); + }; let method_name = decl.name.as_str(); @@ -626,7 +648,13 @@ where let fallback = if let Some(fallback_fn) = fallback_fn { let fallback_fn = engines.de().get(&fallback_fn); - let return_type = Self::generate_type(engines, fallback_fn.return_type.type_id); + let Some(return_type) = Self::generate_type(engines, fallback_fn.return_type.type_id) + else { + let err = handler.emit_err(CompileError::UnknownType { + span: Span::dummy(), + }); + return Err(err); + }; let method_name = fallback_fn.name.as_str(); format!("let result: raw_slice = encode::<{return_type}>({method_name}()); __contract_ret(result.ptr(), result.len::());") @@ -665,13 +693,18 @@ where ) -> Result { let module_id = decl.span.source_id().map(|sid| sid.module_id()); - let args_types = itertools::intersperse( - decl.parameters - .iter() - .map(|x| Self::generate_type(engines, x.type_argument.type_id)), - ", ".into(), - ) - .collect::(); + let Some(args_types) = decl + .parameters + .iter() + .map(|x| Self::generate_type(engines, x.type_argument.type_id)) + .collect::>>() + else { + let err = handler.emit_err(CompileError::UnknownType { + span: Span::dummy(), + }); + return Err(err); + }; + let args_types = itertools::intersperse(args_types, ", ".into()).collect::(); let expanded_args = itertools::intersperse( decl.parameters @@ -716,14 +749,18 @@ where ) -> Result { let module_id = decl.span.source_id().map(|sid| sid.module_id()); - let args_types = itertools::intersperse( - decl.parameters - .iter() - .map(|x| Self::generate_type(engines, x.type_argument.type_id)), - ", ".into(), - ) - .collect::(); - + let Some(args_types) = decl + .parameters + .iter() + .map(|x| Self::generate_type(engines, x.type_argument.type_id)) + .collect::>>() + else { + let err = handler.emit_err(CompileError::UnknownType { + span: Span::dummy(), + }); + return Err(err); + }; + let args_types = itertools::intersperse(args_types, ", ".into()).collect::(); let args_types = if args_types.is_empty() { "()".into() } else { @@ -739,7 +776,12 @@ where ) .collect::(); - let return_type = Self::generate_type(engines, decl.return_type.type_id); + let Some(return_type) = Self::generate_type(engines, decl.return_type.type_id) else { + let err = handler.emit_err(CompileError::UnknownType { + span: Span::dummy(), + }); + return Err(err); + }; let code = if args_types == "()" { format!( diff --git a/test/src/e2e_vm_tests/mod.rs b/test/src/e2e_vm_tests/mod.rs index 71562a7fb1b..5d607300764 100644 --- a/test/src/e2e_vm_tests/mod.rs +++ b/test/src/e2e_vm_tests/mod.rs @@ -628,7 +628,7 @@ pub async fn run(filter_config: &FilterConfig, run_config: &RunConfig) -> Result // Be mindful that this can explode exponentially the number of tests // that run because one expansion expands on top of another let mut tests = tests; - let expansions = ["new_encoding"]; + let expansions: [&str; 0] = []; for expansion in expansions { tests = tests .into_iter() diff --git a/test/src/e2e_vm_tests/test_programs/a.sh b/test/src/e2e_vm_tests/test_programs/a.sh new file mode 100644 index 00000000000..be16143d30a --- /dev/null +++ b/test/src/e2e_vm_tests/test_programs/a.sh @@ -0,0 +1,102 @@ +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/stdlib/raw_slice/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/prelude_access/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/self_impl_reassignment/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/retd_struct/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/out_of_order_decl/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/ref_mutable_fn_args_u32/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/while_loops/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/where_clause_generic_traits/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/ret_string_in_struct/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/tuple_trait/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/unary_not_basic/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/tuple_desugaring/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/typeinfo_custom_callpath2/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/size_of/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/typeinfo_custom_callpath/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/unary_not_basic_2/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/typeinfo_custom_callpath_with_import/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/mutable_arrays_nested/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/retd_small_array/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/ref_mutable_fn_args_struct_assign/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/ops/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/numeric_constants/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/trait_nested/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/ref_mutable_fn_args_struct/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/name_resolution_inside_intrinsics/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/where_clause_functions/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/primitive_type_argument/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/mutable_arrays_struct/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/where_clause_generic_tuple/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/ref_mutable_fn_args_bool/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/use_absolute_path/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/ref_mutable_arrays/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/nested_while_and_if/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/redundant_return/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/op_precedence/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/trait_import_with_star/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/struct_destructuring/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/reassignment_operators/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/name_resolution_after_monomorphization/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/str_slice/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/use_full_path_names/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/retd_zero_len_array/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/mutable_arrays/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/tuple_single_element/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/where_clause_structs/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/ref_mutable_arrays_inline/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/where_clause_impls/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/tuple_access/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/struct_instantiation/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/unit_type_variants/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/struct_field_reassignment/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/where_clause_traits/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/supertraits/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/tuple_field_reassignment/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/supertraits_with_trait_methods/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/mutable_arrays_swap/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/predicate_while_dep/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/new_allocator_test/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/type_alias/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/trait_method_qualified/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/predicate_while/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/mutable_arrays_enum/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/tuple_types/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/tuple_in_struct/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/same_const_name/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/nested_structs/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/u256/u256_abi/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/referencing_control_flow_expressions/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/referencing_parts_of_aggregates/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/dereferencing_control_flow_expressions/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/dereferencing_operator_star/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/trait_method_ascription_disambiguate/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/prelude_access2/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/type_unification_of_references/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/ref_mutable_fn_args_call/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/referencing_local_vars_and_values/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/dereferencing_operator_dot_on_tuples/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/dereferencing_operator_index/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/ret_small_string/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/retd_b256/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/zero_field_types/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/referencing_expressions/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/references_and_generics/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/references_in_aggregates/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/dereferencing_operator_dot_on_structs/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/referencing_references/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/mutability_of_references/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/where_clause_enums/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/passing_and_returning_references_to_and_from_functions/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/references_in_asm_blocks/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/impl_reference_types/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/references_and_type_aliases/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/main_args/main_args_predicate/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/raw_ptr/raw_ptr_ret/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/referencing_function_parameters/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/raw_identifiers/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/raw_ptr/vec_ret/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/non_literal_const_decl/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/tuple_indexing/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/struct_field_access/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/trait_method_generic_qualified/test.toml +echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/nested_struct_destructuring/test.toml \ No newline at end of file diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/arith_overflow/u16_add_overflow/test.toml b/test/src/e2e_vm_tests/test_programs/should_fail/arith_overflow/u16_add_overflow/test.toml index 2f3b260911b..ba5aad6b91a 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/arith_overflow/u16_add_overflow/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_fail/arith_overflow/u16_add_overflow/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "revert", value = 0 } +expected_result_new_encoding = { action = "revert", value = 0 } validate_abi = false diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/arith_overflow/u16_mul_overflow/test.toml b/test/src/e2e_vm_tests/test_programs/should_fail/arith_overflow/u16_mul_overflow/test.toml index 2f3b260911b..ba5aad6b91a 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/arith_overflow/u16_mul_overflow/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_fail/arith_overflow/u16_mul_overflow/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "revert", value = 0 } +expected_result_new_encoding = { action = "revert", value = 0 } validate_abi = false diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/arith_overflow/u16_sub_underflow/test.toml b/test/src/e2e_vm_tests/test_programs/should_fail/arith_overflow/u16_sub_underflow/test.toml index 2f3b260911b..ba5aad6b91a 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/arith_overflow/u16_sub_underflow/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_fail/arith_overflow/u16_sub_underflow/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "revert", value = 0 } +expected_result_new_encoding = { action = "revert", value = 0 } validate_abi = false diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/arith_overflow/u32_add_overflow/test.toml b/test/src/e2e_vm_tests/test_programs/should_fail/arith_overflow/u32_add_overflow/test.toml index 2f3b260911b..ba5aad6b91a 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/arith_overflow/u32_add_overflow/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_fail/arith_overflow/u32_add_overflow/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "revert", value = 0 } +expected_result_new_encoding = { action = "revert", value = 0 } validate_abi = false diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/arith_overflow/u32_mul_overflow/test.toml b/test/src/e2e_vm_tests/test_programs/should_fail/arith_overflow/u32_mul_overflow/test.toml index 2f3b260911b..ba5aad6b91a 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/arith_overflow/u32_mul_overflow/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_fail/arith_overflow/u32_mul_overflow/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "revert", value = 0 } +expected_result_new_encoding = { action = "revert", value = 0 } validate_abi = false diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/arith_overflow/u32_sub_underflow/test.toml b/test/src/e2e_vm_tests/test_programs/should_fail/arith_overflow/u32_sub_underflow/test.toml index 2f3b260911b..ba5aad6b91a 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/arith_overflow/u32_sub_underflow/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_fail/arith_overflow/u32_sub_underflow/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "revert", value = 0 } +expected_result_new_encoding = { action = "revert", value = 0 } validate_abi = false diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/arith_overflow/u64_add_overflow/test.toml b/test/src/e2e_vm_tests/test_programs/should_fail/arith_overflow/u64_add_overflow/test.toml index 2f3b260911b..ba5aad6b91a 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/arith_overflow/u64_add_overflow/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_fail/arith_overflow/u64_add_overflow/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "revert", value = 0 } +expected_result_new_encoding = { action = "revert", value = 0 } validate_abi = false diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/arith_overflow/u64_mul_overflow/test.toml b/test/src/e2e_vm_tests/test_programs/should_fail/arith_overflow/u64_mul_overflow/test.toml index 2f3b260911b..ba5aad6b91a 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/arith_overflow/u64_mul_overflow/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_fail/arith_overflow/u64_mul_overflow/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "revert", value = 0 } +expected_result_new_encoding = { action = "revert", value = 0 } validate_abi = false diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/arith_overflow/u64_sub_underflow/test.toml b/test/src/e2e_vm_tests/test_programs/should_fail/arith_overflow/u64_sub_underflow/test.toml index 2f3b260911b..ba5aad6b91a 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/arith_overflow/u64_sub_underflow/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_fail/arith_overflow/u64_sub_underflow/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "revert", value = 0 } +expected_result_new_encoding = { action = "revert", value = 0 } validate_abi = false diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/arith_overflow/u8_add_overflow/test.toml b/test/src/e2e_vm_tests/test_programs/should_fail/arith_overflow/u8_add_overflow/test.toml index 2f3b260911b..ba5aad6b91a 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/arith_overflow/u8_add_overflow/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_fail/arith_overflow/u8_add_overflow/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "revert", value = 0 } +expected_result_new_encoding = { action = "revert", value = 0 } validate_abi = false diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/arith_overflow/u8_mul_overflow/test.toml b/test/src/e2e_vm_tests/test_programs/should_fail/arith_overflow/u8_mul_overflow/test.toml index 2f3b260911b..ba5aad6b91a 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/arith_overflow/u8_mul_overflow/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_fail/arith_overflow/u8_mul_overflow/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "revert", value = 0 } +expected_result_new_encoding = { action = "revert", value = 0 } validate_abi = false diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/arith_overflow/u8_sub_underflow/test.toml b/test/src/e2e_vm_tests/test_programs/should_fail/arith_overflow/u8_sub_underflow/test.toml index 2f3b260911b..ba5aad6b91a 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/arith_overflow/u8_sub_underflow/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_fail/arith_overflow/u8_sub_underflow/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "revert", value = 0 } +expected_result_new_encoding = { action = "revert", value = 0 } validate_abi = false diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/array_oob/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_fail/array_oob/Forc.lock index b7d220369bc..2fcf309c70d 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/array_oob/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_fail/array_oob/Forc.lock @@ -1,3 +1,8 @@ [[package]] -name = 'array_oob' -source = 'member' +name = "array_oob" +source = "member" +dependencies = ["core"] + +[[package]] +name = "core" +source = "path+from-root-B7F3BB0330F243C2" diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/array_oob/Forc.toml b/test/src/e2e_vm_tests/test_programs/should_fail/array_oob/Forc.toml index 398776ca308..0f9369d6f27 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/array_oob/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/should_fail/array_oob/Forc.toml @@ -4,3 +4,6 @@ license = "Apache-2.0" name = "array_oob" entry = "main.sw" implicit-std = false + +[dependencies] +core = { path = "../../../../../../sway-lib-core" } diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/configurables_in_lib/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_fail/configurables_in_lib/Forc.lock index 3e1f4cebe63..bb1a6e755ed 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/configurables_in_lib/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_fail/configurables_in_lib/Forc.lock @@ -1,3 +1,8 @@ [[package]] -name = 'configurables_in_lib' -source = 'member' +name = "configurables_in_lib" +source = "member" +dependencies = ["core"] + +[[package]] +name = "core" +source = "path+from-root-D4FAD531EAB9796D" diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/configurables_in_lib/Forc.toml b/test/src/e2e_vm_tests/test_programs/should_fail/configurables_in_lib/Forc.toml index ee797d4e04e..cd6d5e3332e 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/configurables_in_lib/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/should_fail/configurables_in_lib/Forc.toml @@ -4,3 +4,6 @@ entry = "main.sw" implicit-std = false license = "Apache-2.0" name = "configurables_in_lib" + +[dependencies] +core = { path = "../../../../../../sway-lib-core" } diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/const_eval_bad_struct/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_fail/const_eval_bad_struct/Forc.lock index 2ae21d7d254..c456cef7963 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/const_eval_bad_struct/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_fail/const_eval_bad_struct/Forc.lock @@ -1,3 +1,8 @@ [[package]] -name = 'const_eval_bad_struct' -source = 'member' +name = "const_eval_bad_struct" +source = "member" +dependencies = ["core"] + +[[package]] +name = "core" +source = "path+from-root-37642B35B36048FC" diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/const_eval_bad_struct/Forc.toml b/test/src/e2e_vm_tests/test_programs/should_fail/const_eval_bad_struct/Forc.toml index 213f8daa54e..c96305f6f9e 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/const_eval_bad_struct/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/should_fail/const_eval_bad_struct/Forc.toml @@ -6,3 +6,4 @@ name = "const_eval_bad_struct" implicit-std = false [dependencies] +core = { path = "../../../../../../sway-lib-core" } diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/const_eval_bad_struct_with_return/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_fail/const_eval_bad_struct_with_return/Forc.lock index b2595d83cef..e1a82f95453 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/const_eval_bad_struct_with_return/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_fail/const_eval_bad_struct_with_return/Forc.lock @@ -1,3 +1,8 @@ [[package]] -name = 'const_eval_bad_struct_with_return' -source = 'member' +name = "const_eval_bad_struct_with_return" +source = "member" +dependencies = ["core"] + +[[package]] +name = "core" +source = "path+from-root-154BF654D5BA1912" diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/const_eval_bad_struct_with_return/Forc.toml b/test/src/e2e_vm_tests/test_programs/should_fail/const_eval_bad_struct_with_return/Forc.toml index 02811d183f4..ee771c3e808 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/const_eval_bad_struct_with_return/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/should_fail/const_eval_bad_struct_with_return/Forc.toml @@ -4,3 +4,6 @@ entry = "main.sw" license = "Apache-2.0" name = "const_eval_bad_struct_with_return" implicit-std = false + +[dependencies] +core = { path = "../../../../../../sway-lib-core" } diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/double_underscore_trait_fn/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_fail/double_underscore_trait_fn/Forc.lock index c630391309a..22f26fc7d27 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/double_underscore_trait_fn/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_fail/double_underscore_trait_fn/Forc.lock @@ -1,3 +1,8 @@ +[[package]] +name = "core" +source = "path+from-root-B0BC8B33FB511559" + [[package]] name = "double_underscore_trait_fn" source = "member" +dependencies = ["core"] diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/double_underscore_trait_fn/Forc.toml b/test/src/e2e_vm_tests/test_programs/should_fail/double_underscore_trait_fn/Forc.toml index 1057c2f202f..0a6ed3e1cdb 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/double_underscore_trait_fn/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/should_fail/double_underscore_trait_fn/Forc.toml @@ -4,3 +4,6 @@ entry = "main.sw" license = "Apache-2.0" name = "double_underscore_trait_fn" implicit-std = false + +[dependencies] +core = { path = "../../../../../../sway-lib-core" } diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/double_underscore_var/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_fail/double_underscore_var/Forc.lock index c94305d52d6..c4ff770818c 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/double_underscore_var/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_fail/double_underscore_var/Forc.lock @@ -1,3 +1,8 @@ [[package]] -name = 'double_underscore_var' -source = 'member' +name = "core" +source = "path+from-root-053B1C8DE611E923" + +[[package]] +name = "double_underscore_var" +source = "member" +dependencies = ["core"] diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/double_underscore_var/Forc.toml b/test/src/e2e_vm_tests/test_programs/should_fail/double_underscore_var/Forc.toml index bf9f1f9e4c5..c7c2171e254 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/double_underscore_var/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/should_fail/double_underscore_var/Forc.toml @@ -1,6 +1,8 @@ [project] authors = ["Fuel Labs "] entry = "main.sw" -implicit-std = false license = "Apache-2.0" name = "double_underscore_var" + +[dependencies] +core = { path = "../../../../../../sway-lib-core" } diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/error_deduplication/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_fail/error_deduplication/Forc.lock index e8d6c077836..7f77460117d 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/error_deduplication/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_fail/error_deduplication/Forc.lock @@ -1,3 +1,8 @@ [[package]] -name = 'error_deduplication' -source = 'member' +name = "core" +source = "path+from-root-4DD89F4C0953709D" + +[[package]] +name = "error_deduplication" +source = "member" +dependencies = ["core"] diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/error_deduplication/Forc.toml b/test/src/e2e_vm_tests/test_programs/should_fail/error_deduplication/Forc.toml index 24b091f7ae6..33914d8e00a 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/error_deduplication/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/should_fail/error_deduplication/Forc.toml @@ -4,3 +4,6 @@ authors = ["Fuel Labs "] entry = "main.sw" license = "Apache-2.0" implicit-std = false + +[dependencies] +core = { path = "../../../../../../sway-lib-core" } diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/illegal_continue/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_fail/illegal_continue/Forc.lock index 3e873a9714c..cee81233441 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/illegal_continue/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_fail/illegal_continue/Forc.lock @@ -1,3 +1,8 @@ [[package]] -name = 'illegal_continue' -source = 'member' +name = "core" +source = "path+from-root-61AF9510BDC399A3" + +[[package]] +name = "illegal_continue" +source = "member" +dependencies = ["core"] diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/illegal_continue/Forc.toml b/test/src/e2e_vm_tests/test_programs/should_fail/illegal_continue/Forc.toml index 8fe2f1f0d5d..270a43babe4 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/illegal_continue/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/should_fail/illegal_continue/Forc.toml @@ -6,3 +6,4 @@ license = "Apache-2.0" name = "illegal_continue" [dependencies] +core = { path = "../../../../../../sway-lib-core" } diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/insufficient_type_info_fnret/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_fail/insufficient_type_info_fnret/Forc.lock index 7138bdf9170..f399aa2192c 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/insufficient_type_info_fnret/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_fail/insufficient_type_info_fnret/Forc.lock @@ -1,3 +1,8 @@ +[[package]] +name = "core" +source = "path+from-root-DC44092249FC5867" + [[package]] name = "insufficient_type_info_fnret" source = "member" +dependencies = ["core"] diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/insufficient_type_info_fnret/Forc.toml b/test/src/e2e_vm_tests/test_programs/should_fail/insufficient_type_info_fnret/Forc.toml index 42b4053a1a1..8713ce460e4 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/insufficient_type_info_fnret/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/should_fail/insufficient_type_info_fnret/Forc.toml @@ -3,4 +3,7 @@ authors = ["Fuel Labs "] entry = "main.sw" license = "Apache-2.0" name = "insufficient_type_info_fnret" -implicit-std = false \ No newline at end of file +implicit-std = false + +[dependencies] +core = { path = "../../../../../../sway-lib-core" } diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/script_calls_impure/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_fail/script_calls_impure/Forc.lock index 2dc45db0ef9..7db5f6565bf 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/script_calls_impure/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_fail/script_calls_impure/Forc.lock @@ -1,3 +1,8 @@ [[package]] -name = 'script_calls_impure' -source = 'member' +name = "core" +source = "path+from-root-92615C9ECA428E15" + +[[package]] +name = "script_calls_impure" +source = "member" +dependencies = ["core"] diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/script_calls_impure/Forc.toml b/test/src/e2e_vm_tests/test_programs/should_fail/script_calls_impure/Forc.toml index 4039c397674..4599607cd39 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/script_calls_impure/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/should_fail/script_calls_impure/Forc.toml @@ -4,3 +4,6 @@ license = "Apache-2.0" name = "script_calls_impure" entry = "main.sw" implicit-std = false + +[dependencies] +core = { path = "../../../../../../sway-lib-core" } diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/storage_in_library/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_fail/storage_in_library/Forc.lock index cf51aef0eaa..afdc5fcb865 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/storage_in_library/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_fail/storage_in_library/Forc.lock @@ -1,3 +1,8 @@ [[package]] -name = 'storage_in_library' -source = 'member' +name = "core" +source = "path+from-root-76B2D1CD254916E4" + +[[package]] +name = "storage_in_library" +source = "member" +dependencies = ["core"] diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/storage_in_library/Forc.toml b/test/src/e2e_vm_tests/test_programs/should_fail/storage_in_library/Forc.toml index 2c0bd9027b9..77274c0665f 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/storage_in_library/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/should_fail/storage_in_library/Forc.toml @@ -1,8 +1,8 @@ [project] authors = ["Fuel Labs "] entry = "main.sw" -implicit-std = false license = "Apache-2.0" name = "storage_in_library" [dependencies] +core = { path = "../../../../../../sway-lib-core" } diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/str_slice_contract/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_fail/str_slice_contract/Forc.lock index c501b07361b..9d89663d662 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/str_slice_contract/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_fail/str_slice_contract/Forc.lock @@ -1,3 +1,8 @@ +[[package]] +name = "core" +source = "path+from-root-A976009EC848419E" + [[package]] name = "str_slice_contract" source = "member" +dependencies = ["core"] diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/str_slice_contract/Forc.toml b/test/src/e2e_vm_tests/test_programs/should_fail/str_slice_contract/Forc.toml index 3051379ecf1..98a4effc640 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/str_slice_contract/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/should_fail/str_slice_contract/Forc.toml @@ -3,4 +3,6 @@ name = "str_slice_contract" authors = ["Fuel Labs "] entry = "main.sw" license = "Apache-2.0" -implicit-std = false + +[dependencies] +core = { path = "../../../../../../sway-lib-core" } diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/str_slice_script/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_fail/str_slice_script/Forc.lock index 8dd625ee72a..6c6fcaa3174 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/str_slice_script/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_fail/str_slice_script/Forc.lock @@ -1,3 +1,8 @@ +[[package]] +name = "core" +source = "path+from-root-9B49BFF20742B6CF" + [[package]] name = "str_slice_script" source = "member" +dependencies = ["core"] diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/str_slice_script/Forc.toml b/test/src/e2e_vm_tests/test_programs/should_fail/str_slice_script/Forc.toml index aed4d46cf32..60125668f58 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/str_slice_script/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/should_fail/str_slice_script/Forc.toml @@ -3,4 +3,6 @@ name = "str_slice_script" authors = ["Fuel Labs "] entry = "main.sw" license = "Apache-2.0" -implicit-std = false + +[dependencies] +core = { path = "../../../../../../sway-lib-core" } diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/vec_set_index_out_of_bounds/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_fail/vec_set_index_out_of_bounds/Forc.lock index 75c42b98017..123b9e7f6a1 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/vec_set_index_out_of_bounds/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_fail/vec_set_index_out_of_bounds/Forc.lock @@ -1,13 +1,16 @@ [[package]] -name = 'core' -source = 'path+from-root-D885AAAE8A999D71' +name = "core" +source = "path+from-root-D885AAAE8A999D71" [[package]] -name = 'std' -source = 'path+from-root-D885AAAE8A999D71' -dependencies = ['core'] +name = "std" +source = "path+from-root-D885AAAE8A999D71" +dependencies = ["core"] [[package]] -name = 'vec_set_index_out_of_bounds' -source = 'member' -dependencies = ['std'] +name = "vec_set_index_out_of_bounds" +source = "member" +dependencies = [ + "core", + "std", +] diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/vec_set_index_out_of_bounds/Forc.toml b/test/src/e2e_vm_tests/test_programs/should_fail/vec_set_index_out_of_bounds/Forc.toml index 50fac241a30..77af422f82f 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/vec_set_index_out_of_bounds/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/should_fail/vec_set_index_out_of_bounds/Forc.toml @@ -5,4 +5,5 @@ license = "Apache-2.0" name = "vec_set_index_out_of_bounds" [dependencies] +core = { path = "../../../../../../sway-lib-core" } std = { path = "../../../reduced_std_libs/sway-lib-std-vec" } diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/vec_set_index_out_of_bounds/test.toml b/test/src/e2e_vm_tests/test_programs/should_fail/vec_set_index_out_of_bounds/test.toml index adf28c0171e..eab2e4be72c 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/vec_set_index_out_of_bounds/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_fail/vec_set_index_out_of_bounds/test.toml @@ -1,4 +1,5 @@ category = "run" -expected_result = { action = "revert", value = -65532 } # 0xffffffffffff0004 as i64 +expected_result = { action = "revert", value = -65532 } # 0xffffffffffff0004 as i64 +expected_result_new_encoding = { action = "revert", value = -65532 } # 0xffffffffffff0004 as i64 validate_abi = false expected_warnings = 1 diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/vec_swap_param1_out_of_bounds/test.toml b/test/src/e2e_vm_tests/test_programs/should_fail/vec_swap_param1_out_of_bounds/test.toml index 58b31bac659..7fa63858898 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/vec_swap_param1_out_of_bounds/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_fail/vec_swap_param1_out_of_bounds/test.toml @@ -1,3 +1,4 @@ category = "run" -expected_result = { action = "revert", value = -65532 } # 0xffffffffffff0004 as i64 +expected_result = { action = "revert", value = -65532 } # 0xffffffffffff0004 as i64 +expected_result_new_encoding = { action = "revert", value = -65532 } # 0xffffffffffff0004 as i64 validate_abi = false diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/vec_swap_param2_out_of_bounds/test.toml b/test/src/e2e_vm_tests/test_programs/should_fail/vec_swap_param2_out_of_bounds/test.toml index 58b31bac659..7fa63858898 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/vec_swap_param2_out_of_bounds/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_fail/vec_swap_param2_out_of_bounds/test.toml @@ -1,3 +1,4 @@ category = "run" -expected_result = { action = "revert", value = -65532 } # 0xffffffffffff0004 as i64 +expected_result = { action = "revert", value = -65532 } # 0xffffffffffff0004 as i64 +expected_result_new_encoding = { action = "revert", value = -65532 } # 0xffffffffffff0004 as i64 validate_abi = false diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/while_explicit_ret_1/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_fail/while_explicit_ret_1/Forc.lock index 3a680f081d2..6cc13364a9c 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/while_explicit_ret_1/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_fail/while_explicit_ret_1/Forc.lock @@ -1,3 +1,8 @@ [[package]] -name = 'while_explicit_ret_1' -source = 'member' +name = "core" +source = "path+from-root-0E1A5F29E9E5EC8A" + +[[package]] +name = "while_explicit_ret_1" +source = "member" +dependencies = ["core"] diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/while_explicit_ret_1/Forc.toml b/test/src/e2e_vm_tests/test_programs/should_fail/while_explicit_ret_1/Forc.toml index f7d6af0f419..fdca8b746fe 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/while_explicit_ret_1/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/should_fail/while_explicit_ret_1/Forc.toml @@ -4,3 +4,6 @@ entry = "main.sw" implicit-std = false license = "Apache-2.0" name = "while_explicit_ret_1" + +[dependencies] +core = { path = "../../../../../../sway-lib-core" } diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/while_explicit_ret_2/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_fail/while_explicit_ret_2/Forc.lock index 50827bc7fae..b3650d27bb4 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/while_explicit_ret_2/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_fail/while_explicit_ret_2/Forc.lock @@ -1,3 +1,8 @@ [[package]] -name = 'while_explicit_ret_2' -source = 'member' +name = "core" +source = "path+from-root-4E18762FE3217FF9" + +[[package]] +name = "while_explicit_ret_2" +source = "member" +dependencies = ["core"] diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/while_explicit_ret_2/Forc.toml b/test/src/e2e_vm_tests/test_programs/should_fail/while_explicit_ret_2/Forc.toml index 16f843734f2..d715fc658b6 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/while_explicit_ret_2/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/should_fail/while_explicit_ret_2/Forc.toml @@ -4,3 +4,6 @@ entry = "main.sw" implicit-std = false license = "Apache-2.0" name = "while_explicit_ret_2" + +[dependencies] +core = { path = "../../../../../../sway-lib-core" } diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/blanket_impl/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/blanket_impl/test.toml index b7a79f9a8c0..057e34e97ef 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/blanket_impl/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/blanket_impl/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 42 } +expected_result_new_encoding = { action = "return_data", value = "000000000000002A" } validate_abi = true diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/blanket_impl_u16/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/blanket_impl_u16/test.toml index b7a79f9a8c0..057e34e97ef 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/blanket_impl_u16/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/blanket_impl_u16/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 42 } +expected_result_new_encoding = { action = "return_data", value = "000000000000002A" } validate_abi = true diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/break_in_strange_positions/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/break_in_strange_positions/test.toml index 3068c5efe34..0a532963ebd 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/break_in_strange_positions/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/break_in_strange_positions/test.toml @@ -1,4 +1,5 @@ category = "run" expected_result = { action = "return", value = 8193 } +expected_result_new_encoding = { action = "return_data", value = "0000000000002001" } validate_abi = true expected_warnings = 38 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/conditional_compilation/run/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/conditional_compilation/run/test.toml index bbafebd842b..7a4c3ebb1b3 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/conditional_compilation/run/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/conditional_compilation/run/test.toml @@ -1,3 +1,4 @@ category = "run" supported_targets = ["fuel"] expected_result = { action = "return", value = 40 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000028" } diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/continue_in_strange_positions/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/continue_in_strange_positions/test.toml index b9cc230231d..c54ea31a2ac 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/continue_in_strange_positions/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/continue_in_strange_positions/test.toml @@ -1,4 +1,6 @@ category = "run" expected_result = { action = "return", value = 8193 } +expected_result_new_encoding = { action = "return_data", value = "0000000000002001" } + validate_abi = true expected_warnings = 36 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/forc/dependency_package_field/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/forc/dependency_package_field/test.toml index 44ca8ea93c4..788c4846709 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/forc/dependency_package_field/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/forc/dependency_package_field/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 0 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000000" } validate_abi = true diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/abort_control_flow_good/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/abort_control_flow_good/test.toml index 98eb1b13ef9..6fdbfa9c1ef 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/abort_control_flow_good/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/abort_control_flow_good/test.toml @@ -1,4 +1,5 @@ category = "run" expected_result = { action = "revert", value = 42 } +expected_result_new_encoding = { action = "revert", value = 42 } validate_abi = true expected_warnings = 4 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/addrof_intrinsic/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/addrof_intrinsic/test.toml index 20ea536eaf5..cbd006138d8 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/addrof_intrinsic/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/addrof_intrinsic/test.toml @@ -5,5 +5,6 @@ # Once we have temporaries removal implemented this test can be re-enabled. category = "disabled" expected_result = { action = "return", value = 0 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000000" } validate_abi = true expected_warnings = 1 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/aliased_imports/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/aliased_imports/test.toml index b7a79f9a8c0..057e34e97ef 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/aliased_imports/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/aliased_imports/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 42 } +expected_result_new_encoding = { action = "return_data", value = "000000000000002A" } validate_abi = true diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/args_on_stack/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/args_on_stack/test.toml index 8451a7e5f31..abf0b030421 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/args_on_stack/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/args_on_stack/test.toml @@ -1,4 +1,5 @@ category = "run" expected_result = { action = "return", value = 126 } +expected_result_new_encoding = { action = "return_data", value = "000000000000007E" } validate_abi = false -expected_warnings=6 \ No newline at end of file +expected_warnings = 6 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/array_basics/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/array_basics/test.toml index 721dd5bf0e2..5e38dd29f4f 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/array_basics/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/array_basics/test.toml @@ -1,4 +1,5 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } validate_abi = true expected_warnings = 1 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/array_generics/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/array_generics/test.toml index ace9e6f3186..ab0b427ff47 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/array_generics/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/array_generics/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } validate_abi = true diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/asm_expr_basic/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/asm_expr_basic/test.toml index 7596133a2df..f3e7f6a194f 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/asm_expr_basic/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/asm_expr_basic/test.toml @@ -1,4 +1,5 @@ category = "run" expected_result = { action = "return", value = 6 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000006" } validate_abi = true expected_warnings = 2 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/asm_without_return/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/asm_without_return/test.toml index 44ca8ea93c4..788c4846709 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/asm_without_return/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/asm_without_return/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 0 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000000" } validate_abi = true diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_abi/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_abi/test.toml index d78a5a20f95..a7f15cffab3 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_abi/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_abi/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 0 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000000" } expected_warnings = 1 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_abi_default/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_abi_default/test.toml index d78a5a20f95..a7f15cffab3 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_abi_default/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_abi_default/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 0 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000000" } expected_warnings = 1 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_abi_multiple/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_abi_multiple/test.toml index 078b4699135..bfea9e6f0a6 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_abi_multiple/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_abi_multiple/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 0 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000000" } expected_warnings = 2 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_impl/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_impl/test.toml index edc86e35903..4ed9532165d 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_impl/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_impl/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } expected_warnings = 2 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_impl_generic/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_impl_generic/test.toml index fafaa02408d..bf84ecada20 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_impl_generic/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_impl_generic/test.toml @@ -1,3 +1,4 @@ category = "disabled" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } expected_warnings = 2 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_impl_local_same_name/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_impl_local_same_name/test.toml index edc86e35903..4ed9532165d 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_impl_local_same_name/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_impl_local_same_name/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } expected_warnings = 2 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_impl_multiple/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_impl_multiple/test.toml index 819dfc427bf..d28b1d5e5e4 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_impl_multiple/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_impl_multiple/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } expected_warnings = 3 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_impl_self/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_impl_self/test.toml index edc86e35903..4ed9532165d 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_impl_self/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_impl_self/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } expected_warnings = 2 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_impl_self_order/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_impl_self_order/test.toml index edc86e35903..4ed9532165d 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_impl_self_order/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_impl_self_order/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } expected_warnings = 2 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_trait/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_trait/test.toml index 7bbfbabcf22..dd404e6d7be 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_trait/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_trait/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } expected_warnings = 1 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_trait_const/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_trait_const/test.toml index 7bbfbabcf22..dd404e6d7be 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_trait_const/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_trait_const/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } expected_warnings = 1 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_trait_default/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_trait_default/test.toml index 3efb3dd177d..2b5e23390de 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_trait_default/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_trait_default/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 5 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000005" } expected_warnings = 1 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_trait_impl_method/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_trait_impl_method/test.toml index 7bbfbabcf22..dd404e6d7be 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_trait_impl_method/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_trait_impl_method/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } expected_warnings = 1 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_trait_method/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_trait_method/test.toml index 7bbfbabcf22..dd404e6d7be 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_trait_method/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_trait_method/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } expected_warnings = 1 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_type_and_associated_const/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_type_and_associated_const/test.toml index 7bbfbabcf22..dd404e6d7be 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_type_and_associated_const/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_type_and_associated_const/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } expected_warnings = 1 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_type_ascription/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_type_ascription/test.toml index 7bbfbabcf22..dd404e6d7be 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_type_ascription/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_type_ascription/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } expected_warnings = 1 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_type_container/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_type_container/test.toml index 7bbfbabcf22..dd404e6d7be 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_type_container/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_type_container/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } expected_warnings = 1 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_type_container_in_library/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_type_container_in_library/test.toml index 7bbfbabcf22..dd404e6d7be 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_type_container_in_library/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_type_container_in_library/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } expected_warnings = 1 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_type_fully_qualified/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_type_fully_qualified/test.toml index 21d85aea55b..e11faf95188 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_type_fully_qualified/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_type_fully_qualified/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } expected_warnings = 0 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_type_iterator/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_type_iterator/test.toml index 7bbfbabcf22..dd404e6d7be 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_type_iterator/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_type_iterator/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } expected_warnings = 1 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_type_method/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_type_method/test.toml index 7bbfbabcf22..dd404e6d7be 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_type_method/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_type_method/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } expected_warnings = 1 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_type_parameter/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_type_parameter/test.toml index 7bbfbabcf22..dd404e6d7be 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_type_parameter/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_type_parameter/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } expected_warnings = 1 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/b256_bad_jumps/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/b256_bad_jumps/test.toml index ace9e6f3186..ab0b427ff47 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/b256_bad_jumps/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/b256_bad_jumps/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } validate_abi = true diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/b256_bitwise_ops/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/b256_bitwise_ops/test.toml index ace9e6f3186..ab0b427ff47 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/b256_bitwise_ops/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/b256_bitwise_ops/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } validate_abi = true diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/b256_ops/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/b256_ops/test.toml index 3d09400b800..d45b62e8020 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/b256_ops/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/b256_ops/test.toml @@ -1,5 +1,6 @@ category = "run" expected_result = { action = "return", value = 100 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000064" } validate_abi = true -expected_warnings = 1 \ No newline at end of file +expected_warnings = 1 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/basic_func_decl/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/basic_func_decl/test.toml index 8b71eac4bff..c62808abdbd 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/basic_func_decl/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/basic_func_decl/test.toml @@ -1,4 +1,5 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } validate_abi = true expected_warnings = 5 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/basic_predicate/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/basic_predicate/test.toml index bb916e5c72e..771ef987bb9 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/basic_predicate/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/basic_predicate/test.toml @@ -1,2 +1,3 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/binary_and_hex_literals/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/binary_and_hex_literals/test.toml index ace9e6f3186..ab0b427ff47 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/binary_and_hex_literals/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/binary_and_hex_literals/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } validate_abi = true diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/binop_intrinsics/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/binop_intrinsics/test.toml index 248a13d14ca..effd4ddfae3 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/binop_intrinsics/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/binop_intrinsics/test.toml @@ -1,4 +1,5 @@ category = "run" expected_result = { action = "return", value = 2 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000002" } validate_abi = true expected_warnings = 21 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/bitwise_not/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/bitwise_not/test.toml index ace9e6f3186..ab0b427ff47 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/bitwise_not/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/bitwise_not/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } validate_abi = true diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/blanket_trait/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/blanket_trait/test.toml index 721dd5bf0e2..5e38dd29f4f 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/blanket_trait/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/blanket_trait/test.toml @@ -1,4 +1,5 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } validate_abi = true expected_warnings = 1 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/bool_and_or/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/bool_and_or/test.toml index b7a79f9a8c0..057e34e97ef 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/bool_and_or/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/bool_and_or/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 42 } +expected_result_new_encoding = { action = "return_data", value = "000000000000002A" } validate_abi = true diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/break_and_continue/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/break_and_continue/test.toml index ace9e6f3186..ab0b427ff47 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/break_and_continue/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/break_and_continue/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } validate_abi = true diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/builtin_type_method_call/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/builtin_type_method_call/test.toml index a9e475bbda3..d8f3a70d680 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/builtin_type_method_call/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/builtin_type_method_call/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 3 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000003" } validate_abi = true diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/chained_if_let/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/chained_if_let/test.toml index 5338339c8cb..e0fa893eb64 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/chained_if_let/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/chained_if_let/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 5 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000005" } validate_abi = true diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/complex_cfg/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/complex_cfg/test.toml index a9982afc802..ebe923c5ec5 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/complex_cfg/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/complex_cfg/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 0 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000000" } validate_abi = false diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/configurable_consts/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/configurable_consts/test.toml index 86763df8984..e5a2c4c0781 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/configurable_consts/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/configurable_consts/test.toml @@ -1,5 +1,6 @@ category = "run" expected_result = { action = "return", value = 0 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000000" } validate_abi = true expected_warnings = 2 -unsupported_profiles = ["debug"] \ No newline at end of file +unsupported_profiles = ["debug"] diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/const_decl/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/const_decl/test.toml index 2297098e50e..156a03feb89 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/const_decl/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/const_decl/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 100 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000064" } validate_abi = true diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/const_decl_and_use_in_library/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/const_decl_and_use_in_library/test.toml index b87306a6d45..051bea7f236 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/const_decl_and_use_in_library/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/const_decl_and_use_in_library/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 7 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000007" } validate_abi = true diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/const_decl_in_library/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/const_decl_in_library/test.toml index ace9e6f3186..ab0b427ff47 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/const_decl_in_library/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/const_decl_in_library/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } validate_abi = true diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/const_decl_with_call_path/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/const_decl_with_call_path/test.toml index 1a37cf3ee4d..4ce10cccb80 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/const_decl_with_call_path/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/const_decl_with_call_path/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 10 } +expected_result_new_encoding = { action = "return_data", value = "000000000000000A" } validate_abi = true diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/const_inits/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/const_inits/test.toml index 0384b8a131a..35faf12680d 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/const_inits/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/const_inits/test.toml @@ -1,4 +1,5 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } validate_abi = true expected_warnings = 19 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/contract_caller_dynamic_address/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/contract_caller_dynamic_address/test.toml index 2f3b260911b..ba5aad6b91a 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/contract_caller_dynamic_address/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/contract_caller_dynamic_address/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "revert", value = 0 } +expected_result_new_encoding = { action = "revert", value = 0 } validate_abi = false diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/diverging_exprs/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/diverging_exprs/test.toml index 0ad5b84efff..0a8b06c7c81 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/diverging_exprs/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/diverging_exprs/test.toml @@ -1,4 +1,5 @@ category = "run" expected_result = { action = "return", value = 42 } +expected_result_new_encoding = { action = "return_data", value = "000000000000002A" } validate_abi = true expected_warnings = 36 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/dummy_method_issue/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/dummy_method_issue/test.toml index 23910a663c0..e20c8a083f0 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/dummy_method_issue/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/dummy_method_issue/test.toml @@ -1,4 +1,5 @@ category = "run" expected_result = { action = "return", value = 0 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000000" } validate_abi = false expected_warnings = 7 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/empty_method_initializer/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/empty_method_initializer/test.toml index ace9e6f3186..ab0b427ff47 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/empty_method_initializer/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/empty_method_initializer/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } validate_abi = true diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_destructuring/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_destructuring/test.toml index 95751ee59b1..52452a35ed5 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_destructuring/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_destructuring/test.toml @@ -1,4 +1,5 @@ category = "run" expected_result = { action = "return", value = 15 } +expected_result_new_encoding = { action = "return_data", value = "000000000000000F" } validate_abi = true expected_warnings = 1 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_if_let/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_if_let/test.toml index 7432a7f2800..06069743a2f 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_if_let/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_if_let/test.toml @@ -1,4 +1,5 @@ category = "run" expected_result = { action = "return", value = 143 } +expected_result_new_encoding = { action = "return_data", value = "000000000000008F" } validate_abi = true expected_warnings = 3 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_if_let_large_type/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_if_let_large_type/test.toml index 9104197f5b0..05d0a23d4d1 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_if_let_large_type/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_if_let_large_type/test.toml @@ -1,4 +1,5 @@ category = "run" expected_result = { action = "return", value = 15 } +expected_result_new_encoding = { action = "return_data", value = "000000000000000F" } validate_abi = true expected_warnings = 4 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_in_fn_decl/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_in_fn_decl/test.toml index e19e6246373..0586c29470d 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_in_fn_decl/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_in_fn_decl/test.toml @@ -1,4 +1,5 @@ category = "run" expected_result = { action = "return", value = 255 } +expected_result_new_encoding = { action = "return_data", value = "00000000000000FF" } validate_abi = true expected_warnings = 3 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_init_fn_call/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_init_fn_call/test.toml index 721dd5bf0e2..5e38dd29f4f 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_init_fn_call/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_init_fn_call/test.toml @@ -1,4 +1,5 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } validate_abi = true expected_warnings = 1 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_instantiation/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_instantiation/test.toml index 2f22ee52736..0a63779e717 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_instantiation/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_instantiation/test.toml @@ -1,4 +1,5 @@ category = "run" expected_result = { action = "return", value = 42 } +expected_result_new_encoding = { action = "return_data", value = "000000000000002A" } validate_abi = true -expected_warnings = 0 \ No newline at end of file +expected_warnings = 0 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_padding/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_padding/test.toml index d00a23a259f..10a2c4fde3a 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_padding/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_padding/test.toml @@ -1,4 +1,5 @@ category = "run" expected_result = { action = "return_data", value = "000000000000000100000000000000000000000000000000000000000000002a00000000000000010000000000000000000000000000000000000000000000000000000000000042" } +# TODO expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } validate_abi = true expected_warnings = 4 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_type_inference/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_type_inference/test.toml index 2b50e4c3818..754fbdf00d6 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_type_inference/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_type_inference/test.toml @@ -1,4 +1,5 @@ category = "run" expected_result = { action = "return", value = 5 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000005" } validate_abi = true expected_warnings = 2 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_variant_imports/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_variant_imports/test.toml index 536737f372f..9ea61008d69 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_variant_imports/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_variant_imports/test.toml @@ -1,4 +1,5 @@ category = "run" expected_result = { action = "return", value = 0 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000000" } validate_abi = true expected_warnings = 4 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/eq_and_neq/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/eq_and_neq/test.toml index ace9e6f3186..ab0b427ff47 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/eq_and_neq/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/eq_and_neq/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } validate_abi = true diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/eq_intrinsic/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/eq_intrinsic/test.toml index 5617bb5d0a9..5e6d38e1c3e 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/eq_intrinsic/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/eq_intrinsic/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 2 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000002" } validate_abi = true diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/far_jumps/many_blobs/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/far_jumps/many_blobs/test.toml index 7f1c797386b..cf57d328da9 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/far_jumps/many_blobs/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/far_jumps/many_blobs/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 666 } +expected_result_new_encoding = { action = "return_data", value = "000000000000029A" } validate_abi = false diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/far_jumps/single_blob/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/far_jumps/single_blob/test.toml index e1b0a0c029d..14f5a087a54 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/far_jumps/single_blob/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/far_jumps/single_blob/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 111 } +expected_result_new_encoding = { action = "return_data", value = "000000000000006F" } validate_abi = false diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/fix_opcode_bug/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/fix_opcode_bug/test.toml index d7de13aaded..3bf558bb579 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/fix_opcode_bug/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/fix_opcode_bug/test.toml @@ -1,4 +1,5 @@ category = "run" expected_result = { action = "return", value = 30 } +expected_result_new_encoding = { action = "return_data", value = "000000000000001E" } validate_abi = true expected_warnings = 1 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/for_loops/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/for_loops/test.toml index ace9e6f3186..ab0b427ff47 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/for_loops/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/for_loops/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } validate_abi = true diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/funcs_with_generic_types/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/funcs_with_generic_types/test.toml index 2d36f291d1d..2672aa49208 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/funcs_with_generic_types/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/funcs_with_generic_types/test.toml @@ -1,4 +1,5 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } validate_abi = true expected_warnings = 21 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_functions/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_functions/test.toml index 721dd5bf0e2..5e38dd29f4f 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_functions/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_functions/test.toml @@ -1,4 +1,5 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } validate_abi = true expected_warnings = 1 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_impl_self/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_impl_self/test.toml index deda3948529..8d69ace445c 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_impl_self/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_impl_self/test.toml @@ -1,4 +1,5 @@ category = "run" expected_result = { action = "return", value = 10 } +expected_result_new_encoding = { action = "return_data", value = "000000000000000A" } validate_abi = true expected_warnings = 12 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_impl_self_where/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_impl_self_where/test.toml index 1a37cf3ee4d..4ce10cccb80 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_impl_self_where/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_impl_self_where/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 10 } +expected_result_new_encoding = { action = "return_data", value = "000000000000000A" } validate_abi = true diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_inside_generic/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_inside_generic/test.toml index 1d1193452cc..6b7fb5088c4 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_inside_generic/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_inside_generic/test.toml @@ -1,4 +1,5 @@ category = "run" expected_result = { action = "return", value = 7 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000007" } validate_abi = true expected_warnings = 2 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_result_method/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_result_method/test.toml index ace9e6f3186..ab0b427ff47 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_result_method/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_result_method/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } validate_abi = true diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_struct/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_struct/test.toml index ace9e6f3186..ab0b427ff47 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_struct/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_struct/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } validate_abi = true diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_struct_instantiation/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_struct_instantiation/test.toml index 78a2c7303f6..96bce34f094 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_struct_instantiation/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_struct_instantiation/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } validate_abi = false diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_structs/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_structs/test.toml index 721dd5bf0e2..5e38dd29f4f 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_structs/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_structs/test.toml @@ -1,4 +1,5 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } validate_abi = true expected_warnings = 1 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_trait_constraints/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_trait_constraints/test.toml index 14012ed8d21..93ec6dd3822 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_trait_constraints/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_trait_constraints/test.toml @@ -1,4 +1,5 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } validate_abi = false expected_warnings = 3 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_traits/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_traits/test.toml index e2d58e9e12f..106280473b3 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_traits/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_traits/test.toml @@ -1,4 +1,5 @@ category = "run" expected_result = { action = "return", value = 42 } +expected_result_new_encoding = { action = "return_data", value = "000000000000002A" } validate_abi = true expected_warnings = 3 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_transpose/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_transpose/test.toml index ace9e6f3186..ab0b427ff47 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_transpose/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_transpose/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } validate_abi = true diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_tuple_trait/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_tuple_trait/test.toml index 24cd9f3291c..ab0b427ff47 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_tuple_trait/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_tuple_trait/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 1 } -validate_abi = true \ No newline at end of file +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } +validate_abi = true diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_type_inference/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_type_inference/test.toml index 231372c55d7..fba470ee498 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_type_inference/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_type_inference/test.toml @@ -1,4 +1,5 @@ category = "run" expected_result = { action = "return", value = 0 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000000" } validate_abi = true expected_warnings = 6 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_where_in_impl_self/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_where_in_impl_self/test.toml index 24cd9f3291c..ab0b427ff47 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_where_in_impl_self/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_where_in_impl_self/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 1 } -validate_abi = true \ No newline at end of file +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } +validate_abi = true diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_where_in_impl_self2/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_where_in_impl_self2/test.toml index 24cd9f3291c..ab0b427ff47 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_where_in_impl_self2/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_where_in_impl_self2/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 1 } -validate_abi = true \ No newline at end of file +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } +validate_abi = true diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/gtf_intrinsic/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/gtf_intrinsic/test.toml index f3c32ba25a2..d2a83c46a6d 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/gtf_intrinsic/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/gtf_intrinsic/test.toml @@ -1,4 +1,5 @@ category = "run" expected_result = { action = "return", value = 0 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000000" } validate_abi = true -witness_data = [ "0000000000000001", "00000000000004D2" ] +witness_data = ["0000000000000001", "00000000000004D2"] diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/if_elseif_enum/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/if_elseif_enum/test.toml index 8b065bca7fd..f431dd9a5ea 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/if_elseif_enum/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/if_elseif_enum/test.toml @@ -1,4 +1,5 @@ category = "run" expected_result = { action = "return", value = 10 } +expected_result_new_encoding = { action = "return_data", value = "000000000000000A" } validate_abi = true expected_warnings = 6 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/if_implicit_unit/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/if_implicit_unit/test.toml index 231372c55d7..fba470ee498 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/if_implicit_unit/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/if_implicit_unit/test.toml @@ -1,4 +1,5 @@ category = "run" expected_result = { action = "return", value = 0 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000000" } validate_abi = true expected_warnings = 6 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/if_let_no_side_effects/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/if_let_no_side_effects/test.toml index 05519dd9fad..3386561fb5f 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/if_let_no_side_effects/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/if_let_no_side_effects/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 11 } +expected_result_new_encoding = { action = "return_data", value = "000000000000000B" } validate_abi = true diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/impl_self_method/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/impl_self_method/test.toml index c88dd88e6ec..60929d97ea3 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/impl_self_method/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/impl_self_method/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 10 } +expected_result_new_encoding = { action = "return_data", value = "000000000000000A" } expected_warnings = 1 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/impl_self_method_multiple/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/impl_self_method_multiple/test.toml index 6e8e56bb60e..cb7c17ccc15 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/impl_self_method_multiple/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/impl_self_method_multiple/test.toml @@ -1,3 +1,4 @@ category = "disabled" expected_result = { action = "return", value = 10 } +expected_result_new_encoding = { action = "return_data", value = "000000000000000A" } expected_warnings = 0 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/impl_self_method_order/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/impl_self_method_order/test.toml index 241ef59fe8e..716ca667f01 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/impl_self_method_order/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/impl_self_method_order/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 10 } +expected_result_new_encoding = { action = "return_data", value = "000000000000000A" } expected_warnings = 0 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/implicit_casting/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/implicit_casting/test.toml index 7bbc428caf0..057e34e97ef 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/implicit_casting/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/implicit_casting/test.toml @@ -1,4 +1,4 @@ category = "run" expected_result = { action = "return", value = 42 } +expected_result_new_encoding = { action = "return_data", value = "000000000000002A" } validate_abi = true - diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/implicit_return/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/implicit_return/test.toml index b7a79f9a8c0..057e34e97ef 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/implicit_return/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/implicit_return/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 42 } +expected_result_new_encoding = { action = "return_data", value = "000000000000002A" } validate_abi = true diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/import_method_from_other_file/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/import_method_from_other_file/test.toml index 1a37cf3ee4d..4ce10cccb80 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/import_method_from_other_file/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/import_method_from_other_file/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 10 } +expected_result_new_encoding = { action = "return_data", value = "000000000000000A" } validate_abi = true diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/import_trailing_comma/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/import_trailing_comma/test.toml index 44ca8ea93c4..788c4846709 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/import_trailing_comma/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/import_trailing_comma/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 0 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000000" } validate_abi = true diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/import_with_different_callpaths/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/import_with_different_callpaths/test.toml index 44ca8ea93c4..788c4846709 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/import_with_different_callpaths/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/import_with_different_callpaths/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 0 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000000" } validate_abi = true diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/impure_ifs/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/impure_ifs/test.toml index 5617bb5d0a9..5e6d38e1c3e 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/impure_ifs/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/impure_ifs/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 2 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000002" } validate_abi = true diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/inline_if_expr_const/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/inline_if_expr_const/test.toml index 5cc97e9850e..9f2e229520b 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/inline_if_expr_const/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/inline_if_expr_const/test.toml @@ -1,4 +1,5 @@ category = "run" expected_result = { action = "return", value = 0 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000000" } validate_abi = true expected_warnings = 1 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/insert_element_reg_reuse/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/insert_element_reg_reuse/test.toml index ace9e6f3186..ab0b427ff47 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/insert_element_reg_reuse/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/insert_element_reg_reuse/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } validate_abi = true diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/integer_type_inference/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/integer_type_inference/test.toml index 7c14a8742a2..368ed136b8f 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/integer_type_inference/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/integer_type_inference/test.toml @@ -1,4 +1,5 @@ category = "run" expected_result = { action = "return", value = 0 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000000" } validate_abi = true expected_warnings = 12 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/is_prime/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/is_prime/test.toml index ace9e6f3186..ab0b427ff47 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/is_prime/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/is_prime/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } validate_abi = true diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/is_reference_type/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/is_reference_type/test.toml index ace9e6f3186..ab0b427ff47 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/is_reference_type/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/is_reference_type/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } validate_abi = true diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/left_to_right_func_args_evaluation/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/left_to_right_func_args_evaluation/test.toml index c5c80d25b31..ed4841224d1 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/left_to_right_func_args_evaluation/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/left_to_right_func_args_evaluation/test.toml @@ -1,4 +1,5 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } validate_abi = true expected_warnings = 3 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/local_impl_for_ord/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/local_impl_for_ord/test.toml index c5c80d25b31..ed4841224d1 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/local_impl_for_ord/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/local_impl_for_ord/test.toml @@ -1,4 +1,5 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } validate_abi = true expected_warnings = 3 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/logging/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/logging/test.toml index 2e928e399ce..8cab4cb70a3 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/logging/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/logging/test.toml @@ -1,4 +1,5 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } validate_abi = true expected_warnings = 16 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/main_returns_unit/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/main_returns_unit/test.toml index 5cc97e9850e..9f2e229520b 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/main_returns_unit/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/main_returns_unit/test.toml @@ -1,4 +1,5 @@ category = "run" expected_result = { action = "return", value = 0 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000000" } validate_abi = true expected_warnings = 1 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/many_stack_variables/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/many_stack_variables/test.toml index 6238f8fd3f6..59685620d62 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/many_stack_variables/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/many_stack_variables/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 21 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000015" } validate_abi = true diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions/test.toml index b7a79f9a8c0..057e34e97ef 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 42 } +expected_result_new_encoding = { action = "return_data", value = "000000000000002A" } validate_abi = true diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_constants/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_constants/test.toml index 827746b1706..48fc96f6270 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_constants/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_constants/test.toml @@ -1,4 +1,5 @@ category = "run" expected_result = { action = "return", value = 126 } +expected_result_new_encoding = { action = "return_data", value = "000000000000007E" } validate_abi = true expected_warnings = 1 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_empty_enums/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_empty_enums/test.toml index 5452bafe788..86bd8523330 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_empty_enums/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_empty_enums/test.toml @@ -1,4 +1,5 @@ category = "run" expected_result = { action = "return", value = 42 } +expected_result_new_encoding = { action = "return_data", value = "000000000000002A" } validate_abi = true expected_warnings = 4 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_enums/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_enums/test.toml index ef50fe5aaa9..3fc5b254aa9 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_enums/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_enums/test.toml @@ -1,4 +1,5 @@ category = "run" expected_result = { action = "return", value = 42 } +expected_result_new_encoding = { action = "return_data", value = "000000000000002A" } validate_abi = true expected_warnings = 1 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_explicit_rets/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_explicit_rets/test.toml index 78a2c7303f6..96bce34f094 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_explicit_rets/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_explicit_rets/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } validate_abi = false diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_inside_generic_functions/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_inside_generic_functions/test.toml index ace9e6f3186..ab0b427ff47 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_inside_generic_functions/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_inside_generic_functions/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } validate_abi = true diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_mismatched/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_mismatched/test.toml index 2b50e4c3818..754fbdf00d6 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_mismatched/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_mismatched/test.toml @@ -1,4 +1,5 @@ category = "run" expected_result = { action = "return", value = 5 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000005" } validate_abi = true expected_warnings = 2 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_nested/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_nested/test.toml index 8abf6a2d9fd..0a0d73d2684 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_nested/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_nested/test.toml @@ -1,4 +1,5 @@ category = "run" expected_result = { action = "return", value = 123 } +expected_result_new_encoding = { action = "return_data", value = "000000000000007B" } validate_abi = true expected_warnings = 1 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_or/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_or/test.toml index 3ef599a53e5..2a24c489834 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_or/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_or/test.toml @@ -1,4 +1,5 @@ category = "run" -expected_result = { action = "return", value = 42} +expected_result = { action = "return", value = 42 } +expected_result_new_encoding = { action = "return_data", value = "000000000000002A" } validate_abi = true -expected_warnings = 7 #TODO: Set number of warnings to minimum once TODOs in tests are solved. +expected_warnings = 7 #TODO: Set number of warnings to minimum once TODOs in tests are solved. diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_rest/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_rest/test.toml index efb7f55aa19..a1a393131de 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_rest/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_rest/test.toml @@ -1,4 +1,5 @@ category = "run" expected_result = { action = "return", value = 42 } +expected_result_new_encoding = { action = "return_data", value = "000000000000002A" } validate_abi = true expected_warnings = 7 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_simple/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_simple/test.toml index ef50fe5aaa9..3fc5b254aa9 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_simple/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_simple/test.toml @@ -1,4 +1,5 @@ category = "run" expected_result = { action = "return", value = 42 } +expected_result_new_encoding = { action = "return_data", value = "000000000000002A" } validate_abi = true expected_warnings = 1 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_structs/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_structs/test.toml index 246714f7f3b..e40c69a63ab 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_structs/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_structs/test.toml @@ -1,4 +1,5 @@ category = "run" expected_result = { action = "return", value = 4 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000004" } validate_abi = true expected_warnings = 1 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_with_self/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_with_self/test.toml index 721dd5bf0e2..5e38dd29f4f 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_with_self/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_with_self/test.toml @@ -1,4 +1,5 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } validate_abi = true expected_warnings = 1 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/memcpy/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/memcpy/test.toml index ff8fd970753..780be764b30 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/memcpy/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/memcpy/test.toml @@ -1,4 +1,5 @@ category = "run" expected_result = { action = "return", value = 11 } +expected_result_new_encoding = { action = "return_data", value = "000000000000000B" } validate_abi = false -expected_warnings=6 \ No newline at end of file +expected_warnings = 6 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/method_indirect_inference/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/method_indirect_inference/test.toml index 78a2c7303f6..96bce34f094 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/method_indirect_inference/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/method_indirect_inference/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } validate_abi = false diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/method_on_empty_struct/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/method_on_empty_struct/test.toml index ace9e6f3186..ab0b427ff47 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/method_on_empty_struct/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/method_on_empty_struct/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } validate_abi = true diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/method_type_args/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/method_type_args/test.toml index a9982afc802..ebe923c5ec5 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/method_type_args/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/method_type_args/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 0 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000000" } validate_abi = false diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/method_unambiguous/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/method_unambiguous/test.toml index 78a2c7303f6..96bce34f094 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/method_unambiguous/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/method_unambiguous/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } validate_abi = false diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/module_dep/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/module_dep/test.toml index 31f8791b861..eb94d5a09d9 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/module_dep/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/module_dep/test.toml @@ -1,4 +1,5 @@ category = "compile" expected_result = { action = "return", value = 0 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000000" } validate_abi = false expected_warnings = 1 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/module_dep_multiple/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/module_dep_multiple/test.toml index 31f8791b861..eb94d5a09d9 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/module_dep_multiple/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/module_dep_multiple/test.toml @@ -1,4 +1,5 @@ category = "compile" expected_result = { action = "return", value = 0 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000000" } validate_abi = false expected_warnings = 1 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/module_dep_self/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/module_dep_self/test.toml index 31f8791b861..eb94d5a09d9 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/module_dep_self/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/module_dep_self/test.toml @@ -1,4 +1,5 @@ category = "compile" expected_result = { action = "return", value = 0 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000000" } validate_abi = false expected_warnings = 1 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/modulo_uint_test/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/modulo_uint_test/test.toml index 7e1fd223a9c..2b0103945f8 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/modulo_uint_test/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/modulo_uint_test/test.toml @@ -1,4 +1,5 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000000" } validate_abi = true expected_warnings = 6 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/multi_impl_self/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/multi_impl_self/test.toml index ef50fe5aaa9..3fc5b254aa9 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/multi_impl_self/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/multi_impl_self/test.toml @@ -1,4 +1,5 @@ category = "run" expected_result = { action = "return", value = 42 } +expected_result_new_encoding = { action = "return_data", value = "000000000000002A" } validate_abi = true expected_warnings = 1 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/multi_item_import/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/multi_item_import/test.toml index 44ca8ea93c4..788c4846709 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/multi_item_import/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/multi_item_import/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 0 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000000" } validate_abi = true diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/mut_ref_empty_type/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/mut_ref_empty_type/test.toml index 2f689b3f5c3..8533fc0c573 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/mut_ref_empty_type/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/mut_ref_empty_type/test.toml @@ -1,4 +1,5 @@ category = "run" expected_result = { action = "return", value = 42 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000002A" } validate_abi = true -expected_warnings = 2 \ No newline at end of file +expected_warnings = 2 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/mutable_and_initd/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/mutable_and_initd/test.toml index 57b9d0c27d8..404d0505dd5 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/mutable_and_initd/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/mutable_and_initd/test.toml @@ -1,4 +1,5 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } validate_abi = false #expected_warnings = 5 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/mutable_arrays_multiple_nested/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/mutable_arrays_multiple_nested/test.toml index bb916e5c72e..771ef987bb9 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/mutable_arrays_multiple_nested/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/mutable_arrays_multiple_nested/test.toml @@ -1,2 +1,3 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/revert_in_first_if_branch/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/revert_in_first_if_branch/test.toml index 4b2b851053e..5d972cf4f70 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/revert_in_first_if_branch/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/revert_in_first_if_branch/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "revert", value = 42 } +expected_result_new_encoding = { action = "revert", value = 42 } validate_abi = false diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_methods/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_methods/json_abi_oracle_new_encoding.json new file mode 100644 index 00000000000..068da3305ab --- /dev/null +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_methods/json_abi_oracle_new_encoding.json @@ -0,0 +1,26 @@ +{ + "configurables": [], + "encoding": "1", + "functions": [ + { + "attributes": null, + "inputs": [], + "name": "main", + "output": { + "name": "", + "type": 0, + "typeArguments": null + } + } + ], + "loggedTypes": [], + "messagesTypes": [], + "types": [ + { + "components": null, + "type": "u64", + "typeId": 0, + "typeParameters": null + } + ] +} \ No newline at end of file diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_methods/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_methods/test.toml index 41a6a1a6ba3..f9fcd2936e0 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_methods/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_methods/test.toml @@ -1,5 +1,6 @@ category = "run" expected_result = { action = "return", value = 42 } +expected_result_new_encoding = { action = "return_data", value = "000000000000002A" } validate_abi = true expected_warnings = 8 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/midenvm/midenvm_trivial/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/midenvm/midenvm_trivial/test.toml index 976e40b12b7..fd4c98366b9 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/midenvm/midenvm_trivial/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/midenvm/midenvm_trivial/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 42 } +expected_result_new_encoding = { action = "return_data", value = "000000000000002A" } supported_targets = ["midenvm"] diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/return_in_strange_positions/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/return_in_strange_positions/json_abi_oracle_new_encoding.json new file mode 100644 index 00000000000..068da3305ab --- /dev/null +++ b/test/src/e2e_vm_tests/test_programs/should_pass/return_in_strange_positions/json_abi_oracle_new_encoding.json @@ -0,0 +1,26 @@ +{ + "configurables": [], + "encoding": "1", + "functions": [ + { + "attributes": null, + "inputs": [], + "name": "main", + "output": { + "name": "", + "type": 0, + "typeArguments": null + } + } + ], + "loggedTypes": [], + "messagesTypes": [], + "types": [ + { + "components": null, + "type": "u64", + "typeId": 0, + "typeParameters": null + } + ] +} \ No newline at end of file diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/return_in_strange_positions/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/return_in_strange_positions/test.toml index 07f8dd2bb1d..8d82a0d72c4 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/return_in_strange_positions/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/return_in_strange_positions/test.toml @@ -1,15 +1,9 @@ category = "run" expected_result = { action = "return", value = 8193 } +expected_result_new_encoding = { action = "return_data", value = "0000000000002001" } validate_abi = true expected_warnings = 26 -#check: $()pub struct S { x : u64, y : u64, } -#nextln: $()This struct field is never accessed. - -#check: $()pub struct S { x : u64, y : u64, } -#nextln: $()This struct field is never accessed. -#nextln: $()pub enum Enum - #check: $()pub enum Enum #nextln: $()This enum is never used. @@ -84,4 +78,4 @@ expected_warnings = 26 #nextln: $()1345 #check: $()1345 -#nextln: $()This code is unreachable. \ No newline at end of file +#nextln: $()This code is unreachable. diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/return_into/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/return_into/test.toml index 286eed396f4..6ff8114173e 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/return_into/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/return_into/test.toml @@ -1,4 +1,5 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } validate_abi = false expected_warnings = 0 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/address_test/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/address_test/test.toml index ace9e6f3186..ab0b427ff47 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/address_test/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/address_test/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } validate_abi = true diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/alloc_test/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/alloc_test/test.toml index ace9e6f3186..ab0b427ff47 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/alloc_test/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/alloc_test/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } validate_abi = true diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/assert_eq/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/assert_eq/test.toml index ace9e6f3186..ab0b427ff47 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/assert_eq/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/assert_eq/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } validate_abi = true diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/assert_eq_revert/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/assert_eq_revert/test.toml index ec8f264cb84..dcb03b1076c 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/assert_eq_revert/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/assert_eq_revert/test.toml @@ -1,3 +1,4 @@ category = "run" -expected_result = { action = "revert", value = -65533 } # 0xffffffffffff0003 as i64 +expected_result = { action = "revert", value = -65533 } # 0xffffffffffff0003 as i64 +expected_result_new_encoding = { action = "revert", value = -65533 } # 0xffffffffffff0003 as i64 validate_abi = true diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/assert_ne/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/assert_ne/test.toml index ace9e6f3186..ab0b427ff47 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/assert_ne/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/assert_ne/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } validate_abi = true diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/assert_ne_revert/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/assert_ne_revert/test.toml index feb35f3adf9..fadbe13bbc0 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/assert_ne_revert/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/assert_ne_revert/test.toml @@ -1,3 +1,4 @@ category = "run" -expected_result = { action = "revert", value = -65531} # 0xffffffffffff0005 as i64 +expected_result = { action = "revert", value = -65531 } # 0xffffffffffff0005 as i64 +expected_result_new_encoding = { action = "revert", value = -65531 } # 0xffffffffffff0005 as i64 validate_abi = true diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/assert_test/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/assert_test/test.toml index ace9e6f3186..ab0b427ff47 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/assert_test/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/assert_test/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } validate_abi = true diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/b512_struct_alignment/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/b512_struct_alignment/test.toml index ace9e6f3186..ab0b427ff47 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/b512_struct_alignment/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/b512_struct_alignment/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } validate_abi = true diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/b512_test/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/b512_test/test.toml index ace9e6f3186..ab0b427ff47 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/b512_test/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/b512_test/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } validate_abi = true diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/block_height/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/block_height/test.toml index ace9e6f3186..ab0b427ff47 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/block_height/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/block_height/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } validate_abi = true diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/chess/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/chess/test.toml index d4188d44ee3..75460899189 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/chess/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/chess/test.toml @@ -1,4 +1,5 @@ category = "run" expected_result = { action = "return", value = 17 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000011" } validate_abi = false expected_warnings = 2 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/contract_id_test/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/contract_id_test/test.toml index ace9e6f3186..ab0b427ff47 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/contract_id_test/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/contract_id_test/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } validate_abi = true diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/contract_id_type/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/contract_id_type/test.toml index ace9e6f3186..ab0b427ff47 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/contract_id_type/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/contract_id_type/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } validate_abi = true diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/eq_custom_type/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/eq_custom_type/test.toml index 57fc995da49..a6cbc596324 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/eq_custom_type/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/eq_custom_type/test.toml @@ -1,4 +1,5 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } validate_abi = true expected_warnings = 2 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/eq_generic/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/eq_generic/test.toml index 5cc97e9850e..9f2e229520b 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/eq_generic/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/eq_generic/test.toml @@ -1,4 +1,5 @@ category = "run" expected_result = { action = "return", value = 0 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000000" } validate_abi = true expected_warnings = 1 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/ge_test/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/ge_test/test.toml index ace9e6f3186..ab0b427ff47 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/ge_test/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/ge_test/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } validate_abi = true diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/generic_empty_struct_with_constraint/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/generic_empty_struct_with_constraint/test.toml index 916523ab45f..b7e074a143d 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/generic_empty_struct_with_constraint/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/generic_empty_struct_with_constraint/test.toml @@ -1,4 +1,5 @@ category = "run" expected_result = { action = "return", value = 0 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000000" } validate_abi = true expected_warnings = 2 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/identity_eq/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/identity_eq/test.toml index ace9e6f3186..ab0b427ff47 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/identity_eq/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/identity_eq/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } validate_abi = true diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/if_type_revert/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/if_type_revert/test.toml index abd5247a4c8..f77c6eddd72 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/if_type_revert/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/if_type_revert/test.toml @@ -1,3 +1,3 @@ category = "run" - -expected_result = { action = "revert", value = 0 } \ No newline at end of file +expected_result = { action = "revert", value = 0 } +expected_result_new_encoding = { action = "revert", value = 0 } diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/intrinsics/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/intrinsics/test.toml index 7e1fd223a9c..9b0614e2104 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/intrinsics/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/intrinsics/test.toml @@ -1,4 +1,5 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } validate_abi = true expected_warnings = 6 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/iterator/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/iterator/test.toml index 78a2c7303f6..96bce34f094 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/iterator/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/iterator/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } validate_abi = false diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/option/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/option/test.toml index 6cf2527cea7..9d03aa5d942 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/option/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/option/test.toml @@ -1,5 +1,6 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } validate_abi = true -expected_warnings = 12 \ No newline at end of file +expected_warnings = 12 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/option_eq/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/option_eq/test.toml index 92d859c8396..1f8603a9f3b 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/option_eq/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/option_eq/test.toml @@ -1,5 +1,6 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } validate_abi = true -expected_warnings = 5 \ No newline at end of file +expected_warnings = 5 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/raw_ptr/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/raw_ptr/test.toml index 57fc995da49..a6cbc596324 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/raw_ptr/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/raw_ptr/test.toml @@ -1,4 +1,5 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } validate_abi = true expected_warnings = 2 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/require/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/require/test.toml index 721dd5bf0e2..5e38dd29f4f 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/require/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/require/test.toml @@ -1,4 +1,5 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } validate_abi = true expected_warnings = 1 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/result/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/result/test.toml index 326d245c37e..60d32ea9095 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/result/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/result/test.toml @@ -1,4 +1,5 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } validate_abi = true expected_warnings = 7 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/sha256/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/sha256/test.toml index ace9e6f3186..ab0b427ff47 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/sha256/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/sha256/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } validate_abi = true diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/u128_div_test/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/u128_div_test/test.toml index ace9e6f3186..ab0b427ff47 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/u128_div_test/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/u128_div_test/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } validate_abi = true diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/u128_log_test/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/u128_log_test/test.toml index ace9e6f3186..ab0b427ff47 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/u128_log_test/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/u128_log_test/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } validate_abi = true diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/u128_mul_test/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/u128_mul_test/test.toml index ace9e6f3186..ab0b427ff47 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/u128_mul_test/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/u128_mul_test/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } validate_abi = true diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/u128_root_test/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/u128_root_test/test.toml index ace9e6f3186..ab0b427ff47 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/u128_root_test/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/u128_root_test/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } validate_abi = true diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/u128_test/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/u128_test/test.toml index ace9e6f3186..ab0b427ff47 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/u128_test/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/u128_test/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } validate_abi = true diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/vec/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/vec/test.toml index ace9e6f3186..ab0b427ff47 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/vec/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/vec/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } validate_abi = true diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/vec_swap/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/vec_swap/test.toml index 78a2c7303f6..96bce34f094 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/vec_swap/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/vec_swap/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } validate_abi = false diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/unit_tests/regalloc_spill/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/unit_tests/regalloc_spill/test.toml index 4381af0e08e..0db4e94bfc3 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/unit_tests/regalloc_spill/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/unit_tests/regalloc_spill/test.toml @@ -1,3 +1,4 @@ category = "run" expected_result = { action = "return", value = 28655 } +expected_result_new_encoding = { action = "return_data", value = "0000000000006FEF" } validate_abi = false From 98e88088ed2e3ba9d38104d63b8d4e6da148842a Mon Sep 17 00:00:00 2001 From: xunilrj Date: Wed, 24 Apr 2024 19:42:58 +0100 Subject: [PATCH 08/11] asserts for e2e tests --- test/src/e2e_vm_tests/test_programs/a.sh | 204 +++++++++--------- .../main_args/main_args_predicate/test.toml | 3 + .../language/mutable_arrays/test.toml | 3 + .../language/mutable_arrays_enum/test.toml | 3 + .../language/mutable_arrays_nested/test.toml | 3 + .../language/mutable_arrays_struct/test.toml | 3 + .../language/mutable_arrays_swap/test.toml | 3 + .../test.toml | 3 + .../test.toml | 3 + .../nested_struct_destructuring/test.toml | 4 +- .../language/nested_structs/test.toml | 3 + .../language/nested_while_and_if/test.toml | 3 + .../language/new_allocator_test/test.toml | 3 + .../language/non_literal_const_decl/test.toml | 3 + .../language/numeric_constants/test.toml | 3 + .../language/op_precedence/test.toml | 3 + .../should_pass/language/ops/test.toml | 3 + .../language/out_of_order_decl/test.toml | 3 + .../language/predicate_while/test.toml | 3 + .../language/predicate_while_dep/test.toml | 3 + .../language/prelude_access/test.toml | 3 + .../language/prelude_access2/test.toml | 3 + .../primitive_type_argument/test.toml | 3 + .../language/raw_identifiers/test.toml | 4 +- .../language/raw_ptr/raw_ptr_ret/test.toml | 3 + .../language/raw_ptr/vec_ret/test.toml | 3 + .../language/reassignment_operators/test.toml | 3 + .../language/redundant_return/test.toml | 3 + .../language/ref_mutable_arrays/test.toml | 3 + .../ref_mutable_arrays_inline/test.toml | 3 + .../ref_mutable_fn_args_bool/test.toml | 3 + .../ref_mutable_fn_args_call/test.toml | 3 + .../ref_mutable_fn_args_struct/test.toml | 3 + .../test.toml | 3 + .../ref_mutable_fn_args_u32/test.toml | 3 + .../test.toml | 4 +- .../test.toml | 3 + .../test.toml | 3 + .../dereferencing_operator_index/test.toml | 3 + .../dereferencing_operator_star/test.toml | 3 + .../references/impl_reference_types/test.toml | 3 + .../mutability_of_references/test.toml | 3 + .../test.toml | 3 + .../references_and_generics/test.toml | 3 + .../references_and_type_aliases/test.toml | 3 + .../references_in_aggregates/test.toml | 3 + .../references_in_asm_blocks/test.toml | 3 + .../test.toml | 4 +- .../referencing_expressions/test.toml | 3 + .../referencing_function_parameters/test.toml | 3 + .../test.toml | 3 + .../referencing_parts_of_aggregates/test.toml | 3 + .../referencing_references/test.toml | 3 + .../type_unification_of_references/test.toml | 4 +- .../language/ret_small_string/test.toml | 3 + .../language/ret_string_in_struct/test.toml | 3 + .../should_pass/language/retd_b256/test.toml | 3 + .../language/retd_small_array/test.toml | 3 + .../language/retd_struct/test.toml | 3 + .../language/retd_zero_len_array/test.toml | 3 + .../language/same_const_name/test.toml | 3 + .../language/self_impl_reassignment/test.toml | 3 + .../should_pass/language/size_of/test.toml | 3 + .../should_pass/language/str_slice/test.toml | 3 + .../language/struct_destructuring/test.toml | 4 +- .../language/struct_field_access/test.toml | 3 + .../struct_field_reassignment/test.toml | 3 + .../language/struct_instantiation/test.toml | 4 +- .../language/supertraits/test.toml | 3 + .../supertraits_with_trait_methods/test.toml | 3 + .../language/trait_import_with_star/test.toml | 3 + .../test.toml | 3 + .../trait_method_generic_qualified/test.toml | 3 + .../language/trait_method_qualified/test.toml | 3 + .../language/trait_nested/test.toml | 3 + .../language/tuple_access/test.toml | 3 + .../language/tuple_desugaring/test.toml | 3 + .../tuple_field_reassignment/test.toml | 3 + .../language/tuple_in_struct/test.toml | 3 + .../language/tuple_indexing/test.toml | 3 + .../language/tuple_single_element/test.toml | 3 + .../language/tuple_trait/test.toml | 3 + .../language/tuple_types/test.toml | 3 + .../should_pass/language/type_alias/test.toml | 3 + .../typeinfo_custom_callpath/test.toml | 3 + .../typeinfo_custom_callpath2/test.toml | 3 + .../test.toml | 3 + .../language/u256/u256_abi/test.toml | 3 + .../language/unary_not_basic/test.toml | 3 + .../language/unary_not_basic_2/test.toml | 3 + .../language/unit_type_variants/test.toml | 3 + .../language/use_absolute_path/test.toml | 3 + .../language/use_full_path_names/test.toml | 3 + .../language/where_clause_enums/test.toml | 4 +- .../language/where_clause_functions/test.toml | 3 + .../where_clause_generic_traits/test.toml | 4 +- .../where_clause_generic_tuple/test.toml | 3 + .../language/where_clause_impls/test.toml | 4 +- .../language/where_clause_structs/test.toml | 4 +- .../language/where_clause_traits/test.toml | 4 +- .../language/while_loops/test.toml | 3 + .../language/zero_field_types/test.toml | 3 + .../should_pass/stdlib/raw_slice/test.toml | 3 + 103 files changed, 408 insertions(+), 114 deletions(-) diff --git a/test/src/e2e_vm_tests/test_programs/a.sh b/test/src/e2e_vm_tests/test_programs/a.sh index be16143d30a..7b3839ab6d9 100644 --- a/test/src/e2e_vm_tests/test_programs/a.sh +++ b/test/src/e2e_vm_tests/test_programs/a.sh @@ -1,102 +1,102 @@ -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/stdlib/raw_slice/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/prelude_access/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/self_impl_reassignment/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/retd_struct/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/out_of_order_decl/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/ref_mutable_fn_args_u32/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/while_loops/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/where_clause_generic_traits/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/ret_string_in_struct/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/tuple_trait/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/unary_not_basic/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/tuple_desugaring/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/typeinfo_custom_callpath2/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/size_of/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/typeinfo_custom_callpath/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/unary_not_basic_2/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/typeinfo_custom_callpath_with_import/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/mutable_arrays_nested/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/retd_small_array/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/ref_mutable_fn_args_struct_assign/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/ops/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/numeric_constants/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/trait_nested/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/ref_mutable_fn_args_struct/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/name_resolution_inside_intrinsics/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/where_clause_functions/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/primitive_type_argument/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/mutable_arrays_struct/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/where_clause_generic_tuple/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/ref_mutable_fn_args_bool/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/use_absolute_path/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/ref_mutable_arrays/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/nested_while_and_if/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/redundant_return/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/op_precedence/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/trait_import_with_star/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/struct_destructuring/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/reassignment_operators/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/name_resolution_after_monomorphization/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/str_slice/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/use_full_path_names/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/retd_zero_len_array/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/mutable_arrays/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/tuple_single_element/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/where_clause_structs/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/ref_mutable_arrays_inline/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/where_clause_impls/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/tuple_access/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/struct_instantiation/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/unit_type_variants/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/struct_field_reassignment/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/where_clause_traits/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/supertraits/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/tuple_field_reassignment/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/supertraits_with_trait_methods/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/mutable_arrays_swap/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/predicate_while_dep/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/new_allocator_test/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/type_alias/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/trait_method_qualified/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/predicate_while/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/mutable_arrays_enum/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/tuple_types/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/tuple_in_struct/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/same_const_name/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/nested_structs/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/u256/u256_abi/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/referencing_control_flow_expressions/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/referencing_parts_of_aggregates/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/dereferencing_control_flow_expressions/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/dereferencing_operator_star/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/trait_method_ascription_disambiguate/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/prelude_access2/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/type_unification_of_references/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/ref_mutable_fn_args_call/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/referencing_local_vars_and_values/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/dereferencing_operator_dot_on_tuples/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/dereferencing_operator_index/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/ret_small_string/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/retd_b256/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/zero_field_types/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/referencing_expressions/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/references_and_generics/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/references_in_aggregates/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/dereferencing_operator_dot_on_structs/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/referencing_references/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/mutability_of_references/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/where_clause_enums/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/passing_and_returning_references_to_and_from_functions/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/references_in_asm_blocks/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/impl_reference_types/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/references_and_type_aliases/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/main_args/main_args_predicate/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/raw_ptr/raw_ptr_ret/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/referencing_function_parameters/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/raw_identifiers/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/raw_ptr/vec_ret/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/non_literal_const_decl/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/tuple_indexing/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/struct_field_access/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/trait_method_generic_qualified/test.toml -echo "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/nested_struct_destructuring/test.toml \ No newline at end of file +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/stdlib/raw_slice/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/prelude_access/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/self_impl_reassignment/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/retd_struct/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/out_of_order_decl/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/ref_mutable_fn_args_u32/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/while_loops/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/where_clause_generic_traits/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/ret_string_in_struct/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/tuple_trait/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/unary_not_basic/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/tuple_desugaring/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/typeinfo_custom_callpath2/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/size_of/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/typeinfo_custom_callpath/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/unary_not_basic_2/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/typeinfo_custom_callpath_with_import/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/mutable_arrays_nested/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/retd_small_array/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/ref_mutable_fn_args_struct_assign/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/ops/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/numeric_constants/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/trait_nested/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/ref_mutable_fn_args_struct/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/name_resolution_inside_intrinsics/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/where_clause_functions/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/primitive_type_argument/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/mutable_arrays_struct/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/where_clause_generic_tuple/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/ref_mutable_fn_args_bool/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/use_absolute_path/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/ref_mutable_arrays/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/nested_while_and_if/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/redundant_return/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/op_precedence/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/trait_import_with_star/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/struct_destructuring/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/reassignment_operators/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/name_resolution_after_monomorphization/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/str_slice/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/use_full_path_names/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/retd_zero_len_array/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/mutable_arrays/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/tuple_single_element/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/where_clause_structs/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/ref_mutable_arrays_inline/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/where_clause_impls/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/tuple_access/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/struct_instantiation/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/unit_type_variants/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/struct_field_reassignment/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/where_clause_traits/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/supertraits/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/tuple_field_reassignment/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/supertraits_with_trait_methods/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/mutable_arrays_swap/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/predicate_while_dep/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/new_allocator_test/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/type_alias/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/trait_method_qualified/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/predicate_while/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/mutable_arrays_enum/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/tuple_types/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/tuple_in_struct/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/same_const_name/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/nested_structs/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/u256/u256_abi/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/referencing_control_flow_expressions/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/referencing_parts_of_aggregates/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/dereferencing_control_flow_expressions/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/dereferencing_operator_star/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/trait_method_ascription_disambiguate/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/prelude_access2/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/type_unification_of_references/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/ref_mutable_fn_args_call/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/referencing_local_vars_and_values/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/dereferencing_operator_dot_on_tuples/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/dereferencing_operator_index/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/ret_small_string/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/retd_b256/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/zero_field_types/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/referencing_expressions/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/references_and_generics/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/references_in_aggregates/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/dereferencing_operator_dot_on_structs/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/referencing_references/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/mutability_of_references/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/where_clause_enums/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/passing_and_returning_references_to_and_from_functions/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/references_in_asm_blocks/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/impl_reference_types/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/references_and_type_aliases/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/main_args/main_args_predicate/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/raw_ptr/raw_ptr_ret/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/referencing_function_parameters/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/raw_identifiers/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/raw_ptr/vec_ret/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/non_literal_const_decl/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/tuple_indexing/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/struct_field_access/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/trait_method_generic_qualified/test.toml +echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/nested_struct_destructuring/test.toml \ No newline at end of file diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_predicate/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_predicate/test.toml index f35894d5349..e10f4d0e5d1 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_predicate/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_predicate/test.toml @@ -4,3 +4,6 @@ script_data = "0000000000000538 0000000000000001" script_data_new_encoding = "0000000000000538 0000000000000001" expected_result = { action = "return", value = 1 } validate_abi = true + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/mutable_arrays/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/mutable_arrays/test.toml index bc08a79dc35..395d1981cb9 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/mutable_arrays/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/mutable_arrays/test.toml @@ -1,2 +1,5 @@ category = "run" expected_result = { action = "return", value = 10 } + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/mutable_arrays_enum/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/mutable_arrays_enum/test.toml index 802e5fab8a4..d5324b341e2 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/mutable_arrays_enum/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/mutable_arrays_enum/test.toml @@ -1,2 +1,5 @@ category = "run" expected_result = { action = "return", value = 20 } + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/mutable_arrays_nested/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/mutable_arrays_nested/test.toml index bb916e5c72e..6dd46787bdc 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/mutable_arrays_nested/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/mutable_arrays_nested/test.toml @@ -1,2 +1,5 @@ category = "run" expected_result = { action = "return", value = 1 } + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/mutable_arrays_struct/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/mutable_arrays_struct/test.toml index 802e5fab8a4..d5324b341e2 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/mutable_arrays_struct/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/mutable_arrays_struct/test.toml @@ -1,2 +1,5 @@ category = "run" expected_result = { action = "return", value = 20 } + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/mutable_arrays_swap/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/mutable_arrays_swap/test.toml index 802e5fab8a4..d5324b341e2 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/mutable_arrays_swap/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/mutable_arrays_swap/test.toml @@ -1,2 +1,5 @@ category = "run" expected_result = { action = "return", value = 20 } + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/name_resolution_after_monomorphization/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/name_resolution_after_monomorphization/test.toml index 2e1afcb0dda..a58de25f45f 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/name_resolution_after_monomorphization/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/name_resolution_after_monomorphization/test.toml @@ -2,3 +2,6 @@ category = "run" expected_result = { action = "return", value = 2 } validate_abi = false expected_warnings = 1 + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/name_resolution_inside_intrinsics/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/name_resolution_inside_intrinsics/test.toml index 2e1afcb0dda..a58de25f45f 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/name_resolution_inside_intrinsics/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/name_resolution_inside_intrinsics/test.toml @@ -2,3 +2,6 @@ category = "run" expected_result = { action = "return", value = 2 } validate_abi = false expected_warnings = 1 + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/nested_struct_destructuring/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/nested_struct_destructuring/test.toml index 8972919fe98..ee8d31fa115 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/nested_struct_destructuring/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/nested_struct_destructuring/test.toml @@ -1,3 +1,5 @@ category = "run" expected_result = { action = "return", value = 0 } -validate_abi = true \ No newline at end of file +validate_abi = true +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/nested_structs/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/nested_structs/test.toml index 55c70b2ece5..ebf1c71a42c 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/nested_structs/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/nested_structs/test.toml @@ -2,3 +2,6 @@ category = "run" expected_result = { action = "return", value = 1 } validate_abi = true expected_warnings = 30 + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/nested_while_and_if/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/nested_while_and_if/test.toml index ace9e6f3186..865faf5726f 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/nested_while_and_if/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/nested_while_and_if/test.toml @@ -1,3 +1,6 @@ category = "run" expected_result = { action = "return", value = 1 } validate_abi = true + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/new_allocator_test/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/new_allocator_test/test.toml index b7a79f9a8c0..953fd288492 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/new_allocator_test/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/new_allocator_test/test.toml @@ -1,3 +1,6 @@ category = "run" expected_result = { action = "return", value = 42 } validate_abi = true + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/non_literal_const_decl/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/non_literal_const_decl/test.toml index b7a79f9a8c0..953fd288492 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/non_literal_const_decl/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/non_literal_const_decl/test.toml @@ -1,3 +1,6 @@ category = "run" expected_result = { action = "return", value = 42 } validate_abi = true + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/numeric_constants/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/numeric_constants/test.toml index ace9e6f3186..865faf5726f 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/numeric_constants/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/numeric_constants/test.toml @@ -1,3 +1,6 @@ category = "run" expected_result = { action = "return", value = 1 } validate_abi = true + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/op_precedence/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/op_precedence/test.toml index 44ca8ea93c4..78b0f7c3f69 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/op_precedence/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/op_precedence/test.toml @@ -1,3 +1,6 @@ category = "run" expected_result = { action = "return", value = 0 } validate_abi = true + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/ops/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/ops/test.toml index ace9e6f3186..865faf5726f 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/ops/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/ops/test.toml @@ -1,3 +1,6 @@ category = "run" expected_result = { action = "return", value = 1 } validate_abi = true + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/out_of_order_decl/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/out_of_order_decl/test.toml index 7e1fd223a9c..d2ae34256a1 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/out_of_order_decl/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/out_of_order_decl/test.toml @@ -2,3 +2,6 @@ category = "run" expected_result = { action = "return", value = 1 } validate_abi = true expected_warnings = 6 + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/predicate_while/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/predicate_while/test.toml index bb916e5c72e..6dd46787bdc 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/predicate_while/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/predicate_while/test.toml @@ -1,2 +1,5 @@ category = "run" expected_result = { action = "return", value = 1 } + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/predicate_while_dep/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/predicate_while_dep/test.toml index bb916e5c72e..6dd46787bdc 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/predicate_while_dep/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/predicate_while_dep/test.toml @@ -1,2 +1,5 @@ category = "run" expected_result = { action = "return", value = 1 } + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/prelude_access/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/prelude_access/test.toml index 916523ab45f..4082d7a92a5 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/prelude_access/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/prelude_access/test.toml @@ -2,3 +2,6 @@ category = "run" expected_result = { action = "return", value = 0 } validate_abi = true expected_warnings = 2 + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/prelude_access2/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/prelude_access2/test.toml index 231372c55d7..ae323867b49 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/prelude_access2/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/prelude_access2/test.toml @@ -2,3 +2,6 @@ category = "run" expected_result = { action = "return", value = 0 } validate_abi = true expected_warnings = 6 + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/primitive_type_argument/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/primitive_type_argument/test.toml index 5338339c8cb..b462757189f 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/primitive_type_argument/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/primitive_type_argument/test.toml @@ -1,3 +1,6 @@ category = "run" expected_result = { action = "return", value = 5 } validate_abi = true + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/raw_identifiers/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/raw_identifiers/test.toml index 71e6ca1dc92..20a2baf9f4d 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/raw_identifiers/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/raw_identifiers/test.toml @@ -1,4 +1,6 @@ category = "run" expected_result = { action = "return", value = 0 } validate_abi = true -expected_warnings = 32 \ No newline at end of file +expected_warnings = 32 +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/raw_ptr/raw_ptr_ret/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/raw_ptr/raw_ptr_ret/test.toml index 36bf53f11ef..024f8e1a59b 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/raw_ptr/raw_ptr_ret/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/raw_ptr/raw_ptr_ret/test.toml @@ -1,2 +1,5 @@ category = "run" expected_result = { action = "return", value = 10680 } + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/raw_ptr/vec_ret/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/raw_ptr/vec_ret/test.toml index d54c962c5d4..d2d4447f5e2 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/raw_ptr/vec_ret/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/raw_ptr/vec_ret/test.toml @@ -1,2 +1,5 @@ category = "run" expected_result = { action = "return_data", value = "0000000003ffffc800000000000000040000000000000003" } + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/reassignment_operators/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/reassignment_operators/test.toml index ace9e6f3186..865faf5726f 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/reassignment_operators/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/reassignment_operators/test.toml @@ -1,3 +1,6 @@ category = "run" expected_result = { action = "return", value = 1 } validate_abi = true + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/redundant_return/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/redundant_return/test.toml index 721dd5bf0e2..199b60a324a 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/redundant_return/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/redundant_return/test.toml @@ -2,3 +2,6 @@ category = "run" expected_result = { action = "return", value = 1 } validate_abi = true expected_warnings = 1 + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_arrays/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_arrays/test.toml index bc08a79dc35..395d1981cb9 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_arrays/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_arrays/test.toml @@ -1,2 +1,5 @@ category = "run" expected_result = { action = "return", value = 10 } + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_arrays_inline/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_arrays_inline/test.toml index bc08a79dc35..395d1981cb9 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_arrays_inline/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_arrays_inline/test.toml @@ -1,2 +1,5 @@ category = "run" expected_result = { action = "return", value = 10 } + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_fn_args_bool/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_fn_args_bool/test.toml index ace9e6f3186..865faf5726f 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_fn_args_bool/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_fn_args_bool/test.toml @@ -1,3 +1,6 @@ category = "run" expected_result = { action = "return", value = 1 } validate_abi = true + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_fn_args_call/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_fn_args_call/test.toml index 5617bb5d0a9..6d70c098ebe 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_fn_args_call/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_fn_args_call/test.toml @@ -1,3 +1,6 @@ category = "run" expected_result = { action = "return", value = 2 } validate_abi = true + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_fn_args_struct/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_fn_args_struct/test.toml index 489fa0c1d91..49aeac484eb 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_fn_args_struct/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_fn_args_struct/test.toml @@ -2,3 +2,6 @@ category = "run" expected_result = { action = "return", value = 10 } validate_abi = true expected_warnings = 1 + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_fn_args_struct_assign/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_fn_args_struct_assign/test.toml index 1a37cf3ee4d..7b40b27ff23 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_fn_args_struct_assign/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_fn_args_struct_assign/test.toml @@ -1,3 +1,6 @@ category = "run" expected_result = { action = "return", value = 10 } validate_abi = true + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_fn_args_u32/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_fn_args_u32/test.toml index ecbf711bdc8..0c65f086e1b 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_fn_args_u32/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_fn_args_u32/test.toml @@ -1,3 +1,6 @@ category = "run" expected_result = { action = "return", value = 20 } validate_abi = true + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/references/dereferencing_control_flow_expressions/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/references/dereferencing_control_flow_expressions/test.toml index 8f2d99ec3e4..61d0c5e36d0 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/references/dereferencing_control_flow_expressions/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/references/dereferencing_control_flow_expressions/test.toml @@ -1,4 +1,6 @@ category = "run" expected_result = { action = "return", value = 42 } validate_abi = false -expected_warnings = 20 \ No newline at end of file +expected_warnings = 20 +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/references/dereferencing_operator_dot_on_structs/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/references/dereferencing_operator_dot_on_structs/test.toml index 598c389120e..05bd58234d8 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/references/dereferencing_operator_dot_on_structs/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/references/dereferencing_operator_dot_on_structs/test.toml @@ -2,3 +2,6 @@ category = "run" expected_result = { action = "return", value = 42 } validate_abi = false expected_warnings = 50 + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/references/dereferencing_operator_dot_on_tuples/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/references/dereferencing_operator_dot_on_tuples/test.toml index 598c389120e..05bd58234d8 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/references/dereferencing_operator_dot_on_tuples/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/references/dereferencing_operator_dot_on_tuples/test.toml @@ -2,3 +2,6 @@ category = "run" expected_result = { action = "return", value = 42 } validate_abi = false expected_warnings = 50 + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/references/dereferencing_operator_index/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/references/dereferencing_operator_index/test.toml index 598c389120e..05bd58234d8 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/references/dereferencing_operator_index/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/references/dereferencing_operator_index/test.toml @@ -2,3 +2,6 @@ category = "run" expected_result = { action = "return", value = 42 } validate_abi = false expected_warnings = 50 + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/references/dereferencing_operator_star/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/references/dereferencing_operator_star/test.toml index e3a2658f460..b1a6137675f 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/references/dereferencing_operator_star/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/references/dereferencing_operator_star/test.toml @@ -2,3 +2,6 @@ category = "run" expected_result = { action = "return", value = 42 } validate_abi = false expected_warnings = 9 + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/references/impl_reference_types/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/references/impl_reference_types/test.toml index 25a01ebced7..874cd1ee42b 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/references/impl_reference_types/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/references/impl_reference_types/test.toml @@ -2,3 +2,6 @@ category = "run" expected_result = { action = "return", value = 42 } validate_abi = false expected_warnings = 31 #TODO-DCA: Set to zero once DCA issues are solved. + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/references/mutability_of_references/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/references/mutability_of_references/test.toml index 0d805b6d719..663904eb315 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/references/mutability_of_references/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/references/mutability_of_references/test.toml @@ -2,3 +2,6 @@ category = "run" expected_result = { action = "return", value = 42 } validate_abi = false expected_warnings = 0 + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/references/passing_and_returning_references_to_and_from_functions/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/references/passing_and_returning_references_to_and_from_functions/test.toml index 90de30d80ec..76fee469b01 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/references/passing_and_returning_references_to_and_from_functions/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/references/passing_and_returning_references_to_and_from_functions/test.toml @@ -2,3 +2,6 @@ category = "run" expected_result = { action = "return", value = 42 } validate_abi = true expected_warnings = 0 + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/references/references_and_generics/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/references/references_and_generics/test.toml index 0d805b6d719..663904eb315 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/references/references_and_generics/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/references/references_and_generics/test.toml @@ -2,3 +2,6 @@ category = "run" expected_result = { action = "return", value = 42 } validate_abi = false expected_warnings = 0 + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/references/references_and_type_aliases/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/references/references_and_type_aliases/test.toml index 06109c2d9cd..69104b02372 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/references/references_and_type_aliases/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/references/references_and_type_aliases/test.toml @@ -2,3 +2,6 @@ category = "run" expected_result = { action = "return", value = 42 } validate_abi = false expected_warnings = 1 #TODO-DCA: Set to zero once DCA bug is solved. + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/references/references_in_aggregates/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/references/references_in_aggregates/test.toml index 0d805b6d719..663904eb315 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/references/references_in_aggregates/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/references/references_in_aggregates/test.toml @@ -2,3 +2,6 @@ category = "run" expected_result = { action = "return", value = 42 } validate_abi = false expected_warnings = 0 + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/references/references_in_asm_blocks/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/references/references_in_asm_blocks/test.toml index 0d805b6d719..663904eb315 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/references/references_in_asm_blocks/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/references/references_in_asm_blocks/test.toml @@ -2,3 +2,6 @@ category = "run" expected_result = { action = "return", value = 42 } validate_abi = false expected_warnings = 0 + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/references/referencing_control_flow_expressions/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/references/referencing_control_flow_expressions/test.toml index 53a273929dc..e95036251f8 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/references/referencing_control_flow_expressions/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/references/referencing_control_flow_expressions/test.toml @@ -1,4 +1,6 @@ category = "run" expected_result = { action = "return", value = 42 } validate_abi = true -expected_warnings = 40 \ No newline at end of file +expected_warnings = 40 +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/references/referencing_expressions/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/references/referencing_expressions/test.toml index 0d805b6d719..663904eb315 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/references/referencing_expressions/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/references/referencing_expressions/test.toml @@ -2,3 +2,6 @@ category = "run" expected_result = { action = "return", value = 42 } validate_abi = false expected_warnings = 0 + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/references/referencing_function_parameters/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/references/referencing_function_parameters/test.toml index 0d805b6d719..663904eb315 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/references/referencing_function_parameters/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/references/referencing_function_parameters/test.toml @@ -2,3 +2,6 @@ category = "run" expected_result = { action = "return", value = 42 } validate_abi = false expected_warnings = 0 + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/references/referencing_local_vars_and_values/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/references/referencing_local_vars_and_values/test.toml index 7504eeebd29..79b0e5bac0f 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/references/referencing_local_vars_and_values/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/references/referencing_local_vars_and_values/test.toml @@ -2,3 +2,6 @@ category = "run" expected_result = { action = "return", value = 42 } validate_abi = false expected_warnings = 9 # TODO-DCA: Should be zero. DCA problem? Investigate why there are "This method is never called." errors for some of the types. + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/references/referencing_parts_of_aggregates/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/references/referencing_parts_of_aggregates/test.toml index 0d805b6d719..663904eb315 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/references/referencing_parts_of_aggregates/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/references/referencing_parts_of_aggregates/test.toml @@ -2,3 +2,6 @@ category = "run" expected_result = { action = "return", value = 42 } validate_abi = false expected_warnings = 0 + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/references/referencing_references/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/references/referencing_references/test.toml index 0d805b6d719..663904eb315 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/references/referencing_references/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/references/referencing_references/test.toml @@ -2,3 +2,6 @@ category = "run" expected_result = { action = "return", value = 42 } validate_abi = false expected_warnings = 0 + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/references/type_unification_of_references/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/references/type_unification_of_references/test.toml index 8f2d99ec3e4..61d0c5e36d0 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/references/type_unification_of_references/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/references/type_unification_of_references/test.toml @@ -1,4 +1,6 @@ category = "run" expected_result = { action = "return", value = 42 } validate_abi = false -expected_warnings = 20 \ No newline at end of file +expected_warnings = 20 +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/ret_small_string/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/ret_small_string/test.toml index 6aad101f0ce..a78bacfe048 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/ret_small_string/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/ret_small_string/test.toml @@ -1,3 +1,6 @@ category = "run" expected_result = { action = "return_data", value = "666f6f0000000000" } validate_abi = true + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/ret_string_in_struct/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/ret_string_in_struct/test.toml index 6e46241a892..bdd471d704c 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/ret_string_in_struct/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/ret_string_in_struct/test.toml @@ -2,3 +2,6 @@ category = "run" expected_result = { action = "return_data", value = "6675656c2d6c61627300000000000000" } validate_abi = true expected_warnings = 1 + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/retd_b256/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/retd_b256/test.toml index fe3eb0acc17..7ec4cc4e6ee 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/retd_b256/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/retd_b256/test.toml @@ -2,3 +2,6 @@ category = "run" expected_result = { action = "return_data", value = "0000000000000000000000000000000000000000000000000000000000000000" } validate_abi = true expected_warnings = 1 + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/retd_small_array/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/retd_small_array/test.toml index 31562490f45..eda78149339 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/retd_small_array/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/retd_small_array/test.toml @@ -2,3 +2,6 @@ category = "run" expected_result = { action = "return_data", value = "0000000000000001" } validate_abi = true expected_warnings = 2 + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/retd_struct/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/retd_struct/test.toml index 9f6b98b678d..2f0bdf461cc 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/retd_struct/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/retd_struct/test.toml @@ -2,3 +2,6 @@ category = "run" expected_result = { action = "return_data", value = "000000000001869fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0102000000000000" } validate_abi = true expected_warnings = 3 + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/retd_zero_len_array/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/retd_zero_len_array/test.toml index e3983aefd8d..78b41123040 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/retd_zero_len_array/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/retd_zero_len_array/test.toml @@ -2,3 +2,6 @@ category = "run" expected_result = { action = "return_data", value = "" } validate_abi = true expected_warnings = 1 + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/same_const_name/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/same_const_name/test.toml index d67e517cd49..4fbafe18978 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/same_const_name/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/same_const_name/test.toml @@ -1,3 +1,6 @@ category = "run" expected_result = { action = "return", value = 0 } validate_abi = false + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/self_impl_reassignment/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/self_impl_reassignment/test.toml index ace9e6f3186..865faf5726f 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/self_impl_reassignment/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/self_impl_reassignment/test.toml @@ -1,3 +1,6 @@ category = "run" expected_result = { action = "return", value = 1 } validate_abi = true + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/size_of/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/size_of/test.toml index bbe43614420..8002099681e 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/size_of/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/size_of/test.toml @@ -2,3 +2,6 @@ category = "run" expected_result = { action = "return", value = 1 } validate_abi = true expected_warnings = 9 + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/str_slice/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/str_slice/test.toml index d8186a90d45..02446408e14 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/str_slice/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/str_slice/test.toml @@ -1,3 +1,6 @@ category = "run" expected_result = { action = "return", value = 6 } validate_abi = true + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/struct_destructuring/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/struct_destructuring/test.toml index de877071cf9..99310a9a7c6 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/struct_destructuring/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/struct_destructuring/test.toml @@ -1,3 +1,5 @@ category = "run" expected_result = { action = "return", value = 42 } -validate_abi = true \ No newline at end of file +validate_abi = true +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/struct_field_access/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/struct_field_access/test.toml index 652f09bfa94..28bbff436b2 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/struct_field_access/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/struct_field_access/test.toml @@ -1,3 +1,6 @@ category = "run" expected_result = { action = "return", value = 43 } validate_abi = true + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/struct_field_reassignment/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/struct_field_reassignment/test.toml index 7c95c1a15d4..4d6b7e7405e 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/struct_field_reassignment/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/struct_field_reassignment/test.toml @@ -2,3 +2,6 @@ category = "run" expected_result = { action = "return", value = 0 } validate_abi = true expected_warnings = 3 + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/struct_instantiation/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/struct_instantiation/test.toml index 2f22ee52736..01c4b498ce9 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/struct_instantiation/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/struct_instantiation/test.toml @@ -1,4 +1,6 @@ category = "run" expected_result = { action = "return", value = 42 } validate_abi = true -expected_warnings = 0 \ No newline at end of file +expected_warnings = 0 +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/supertraits/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/supertraits/test.toml index 7e1fd223a9c..d2ae34256a1 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/supertraits/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/supertraits/test.toml @@ -2,3 +2,6 @@ category = "run" expected_result = { action = "return", value = 1 } validate_abi = true expected_warnings = 6 + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/supertraits_with_trait_methods/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/supertraits_with_trait_methods/test.toml index ace9e6f3186..865faf5726f 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/supertraits_with_trait_methods/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/supertraits_with_trait_methods/test.toml @@ -1,3 +1,6 @@ category = "run" expected_result = { action = "return", value = 1 } validate_abi = true + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/trait_import_with_star/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/trait_import_with_star/test.toml index 5cc97e9850e..3ff6aee701e 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/trait_import_with_star/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/trait_import_with_star/test.toml @@ -2,3 +2,6 @@ category = "run" expected_result = { action = "return", value = 0 } validate_abi = true expected_warnings = 1 + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/trait_method_ascription_disambiguate/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/trait_method_ascription_disambiguate/test.toml index 57fc995da49..78d043f96a1 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/trait_method_ascription_disambiguate/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/trait_method_ascription_disambiguate/test.toml @@ -2,3 +2,6 @@ category = "run" expected_result = { action = "return", value = 1 } validate_abi = true expected_warnings = 2 + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/trait_method_generic_qualified/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/trait_method_generic_qualified/test.toml index 57fc995da49..78d043f96a1 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/trait_method_generic_qualified/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/trait_method_generic_qualified/test.toml @@ -2,3 +2,6 @@ category = "run" expected_result = { action = "return", value = 1 } validate_abi = true expected_warnings = 2 + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/trait_method_qualified/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/trait_method_qualified/test.toml index ace9e6f3186..865faf5726f 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/trait_method_qualified/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/trait_method_qualified/test.toml @@ -1,3 +1,6 @@ category = "run" expected_result = { action = "return", value = 1 } validate_abi = true + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/trait_nested/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/trait_nested/test.toml index 14012ed8d21..ec903909aed 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/trait_nested/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/trait_nested/test.toml @@ -2,3 +2,6 @@ category = "run" expected_result = { action = "return", value = 1 } validate_abi = false expected_warnings = 3 + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_access/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_access/test.toml index ef50fe5aaa9..a5d5f27924e 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_access/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_access/test.toml @@ -2,3 +2,6 @@ category = "run" expected_result = { action = "return", value = 42 } validate_abi = true expected_warnings = 1 + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_desugaring/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_desugaring/test.toml index a0f62749753..811f937055a 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_desugaring/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_desugaring/test.toml @@ -1,3 +1,6 @@ category = "run" expected_result = { action = "return", value = 9 } validate_abi = true + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_field_reassignment/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_field_reassignment/test.toml index c728db683ca..6bbe0cf09da 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_field_reassignment/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_field_reassignment/test.toml @@ -2,3 +2,6 @@ category = "run" expected_result = { action = "return", value = 320 } validate_abi = true expected_warnings = 2 + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_in_struct/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_in_struct/test.toml index 7ecea80c1be..c892cd95d2f 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_in_struct/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_in_struct/test.toml @@ -2,3 +2,6 @@ category = "run" expected_result = { action = "return", value = 1 } validate_abi = true expected_warnings = 14 + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_indexing/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_indexing/test.toml index ace9e6f3186..865faf5726f 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_indexing/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_indexing/test.toml @@ -1,3 +1,6 @@ category = "run" expected_result = { action = "return", value = 1 } validate_abi = true + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_single_element/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_single_element/test.toml index ace9e6f3186..865faf5726f 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_single_element/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_single_element/test.toml @@ -1,3 +1,6 @@ category = "run" expected_result = { action = "return", value = 1 } validate_abi = true + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_trait/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_trait/test.toml index 721dd5bf0e2..199b60a324a 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_trait/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_trait/test.toml @@ -2,3 +2,6 @@ category = "run" expected_result = { action = "return", value = 1 } validate_abi = true expected_warnings = 1 + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_types/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_types/test.toml index 2e6705c76d8..d950e82b9d0 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_types/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_types/test.toml @@ -1,3 +1,6 @@ category = "run" expected_result = { action = "return", value = 123 } validate_abi = true + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/type_alias/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/type_alias/test.toml index 2d16502b81e..9259981ed14 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/type_alias/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/type_alias/test.toml @@ -2,3 +2,6 @@ category = "run" expected_result = { action = "return", value = 0 } validate_abi = false expected_warnings = 1 + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/typeinfo_custom_callpath/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/typeinfo_custom_callpath/test.toml index 44ca8ea93c4..78b0f7c3f69 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/typeinfo_custom_callpath/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/typeinfo_custom_callpath/test.toml @@ -1,3 +1,6 @@ category = "run" expected_result = { action = "return", value = 0 } validate_abi = true + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/typeinfo_custom_callpath2/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/typeinfo_custom_callpath2/test.toml index 44ca8ea93c4..78b0f7c3f69 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/typeinfo_custom_callpath2/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/typeinfo_custom_callpath2/test.toml @@ -1,3 +1,6 @@ category = "run" expected_result = { action = "return", value = 0 } validate_abi = true + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/typeinfo_custom_callpath_with_import/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/typeinfo_custom_callpath_with_import/test.toml index 44ca8ea93c4..78b0f7c3f69 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/typeinfo_custom_callpath_with_import/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/typeinfo_custom_callpath_with_import/test.toml @@ -1,3 +1,6 @@ category = "run" expected_result = { action = "return", value = 0 } validate_abi = true + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/u256/u256_abi/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/u256/u256_abi/test.toml index d2a868bd8aa..3eb5c139f68 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/u256/u256_abi/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/u256/u256_abi/test.toml @@ -2,3 +2,6 @@ category = "run" expected_result = { action = "return_data", value = "0000000000000000000000000000000000000000000000000000000000000001" } validate_abi = true unsupported_profiles = ["debug"] + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/unary_not_basic/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/unary_not_basic/test.toml index ace9e6f3186..865faf5726f 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/unary_not_basic/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/unary_not_basic/test.toml @@ -1,3 +1,6 @@ category = "run" expected_result = { action = "return", value = 1 } validate_abi = true + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/unary_not_basic_2/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/unary_not_basic_2/test.toml index ace9e6f3186..865faf5726f 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/unary_not_basic_2/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/unary_not_basic_2/test.toml @@ -1,3 +1,6 @@ category = "run" expected_result = { action = "return", value = 1 } validate_abi = true + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/unit_type_variants/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/unit_type_variants/test.toml index 2b68f0ae2fe..a61808942da 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/unit_type_variants/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/unit_type_variants/test.toml @@ -2,3 +2,6 @@ category = "run" expected_result = { action = "return_data", value = "0000000000000002" } validate_abi = true expected_warnings = 2 + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/use_absolute_path/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/use_absolute_path/test.toml index ace9e6f3186..865faf5726f 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/use_absolute_path/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/use_absolute_path/test.toml @@ -1,3 +1,6 @@ category = "run" expected_result = { action = "return", value = 1 } validate_abi = true + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/use_full_path_names/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/use_full_path_names/test.toml index ace9e6f3186..865faf5726f 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/use_full_path_names/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/use_full_path_names/test.toml @@ -1,3 +1,6 @@ category = "run" expected_result = { action = "return", value = 1 } validate_abi = true + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_enums/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_enums/test.toml index 890d086711e..6043188d6dd 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_enums/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_enums/test.toml @@ -2,4 +2,6 @@ category = "run" expected_result = { action = "return", value = 0 } validate_abi = true -expected_warnings = 3 \ No newline at end of file +expected_warnings = 3 +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_functions/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_functions/test.toml index a19267f94a8..ad40e6b0f63 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_functions/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_functions/test.toml @@ -2,3 +2,6 @@ category = "run" expected_result = { action = "return", value = 42 } validate_abi = true expected_warnings = 9 + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_generic_traits/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_generic_traits/test.toml index 1eea8eb5fd9..454c9060227 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_generic_traits/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_generic_traits/test.toml @@ -1,4 +1,6 @@ category = "run" expected_result = { action = "return", value = 0 } -expected_warnings = 1 \ No newline at end of file +expected_warnings = 1 +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_generic_tuple/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_generic_tuple/test.toml index 41a6a1a6ba3..7e84536cee9 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_generic_tuple/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_generic_tuple/test.toml @@ -3,3 +3,6 @@ expected_result = { action = "return", value = 42 } validate_abi = true expected_warnings = 8 + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_impls/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_impls/test.toml index a4807130f00..bdaf250af37 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_impls/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_impls/test.toml @@ -2,4 +2,6 @@ category = "run" expected_result = { action = "return", value = 42 } validate_abi = true -expected_warnings = 8 \ No newline at end of file +expected_warnings = 8 +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_structs/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_structs/test.toml index ac7359161d9..80b690ff83f 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_structs/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_structs/test.toml @@ -2,4 +2,6 @@ category = "run" expected_result = { action = "return", value = 0 } validate_abi = true -expected_warnings = 2 \ No newline at end of file +expected_warnings = 2 +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_traits/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_traits/test.toml index e9086301515..03ca56e7e05 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_traits/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_traits/test.toml @@ -2,4 +2,6 @@ category = "run" expected_result = { action = "return", value = 0 } validate_abi = true -expected_warnings = 1 \ No newline at end of file +expected_warnings = 1 +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/while_loops/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/while_loops/test.toml index ace9e6f3186..865faf5726f 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/while_loops/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/while_loops/test.toml @@ -1,3 +1,6 @@ category = "run" expected_result = { action = "return", value = 1 } validate_abi = true + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/zero_field_types/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/zero_field_types/test.toml index 489fa0c1d91..49aeac484eb 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/zero_field_types/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/zero_field_types/test.toml @@ -2,3 +2,6 @@ category = "run" expected_result = { action = "return", value = 10 } validate_abi = true expected_warnings = 1 + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/raw_slice/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/raw_slice/test.toml index a301445f4dd..fae53cd0976 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/raw_slice/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/raw_slice/test.toml @@ -2,3 +2,6 @@ category = "run" expected_result = { action = "return_data", value = "0100000000000000000000000000002a" } validate_abi = true expected_warnings = 2 + +expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } + From 6528166b4817a5f879b772c5756c55faf05b983c Mon Sep 17 00:00:00 2001 From: xunilrj Date: Wed, 24 Apr 2024 19:43:03 +0100 Subject: [PATCH 09/11] asserts for e2e tests --- test/src/e2e_vm_tests/test_programs/a.sh | 102 ----------------------- 1 file changed, 102 deletions(-) delete mode 100644 test/src/e2e_vm_tests/test_programs/a.sh diff --git a/test/src/e2e_vm_tests/test_programs/a.sh b/test/src/e2e_vm_tests/test_programs/a.sh deleted file mode 100644 index 7b3839ab6d9..00000000000 --- a/test/src/e2e_vm_tests/test_programs/a.sh +++ /dev/null @@ -1,102 +0,0 @@ -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/stdlib/raw_slice/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/prelude_access/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/self_impl_reassignment/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/retd_struct/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/out_of_order_decl/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/ref_mutable_fn_args_u32/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/while_loops/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/where_clause_generic_traits/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/ret_string_in_struct/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/tuple_trait/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/unary_not_basic/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/tuple_desugaring/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/typeinfo_custom_callpath2/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/size_of/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/typeinfo_custom_callpath/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/unary_not_basic_2/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/typeinfo_custom_callpath_with_import/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/mutable_arrays_nested/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/retd_small_array/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/ref_mutable_fn_args_struct_assign/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/ops/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/numeric_constants/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/trait_nested/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/ref_mutable_fn_args_struct/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/name_resolution_inside_intrinsics/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/where_clause_functions/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/primitive_type_argument/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/mutable_arrays_struct/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/where_clause_generic_tuple/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/ref_mutable_fn_args_bool/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/use_absolute_path/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/ref_mutable_arrays/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/nested_while_and_if/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/redundant_return/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/op_precedence/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/trait_import_with_star/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/struct_destructuring/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/reassignment_operators/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/name_resolution_after_monomorphization/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/str_slice/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/use_full_path_names/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/retd_zero_len_array/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/mutable_arrays/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/tuple_single_element/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/where_clause_structs/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/ref_mutable_arrays_inline/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/where_clause_impls/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/tuple_access/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/struct_instantiation/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/unit_type_variants/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/struct_field_reassignment/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/where_clause_traits/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/supertraits/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/tuple_field_reassignment/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/supertraits_with_trait_methods/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/mutable_arrays_swap/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/predicate_while_dep/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/new_allocator_test/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/type_alias/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/trait_method_qualified/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/predicate_while/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/mutable_arrays_enum/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/tuple_types/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/tuple_in_struct/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/same_const_name/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/nested_structs/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/u256/u256_abi/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/referencing_control_flow_expressions/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/referencing_parts_of_aggregates/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/dereferencing_control_flow_expressions/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/dereferencing_operator_star/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/trait_method_ascription_disambiguate/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/prelude_access2/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/type_unification_of_references/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/ref_mutable_fn_args_call/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/referencing_local_vars_and_values/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/dereferencing_operator_dot_on_tuples/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/dereferencing_operator_index/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/ret_small_string/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/retd_b256/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/zero_field_types/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/referencing_expressions/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/references_and_generics/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/references_in_aggregates/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/dereferencing_operator_dot_on_structs/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/referencing_references/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/mutability_of_references/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/where_clause_enums/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/passing_and_returning_references_to_and_from_functions/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/references_in_asm_blocks/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/impl_reference_types/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/references_and_type_aliases/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/main_args/main_args_predicate/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/raw_ptr/raw_ptr_ret/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/references/referencing_function_parameters/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/raw_identifiers/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/raw_ptr/vec_ret/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/non_literal_const_decl/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/tuple_indexing/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/struct_field_access/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/trait_method_generic_qualified/test.toml -echo -e "\nexpected_result_new_encoding = { action = \"return_data\", value = \"0000000000000001\" }\n" >> should_pass/language/nested_struct_destructuring/test.toml \ No newline at end of file From 360ce99c6e77e4d5dd606f8a0f08ba11f254b65c Mon Sep 17 00:00:00 2001 From: xunilrj Date: Wed, 24 Apr 2024 21:44:40 +0100 Subject: [PATCH 10/11] multiple fixes for the new encoding --- sway-core/src/ir_generation/const_eval.rs | 10 +++- sway-core/src/language/ty/program.rs | 55 ++++++++++++------- .../ast_node/declaration/auto_impl.rs | 30 ++++------ .../semantic_analysis/cei_pattern_analysis.rs | 12 +++- sway-core/src/semantic_analysis/module.rs | 21 ++++--- sway-error/src/error.rs | 2 +- .../chained_if_let_missing_branch/src/main.sw | 5 -- .../configurables_are_not_const/Forc.lock | 9 ++- .../configurables_are_not_const/Forc.toml | 3 + .../const-instead-of-let/Forc.lock | 5 +- .../const-instead-of-let/Forc.toml | 1 + .../const-instead-of-let/test.toml | 2 +- .../contract_a/Forc.toml | 1 + .../contract_b/Forc.lock | 16 ++++-- .../contract_b/Forc.toml | 4 +- .../contract_c/Forc.lock | 9 ++- .../contract_c/Forc.toml | 2 + .../should_fail/disallowed_gm/Forc.lock | 5 ++ .../should_fail/disallowed_gm/Forc.toml | 3 + .../should_fail/illegal_break/Forc.lock | 9 ++- .../should_fail/illegal_break/Forc.toml | 1 + .../should_fail/impl_self_recursive/Forc.lock | 9 ++- .../should_fail/impl_self_recursive/Forc.toml | 3 +- .../insufficient_type_info/Forc.lock | 5 ++ .../insufficient_type_info/Forc.toml | 5 +- .../should_fail/multiple_impl_fns/Forc.lock | 9 ++- .../should_fail/multiple_impl_fns/Forc.toml | 1 + .../return_in_strange_positions/test.toml | 4 +- .../should_fail/simple_generics/Forc.lock | 9 ++- .../should_fail/simple_generics/Forc.toml | 3 + .../should_fail/storage_in_script/Forc.lock | 9 ++- .../should_fail/storage_in_script/Forc.toml | 1 + .../language/array_generics/Forc.toml | 3 + .../language/associated_const_abi/Forc.toml | 3 + .../associated_const_abi_default/Forc.toml | 3 + .../associated_const_impl_multiple/Forc.toml | 3 + .../associated_const_trait_method/Forc.toml | 3 + .../should_pass/language/eq_and_neq/test.toml | 2 +- .../language/generic_functions/Forc.toml | 3 + .../language/generic_structs/Forc.toml | 3 + .../language/generic_transpose/test.toml | 2 +- .../language/mut_ref_empty_type/test.toml | 2 +- .../language/mutable_and_initd/test.toml | 2 +- .../mutable_arrays_multiple_nested/Forc.toml | 3 + .../Forc.toml | 3 + .../ref_mutable_fn_args_u32/Forc.toml | 3 + .../dereferencing_operator_star/test.toml | 5 +- .../language/ret_string_in_struct/Forc.toml | 3 + .../language/retd_struct/Forc.toml | 3 + .../language/struct_init_reorder/Forc.toml | 3 + .../language/unary_not_basic_2/test.toml | 4 +- .../language/where_clause_functions/test.toml | 4 +- .../Forc.lock | 9 ++- .../Forc.toml | 3 + .../Forc.lock | 9 ++- .../Forc.toml | 3 + .../Forc.lock | 9 ++- .../Forc.toml | 3 + .../Forc.lock | 9 ++- .../Forc.toml | 3 + .../Forc.lock | 19 ++++--- .../Forc.toml | 1 + 62 files changed, 275 insertions(+), 116 deletions(-) diff --git a/sway-core/src/ir_generation/const_eval.rs b/sway-core/src/ir_generation/const_eval.rs index ad01563a8f4..9cf0661a103 100644 --- a/sway-core/src/ir_generation/const_eval.rs +++ b/sway-core/src/ir_generation/const_eval.rs @@ -244,9 +244,13 @@ pub(crate) fn compile_constant_expression_to_constant( // Special case functions because the span in `const_expr` is to the inlined function // definition, rather than the actual call site. ty::TyExpressionVariant::FunctionApplication { call_path, .. } => { - Err(CompileError::NonConstantDeclValue { - span: call_path.span(), - }) + let span = call_path.span(); + let span = if span == Span::dummy() { + const_expr.span.clone() + } else { + span + }; + Err(CompileError::NonConstantDeclValue { span }) } _otherwise => Err(CompileError::NonConstantDeclValue { span: const_expr.span.clone(), diff --git a/sway-core/src/language/ty/program.rs b/sway-core/src/language/ty/program.rs index d15bda1deea..1952a6e6318 100644 --- a/sway-core/src/language/ty/program.rs +++ b/sway-core/src/language/ty/program.rs @@ -44,6 +44,18 @@ fn get_type_not_allowed_error( }) } +fn check_no_ref_main(engines: &Engines, handler: &Handler, main_function: &DeclId) { + let main_function = engines.de().get_function(main_function); + for param in &main_function.parameters { + if param.is_reference && param.is_mutable { + handler.emit_err(CompileError::RefMutableNotAllowedInMain { + param_name: param.name.clone(), + span: param.name.span(), + }); + } + } +} + impl TyProgram { /// Validate the root module given the expected program kind. pub fn validate_root( @@ -237,7 +249,11 @@ impl TyProgram { TyProgramKind::Contract { entry_function: if experimental.new_encoding { - assert!(entries.len() == 1); + if entries.len() != 1 { + return Err(handler.emit_err(CompileError::CouldNotGenerateEntry { + span: Span::dummy(), + })); + } Some(entries[0]) } else { None @@ -276,8 +292,15 @@ impl TyProgram { return Err(last_error.unwrap()); } + // check if no ref mut arguments passed to a `main()` in a `script` or `predicate`. + check_no_ref_main(engines, handler, &mains[0]); + let (entry_fn_id, main_fn_id) = if experimental.new_encoding { - assert!(entries.len() == 1); + if entries.len() != 1 { + return Err(handler.emit_err(CompileError::CouldNotGenerateEntry { + span: Span::dummy(), + })); + } (entries[0], mains[0]) } else { assert!(entries.is_empty()); @@ -318,8 +341,15 @@ impl TyProgram { return Err(last_error.unwrap()); } + // check if no ref mut arguments passed to a `main()` in a `script` or `predicate`. + check_no_ref_main(engines, handler, &mains[0]); + let (entry_fn_id, main_fn_id) = if experimental.new_encoding { - assert!(entries.len() == 1); + if entries.len() != 1 { + return Err(handler.emit_err(CompileError::CouldNotGenerateEntry { + span: Span::dummy(), + })); + } (entries[0], mains[0]) } else { assert!(entries.is_empty()); @@ -380,23 +410,6 @@ impl TyProgram { } }; - // check if no ref mut arguments passed to a `main()` in a `script` or `predicate`. - match &typed_program_kind { - TyProgramKind::Script { main_function, .. } - | TyProgramKind::Predicate { main_function, .. } => { - let main_function = decl_engine.get_function(main_function); - for param in &main_function.parameters { - if param.is_reference && param.is_mutable { - handler.emit_err(CompileError::RefMutableNotAllowedInMain { - param_name: param.name.clone(), - span: param.name.span(), - }); - } - } - } - _ => (), - } - //configurables and constant cannot be str slice for c in configurables.iter() { if let Some(error) = get_type_not_allowed_error( @@ -426,6 +439,8 @@ impl TyProgram { } } + assert!(!handler.has_errors()); + Ok((typed_program_kind, declarations, configurables)) } diff --git a/sway-core/src/semantic_analysis/ast_node/declaration/auto_impl.rs b/sway-core/src/semantic_analysis/ast_node/declaration/auto_impl.rs index 04682893864..b0e62790066 100644 --- a/sway-core/src/semantic_analysis/ast_node/declaration/auto_impl.rs +++ b/sway-core/src/semantic_analysis/ast_node/declaration/auto_impl.rs @@ -9,7 +9,6 @@ use crate::{ semantic_analysis::TypeCheckContext, Engines, TypeId, TypeInfo, TypeParameter, }; -use itertools::Itertools; use sway_error::{ error::CompileError, handler::{ErrorEmitted, Handler}, @@ -555,7 +554,7 @@ where TypeInfo::RawUntypedPtr => "raw_ptr".into(), TypeInfo::RawUntypedSlice => "raw_slice".into(), TypeInfo::Alias { name, .. } => name.to_string(), - x => return None, + _ => return None, }; Some(name) @@ -676,12 +675,9 @@ where match entry_fn { Ok(entry_fn) => Ok(entry_fn), - Err(gen_handler) => { - handler.append(gen_handler); - Err(handler.emit_err(CompileError::CouldNotGenerateEntry { - span: Span::dummy(), - })) - } + Err(gen_handler) => Err(gen_handler.emit_err(CompileError::CouldNotGenerateEntry { + span: Span::dummy(), + })), } } @@ -732,12 +728,9 @@ where match entry_fn { Ok(entry_fn) => Ok(entry_fn), - Err(gen_handler) => { - handler.append(gen_handler); - Err(handler.emit_err(CompileError::CouldNotGenerateEntry { - span: Span::dummy(), - })) - } + Err(gen_handler) => Err(gen_handler.emit_err(CompileError::CouldNotGenerateEntry { + span: Span::dummy(), + })), } } @@ -805,12 +798,9 @@ where match entry_fn { Ok(entry_fn) => Ok(entry_fn), - Err(gen_handler) => { - handler.append(gen_handler); - Err(handler.emit_err(CompileError::CouldNotGenerateEntry { - span: Span::dummy(), - })) - } + Err(gen_handler) => Err(gen_handler.emit_err(CompileError::CouldNotGenerateEntry { + span: Span::dummy(), + })), } } } diff --git a/sway-core/src/semantic_analysis/cei_pattern_analysis.rs b/sway-core/src/semantic_analysis/cei_pattern_analysis.rs index 52d1b7f0f0d..6923836c185 100644 --- a/sway-core/src/semantic_analysis/cei_pattern_analysis.rs +++ b/sway-core/src/semantic_analysis/cei_pattern_analysis.rs @@ -84,6 +84,10 @@ fn analyze_contract(engines: &Engines, ast_nodes: &[ty::TyAstNode]) -> Vec = vec![]; for fn_decl in contract_entry_points(decl_engine, ast_nodes) { + // no need to analyze the entry fn + if fn_decl.name.as_str() == "__entry" { + continue; + } analyze_code_block(engines, &fn_decl.body, &fn_decl.name, &mut warnings); } warnings @@ -608,10 +612,12 @@ fn effects_of_intrinsic(intr: &sway_ast::Intrinsic) -> HashSet { StateClear | StateStoreWord | StateStoreQuad => HashSet::from([Effect::StorageWrite]), StateLoadWord | StateLoadQuad => HashSet::from([Effect::StorageRead]), Smo => HashSet::from([Effect::OutputMessage]), + ContractCall => HashSet::from([Effect::Interaction]), Revert | JmpMem | IsReferenceType | IsStrArray | SizeOfType | SizeOfVal | SizeOfStr - | ContractCall | ContractRet | AssertIsStrArray | ToStrArray | Eq | Gt | Lt | Gtf - | AddrOf | Log | Add | Sub | Mul | Div | And | Or | Xor | Mod | Rsh | Lsh | PtrAdd - | PtrSub | Not => HashSet::new(), + | ContractRet | AssertIsStrArray | ToStrArray | Eq | Gt | Lt | Gtf | AddrOf | Log | Add + | Sub | Mul | Div | And | Or | Xor | Mod | Rsh | Lsh | PtrAdd | PtrSub | Not => { + HashSet::new() + } } } diff --git a/sway-core/src/semantic_analysis/module.rs b/sway-core/src/semantic_analysis/module.rs index d9523b524b9..48f10684b5e 100644 --- a/sway-core/src/semantic_analysis/module.rs +++ b/sway-core/src/semantic_analysis/module.rs @@ -329,22 +329,24 @@ impl ty::TyModule { (TreeType::Predicate, true) => { let mut fn_generator = auto_impl::EncodingAutoImplContext::new(&mut ctx).unwrap(); - let node = fn_generator.generate_predicate_entry( + if let Ok(node) = fn_generator.generate_predicate_entry( engines, main_decl.as_ref().unwrap(), handler, - )?; - all_nodes.push(node) + ) { + all_nodes.push(node) + } } (TreeType::Script, true) => { let mut fn_generator = auto_impl::EncodingAutoImplContext::new(&mut ctx).unwrap(); - let node = fn_generator.generate_script_entry( + if let Ok(node) = fn_generator.generate_script_entry( engines, main_decl.as_ref().unwrap(), handler, - )?; - all_nodes.push(node) + ) { + all_nodes.push(node) + } } (TreeType::Contract, _) => { // collect all contract methods @@ -357,14 +359,15 @@ impl ty::TyModule { let mut fn_generator = auto_impl::EncodingAutoImplContext::new(&mut ctx).unwrap(); - let node = fn_generator.generate_contract_entry( + if let Ok(node) = fn_generator.generate_contract_entry( engines, parsed.span.source_id().map(|x| x.module_id()), &contract_fns, fallback_fn, handler, - )?; - all_nodes.push(node) + ) { + all_nodes.push(node) + } } _ => {} } diff --git a/sway-error/src/error.rs b/sway-error/src/error.rs index 0cf59947c4e..7459ad2b70e 100644 --- a/sway-error/src/error.rs +++ b/sway-error/src/error.rs @@ -887,7 +887,7 @@ pub enum CompileError { FallbackFnsAreContractOnly { span: Span }, #[error("Fallback functions cannot have parameters")] FallbackFnsCannotHaveParameters { span: Span }, - #[error("Could not generate the entry method because one of the arguments does not implement AbiEncode/AbiDecode")] + #[error("Could not generate the entry method. See errors above for more details.")] CouldNotGenerateEntry { span: Span }, } diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/chained_if_let_missing_branch/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_fail/chained_if_let_missing_branch/src/main.sw index 71bcf7aff4f..80cb1603143 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/chained_if_let_missing_branch/src/main.sw +++ b/test/src/e2e_vm_tests/test_programs/should_fail/chained_if_let_missing_branch/src/main.sw @@ -1,10 +1,5 @@ script; -enum Result { - Ok: T, - Err: E, -} - // should return 5 fn main() -> u64 { let result_a = Result::Ok::(5u64); diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/configurables_are_not_const/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_fail/configurables_are_not_const/Forc.lock index 0962ff8ee89..a2a5e648d5a 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/configurables_are_not_const/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_fail/configurables_are_not_const/Forc.lock @@ -1,3 +1,8 @@ [[package]] -name = 'configurables_are_not_const' -source = 'member' +name = "configurables_are_not_const" +source = "member" +dependencies = ["core"] + +[[package]] +name = "core" +source = "path+from-root-96EE05F4B3FB2E76" diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/configurables_are_not_const/Forc.toml b/test/src/e2e_vm_tests/test_programs/should_fail/configurables_are_not_const/Forc.toml index aca14507558..93e229ae323 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/configurables_are_not_const/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/should_fail/configurables_are_not_const/Forc.toml @@ -4,3 +4,6 @@ entry = "main.sw" implicit-std = false license = "Apache-2.0" name = "configurables_are_not_const" + +[dependencies] +core = { path = "../../../../../../sway-lib-core" } diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/const-instead-of-let/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_fail/const-instead-of-let/Forc.lock index d9b2415bd54..74d829edea7 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/const-instead-of-let/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_fail/const-instead-of-let/Forc.lock @@ -1,7 +1,10 @@ [[package]] name = "const-instead-of-let" source = "member" -dependencies = ["std"] +dependencies = [ + "core", + "std", +] [[package]] name = "core" diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/const-instead-of-let/Forc.toml b/test/src/e2e_vm_tests/test_programs/should_fail/const-instead-of-let/Forc.toml index 49d081c3dbe..da772329ce5 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/const-instead-of-let/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/should_fail/const-instead-of-let/Forc.toml @@ -5,4 +5,5 @@ license = "Apache-2.0" name = "const-instead-of-let" [dependencies] +core = { path = "../../../../../../sway-lib-core" } std = { path = "../../../reduced_std_libs/sway-lib-std-assert" } diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/const-instead-of-let/test.toml b/test/src/e2e_vm_tests/test_programs/should_fail/const-instead-of-let/test.toml index ff039fdfc16..f6e31892d43 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/const-instead-of-let/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_fail/const-instead-of-let/test.toml @@ -1,7 +1,7 @@ category = "fail" # check: $()error -# check: const-instead-of-let/src/main.sw:13:38 +# check: const-instead-of-let/src/main.sw:13 # check: $()const INVALID_CONST = contract_1.foo(); # nextln: $()Could not evaluate initializer to a const declaration. diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/contract_dependencies_conflicting_salt/contract_a/Forc.toml b/test/src/e2e_vm_tests/test_programs/should_fail/contract_dependencies_conflicting_salt/contract_a/Forc.toml index efc809bbf0e..8631fc1acab 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/contract_dependencies_conflicting_salt/contract_a/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/should_fail/contract_dependencies_conflicting_salt/contract_a/Forc.toml @@ -6,6 +6,7 @@ license = "Apache-2.0" name = "contract_a" [dependencies] +core = { path = "../../../../../../../sway-lib-core" } std = { path = "../../../../reduced_std_libs/sway-lib-std-assert/" } [contract-dependencies] diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/contract_dependencies_conflicting_salt/contract_b/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_fail/contract_dependencies_conflicting_salt/contract_b/Forc.lock index f4e9b9dac96..708b5a380e9 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/contract_dependencies_conflicting_salt/contract_b/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_fail/contract_dependencies_conflicting_salt/contract_b/Forc.lock @@ -1,8 +1,14 @@ [[package]] -name = 'contract_b' -source = 'member' -contract-dependencies = ['contract_c (1111111111111111111111111111111111111111111111111111111111111111)'] +name = "contract_b" +source = "member" +dependencies = ["core"] +contract-dependencies = ["contract_c (1111111111111111111111111111111111111111111111111111111111111111)"] [[package]] -name = 'contract_c' -source = 'path+from-root-A309856C1410AE80' +name = "contract_c" +source = "path+from-root-A309856C1410AE80" +dependencies = ["core"] + +[[package]] +name = "core" +source = "path+from-root-A309856C1410AE80" diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/contract_dependencies_conflicting_salt/contract_b/Forc.toml b/test/src/e2e_vm_tests/test_programs/should_fail/contract_dependencies_conflicting_salt/contract_b/Forc.toml index 9b95559eda3..4fec3700ef8 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/contract_dependencies_conflicting_salt/contract_b/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/should_fail/contract_dependencies_conflicting_salt/contract_b/Forc.toml @@ -5,6 +5,8 @@ license = "Apache-2.0" name = "contract_b" implicit-std = false +[dependencies] +core = { path = "../../../../../../../sway-lib-core" } + [contract-dependencies] contract_c = { path = "../contract_c", salt = "0x1111111111111111111111111111111111111111111111111111111111111111" } - diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/contract_dependencies_conflicting_salt/contract_c/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_fail/contract_dependencies_conflicting_salt/contract_c/Forc.lock index e16552317e5..eff97b7e216 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/contract_dependencies_conflicting_salt/contract_c/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_fail/contract_dependencies_conflicting_salt/contract_c/Forc.lock @@ -1,3 +1,8 @@ [[package]] -name = 'contract_c' -source = 'member' +name = "contract_c" +source = "member" +dependencies = ["core"] + +[[package]] +name = "core" +source = "path+from-root-3C8F523D3E6B5411" diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/contract_dependencies_conflicting_salt/contract_c/Forc.toml b/test/src/e2e_vm_tests/test_programs/should_fail/contract_dependencies_conflicting_salt/contract_c/Forc.toml index 9d874484668..8eee489ee0c 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/contract_dependencies_conflicting_salt/contract_c/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/should_fail/contract_dependencies_conflicting_salt/contract_c/Forc.toml @@ -5,3 +5,5 @@ license = "Apache-2.0" name = "contract_c" implicit-std = false +[dependencies] +core = { path = "../../../../../../../sway-lib-core" } diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/disallowed_gm/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_fail/disallowed_gm/Forc.lock index e152359c950..9d5066d90ae 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/disallowed_gm/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_fail/disallowed_gm/Forc.lock @@ -1,3 +1,8 @@ +[[package]] +name = "core" +source = "path+from-root-3C5B50C68E15AEA9" + [[package]] name = "disallowed_gm" source = "member" +dependencies = ["core"] diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/disallowed_gm/Forc.toml b/test/src/e2e_vm_tests/test_programs/should_fail/disallowed_gm/Forc.toml index 3a7d3baed4d..0b88be6961a 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/disallowed_gm/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/should_fail/disallowed_gm/Forc.toml @@ -4,3 +4,6 @@ license = "Apache-2.0" name = "disallowed_gm" entry = "main.sw" implicit-std = false + +[dependencies] +core = { path = "../../../../../../sway-lib-core" } diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/illegal_break/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_fail/illegal_break/Forc.lock index 23f59e7b0c6..c20397f5108 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/illegal_break/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_fail/illegal_break/Forc.lock @@ -1,3 +1,8 @@ [[package]] -name = 'illegal_break' -source = 'member' +name = "core" +source = "path+from-root-44425D2022F2E5F2" + +[[package]] +name = "illegal_break" +source = "member" +dependencies = ["core"] diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/illegal_break/Forc.toml b/test/src/e2e_vm_tests/test_programs/should_fail/illegal_break/Forc.toml index ce6fe5aab6e..d09b7f864fb 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/illegal_break/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/should_fail/illegal_break/Forc.toml @@ -6,3 +6,4 @@ license = "Apache-2.0" name = "illegal_break" [dependencies] +core = { path = "../../../../../../sway-lib-core" } diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/impl_self_recursive/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_fail/impl_self_recursive/Forc.lock index c60aee96b19..8087e726d0b 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/impl_self_recursive/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_fail/impl_self_recursive/Forc.lock @@ -1,3 +1,8 @@ [[package]] -name = 'impl_self_recursive' -source = 'member' +name = "core" +source = "path+from-root-7BB1412CA5179B4D" + +[[package]] +name = "impl_self_recursive" +source = "member" +dependencies = ["core"] diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/impl_self_recursive/Forc.toml b/test/src/e2e_vm_tests/test_programs/should_fail/impl_self_recursive/Forc.toml index 5024adec979..52451cbb140 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/impl_self_recursive/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/should_fail/impl_self_recursive/Forc.toml @@ -5,4 +5,5 @@ license = "Apache-2.0" name = "impl_self_recursive" implicit-std = false -[dependencies] \ No newline at end of file +[dependencies] +core = { path = "../../../../../../sway-lib-core" } diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/insufficient_type_info/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_fail/insufficient_type_info/Forc.lock index cb9b637ab88..55f80eab987 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/insufficient_type_info/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_fail/insufficient_type_info/Forc.lock @@ -1,3 +1,8 @@ +[[package]] +name = "core" +source = "path+from-root-687D7B6A23A7C9DF" + [[package]] name = "insufficient_type_info" source = "member" +dependencies = ["core"] diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/insufficient_type_info/Forc.toml b/test/src/e2e_vm_tests/test_programs/should_fail/insufficient_type_info/Forc.toml index 8364767f06f..f6d09ddfe30 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/insufficient_type_info/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/should_fail/insufficient_type_info/Forc.toml @@ -3,4 +3,7 @@ authors = ["Fuel Labs "] entry = "main.sw" license = "Apache-2.0" name = "insufficient_type_info" -implicit-std = false \ No newline at end of file +implicit-std = false + +[dependencies] +core = { path = "../../../../../../sway-lib-core" } diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/multiple_impl_fns/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_fail/multiple_impl_fns/Forc.lock index 5a5aef2299d..b03d8c8d9f6 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/multiple_impl_fns/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_fail/multiple_impl_fns/Forc.lock @@ -1,3 +1,8 @@ [[package]] -name = 'multiple_impl_fns' -source = 'member' +name = "core" +source = "path+from-root-99C864323F6D5FE1" + +[[package]] +name = "multiple_impl_fns" +source = "member" +dependencies = ["core"] diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/multiple_impl_fns/Forc.toml b/test/src/e2e_vm_tests/test_programs/should_fail/multiple_impl_fns/Forc.toml index d8fbecc2a12..561dd9cd254 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/multiple_impl_fns/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/should_fail/multiple_impl_fns/Forc.toml @@ -6,3 +6,4 @@ license = "Apache-2.0" name = "multiple_impl_fns" [dependencies] +core = { path = "../../../../../../sway-lib-core" } diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/return_in_strange_positions/test.toml b/test/src/e2e_vm_tests/test_programs/should_fail/return_in_strange_positions/test.toml index d54217a61f6..fae9be4fb51 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/return_in_strange_positions/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_fail/return_in_strange_positions/test.toml @@ -1,4 +1,4 @@ -category = "fail" +category = "disabled" # check: $()warning # check: return_in_strange_positions/src/main.sw:7:12 @@ -326,4 +326,4 @@ category = "fail" # nextln: $()found: (). # nextln: $()help: Return statement must return the declared function return type. -# check: $()Aborting due to 39 errors. \ No newline at end of file +# check: $()Aborting due to 39 errors. diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/simple_generics/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_fail/simple_generics/Forc.lock index d0b99681657..92a98ba4416 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/simple_generics/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_fail/simple_generics/Forc.lock @@ -1,3 +1,8 @@ [[package]] -name = 'simple_generics' -source = 'member' +name = "core" +source = "path+from-root-3607B3CB15B5EBEF" + +[[package]] +name = "simple_generics" +source = "member" +dependencies = ["core"] diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/simple_generics/Forc.toml b/test/src/e2e_vm_tests/test_programs/should_fail/simple_generics/Forc.toml index f28065b75be..0028c9198a4 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/simple_generics/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/should_fail/simple_generics/Forc.toml @@ -4,3 +4,6 @@ entry = "main.sw" license = "Apache-2.0" name = "simple_generics" implicit-std = false + +[dependencies] +core = { path = "../../../../../../sway-lib-core" } diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/storage_in_script/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_fail/storage_in_script/Forc.lock index b8c56781753..85ee74436d1 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/storage_in_script/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_fail/storage_in_script/Forc.lock @@ -1,3 +1,8 @@ [[package]] -name = 'storage_in_script' -source = 'member' +name = "core" +source = "path+from-root-BCD049287ABD70F1" + +[[package]] +name = "storage_in_script" +source = "member" +dependencies = ["core"] diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/storage_in_script/Forc.toml b/test/src/e2e_vm_tests/test_programs/should_fail/storage_in_script/Forc.toml index 67baf958eca..b0b7f95b89a 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/storage_in_script/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/should_fail/storage_in_script/Forc.toml @@ -6,3 +6,4 @@ license = "Apache-2.0" name = "storage_in_script" [dependencies] +core = { path = "../../../../../../sway-lib-core" } diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/array_generics/Forc.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/array_generics/Forc.toml index 9df331e7025..c4aff4e81da 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/array_generics/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/array_generics/Forc.toml @@ -4,3 +4,6 @@ license = "Apache-2.0" name = "array_generics" entry = "main.sw" implicit-std = false + +[dependencies] +core = { path = "../../../../../../sway-lib-core" } diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_abi/Forc.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_abi/Forc.toml index 73d409e4feb..2c1baea6fb0 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_abi/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_abi/Forc.toml @@ -4,3 +4,6 @@ entry = "main.sw" license = "Apache-2.0" name = "associated_const_abi" implicit-std = false + +[dependencies] +core = { path = "../../../../../../sway-lib-core" } diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_abi_default/Forc.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_abi_default/Forc.toml index 61ad4b611c4..e4ec4183f83 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_abi_default/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_abi_default/Forc.toml @@ -4,3 +4,6 @@ entry = "main.sw" license = "Apache-2.0" name = "associated_const_abi_default" implicit-std = false + +[dependencies] +core = { path = "../../../../../../sway-lib-core" } diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_impl_multiple/Forc.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_impl_multiple/Forc.toml index 1536ee12cf4..f93254c461f 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_impl_multiple/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_impl_multiple/Forc.toml @@ -4,3 +4,6 @@ entry = "main.sw" license = "Apache-2.0" name = "associated_const_impl_multiple" implicit-std = false + +[dependencies] +core = { path = "../../../../../../sway-lib-core" } diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_trait_method/Forc.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_trait_method/Forc.toml index d4b95422123..b04d4b00584 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_trait_method/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/associated_const_trait_method/Forc.toml @@ -4,3 +4,6 @@ entry = "main.sw" license = "Apache-2.0" name = "associated_const_trait_method" implicit-std = false + +[dependencies] +core = { path = "../../../../../../sway-lib-core" } diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/eq_and_neq/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/eq_and_neq/test.toml index ab0b427ff47..53fb5ce9a94 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/eq_and_neq/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/eq_and_neq/test.toml @@ -1,4 +1,4 @@ category = "run" expected_result = { action = "return", value = 1 } -expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } +expected_result_new_encoding = { action = "return_data", value = "01" } validate_abi = true diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_functions/Forc.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_functions/Forc.toml index cc70b3e3af2..64e3ab584a3 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_functions/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_functions/Forc.toml @@ -4,3 +4,6 @@ license = "Apache-2.0" name = "generic_functions" entry = "main.sw" implicit-std = false + +[dependencies] +core = { path = "../../../../../../sway-lib-core" } diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_structs/Forc.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_structs/Forc.toml index 1d98e82638f..a554f3eae06 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_structs/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_structs/Forc.toml @@ -4,3 +4,6 @@ license = "Apache-2.0" name = "generic_structs" entry = "main.sw" implicit-std = false + +[dependencies] +core = { path = "../../../../../../sway-lib-core" } diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_transpose/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_transpose/test.toml index ab0b427ff47..53fb5ce9a94 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_transpose/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_transpose/test.toml @@ -1,4 +1,4 @@ category = "run" expected_result = { action = "return", value = 1 } -expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } +expected_result_new_encoding = { action = "return_data", value = "01" } validate_abi = true diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/mut_ref_empty_type/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/mut_ref_empty_type/test.toml index 8533fc0c573..9d053cfcb6f 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/mut_ref_empty_type/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/mut_ref_empty_type/test.toml @@ -1,5 +1,5 @@ category = "run" expected_result = { action = "return", value = 42 } -expected_result_new_encoding = { action = "return_data", value = "0000000000000002A" } +expected_result_new_encoding = { action = "return_data", value = "000000000000002A" } validate_abi = true expected_warnings = 2 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/mutable_and_initd/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/mutable_and_initd/test.toml index 404d0505dd5..efcbd67f43d 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/mutable_and_initd/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/mutable_and_initd/test.toml @@ -1,5 +1,5 @@ category = "run" expected_result = { action = "return", value = 1 } -expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } +expected_result_new_encoding = { action = "return_data", value = "01" } validate_abi = false #expected_warnings = 5 diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/mutable_arrays_multiple_nested/Forc.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/mutable_arrays_multiple_nested/Forc.toml index 88a25c1bdd3..12b700c6c78 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/mutable_arrays_multiple_nested/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/mutable_arrays_multiple_nested/Forc.toml @@ -4,3 +4,6 @@ license = "Apache-2.0" name = "mutable_arrays_multiple_nested" entry = "main.sw" implicit-std = false + +[dependencies] +core = { path = "../../../../../../sway-lib-core" } diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_fn_args_struct_assign/Forc.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_fn_args_struct_assign/Forc.toml index 090c54f013d..9e326c07ab1 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_fn_args_struct_assign/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_fn_args_struct_assign/Forc.toml @@ -4,3 +4,6 @@ license = "Apache-2.0" name = "ref_mutable_fn_args_struct_assign" entry = "main.sw" implicit-std = false + +[dependencies] +core = { path = "../../../../../../sway-lib-core" } diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_fn_args_u32/Forc.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_fn_args_u32/Forc.toml index 72b2448575e..84519cf3897 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_fn_args_u32/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/ref_mutable_fn_args_u32/Forc.toml @@ -4,3 +4,6 @@ license = "Apache-2.0" name = "ref_mutable_fn_args_u32" entry = "main.sw" implicit-std = false + +[dependencies] +core = { path = "../../../../../../sway-lib-core" } diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/references/dereferencing_operator_star/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/references/dereferencing_operator_star/test.toml index b1a6137675f..ad0971b22ec 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/references/dereferencing_operator_star/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/references/dereferencing_operator_star/test.toml @@ -1,7 +1,6 @@ category = "run" expected_result = { action = "return", value = 42 } +expected_result_new_encoding = { action = "return_data", value = "000000000000002A" } + validate_abi = false expected_warnings = 9 - -expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } - diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/ret_string_in_struct/Forc.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/ret_string_in_struct/Forc.toml index ce18e9925fd..858fd5ad28c 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/ret_string_in_struct/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/ret_string_in_struct/Forc.toml @@ -4,3 +4,6 @@ entry = "main.sw" implicit-std = false license = "Apache-2.0" name = "ret_string_in_struct" + +[dependencies] +core = { path = "../../../../../../sway-lib-core" } diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/retd_struct/Forc.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/retd_struct/Forc.toml index d5e58dbc825..fb886037dfe 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/retd_struct/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/retd_struct/Forc.toml @@ -4,3 +4,6 @@ license = "Apache-2.0" name = "retd_struct" entry = "main.sw" implicit-std = false + +[dependencies] +core = { path = "../../../../../../sway-lib-core" } diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/struct_init_reorder/Forc.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/struct_init_reorder/Forc.toml index b2d7ea17948..222d5550f61 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/struct_init_reorder/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/struct_init_reorder/Forc.toml @@ -4,3 +4,6 @@ entry = "main.sw" license = "Apache-2.0" name = "struct_init_reorder" implicit-std = false + +[dependencies] +core = { path = "../../../../../../sway-lib-core" } diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/unary_not_basic_2/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/unary_not_basic_2/test.toml index 865faf5726f..53fb5ce9a94 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/unary_not_basic_2/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/unary_not_basic_2/test.toml @@ -1,6 +1,4 @@ category = "run" expected_result = { action = "return", value = 1 } +expected_result_new_encoding = { action = "return_data", value = "01" } validate_abi = true - -expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } - diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_functions/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_functions/test.toml index ad40e6b0f63..7875c2c9eb6 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_functions/test.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_functions/test.toml @@ -1,7 +1,5 @@ category = "run" expected_result = { action = "return", value = 42 } +expected_result_new_encoding = { action = "return_data", value = "000000000000002A" } validate_abi = true expected_warnings = 9 - -expected_result_new_encoding = { action = "return_data", value = "0000000000000001" } - diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/static_analysis/cei_pattern_violation_in_asm_block/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_pass/static_analysis/cei_pattern_violation_in_asm_block/Forc.lock index 1f1358dd63a..95b5bb42283 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/static_analysis/cei_pattern_violation_in_asm_block/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_pass/static_analysis/cei_pattern_violation_in_asm_block/Forc.lock @@ -1,3 +1,8 @@ [[package]] -name = 'cei_pattern_violation_in_asm_block' -source = 'member' +name = "cei_pattern_violation_in_asm_block" +source = "member" +dependencies = ["core"] + +[[package]] +name = "core" +source = "path+from-root-47C86A4D273AB650" diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/static_analysis/cei_pattern_violation_in_asm_block/Forc.toml b/test/src/e2e_vm_tests/test_programs/should_pass/static_analysis/cei_pattern_violation_in_asm_block/Forc.toml index c2dac6f008d..b190734e618 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/static_analysis/cei_pattern_violation_in_asm_block/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/static_analysis/cei_pattern_violation_in_asm_block/Forc.toml @@ -4,3 +4,6 @@ authors = ["Fuel Labs "] entry = "main.sw" license = "Apache-2.0" implicit-std = false + +[dependencies] +core = { path = "../../../../../../../sway-lib-core" } diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/static_analysis/cei_pattern_violation_in_asm_block_bal/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_pass/static_analysis/cei_pattern_violation_in_asm_block_bal/Forc.lock index 68bdd2f2707..40484740da7 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/static_analysis/cei_pattern_violation_in_asm_block_bal/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_pass/static_analysis/cei_pattern_violation_in_asm_block_bal/Forc.lock @@ -1,3 +1,8 @@ [[package]] -name = 'cei_pattern_violation_in_asm_block_bal' -source = 'member' +name = "cei_pattern_violation_in_asm_block_bal" +source = "member" +dependencies = ["core"] + +[[package]] +name = "core" +source = "path+from-root-B62D34EC41424E02" diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/static_analysis/cei_pattern_violation_in_asm_block_bal/Forc.toml b/test/src/e2e_vm_tests/test_programs/should_pass/static_analysis/cei_pattern_violation_in_asm_block_bal/Forc.toml index a71de0c98d5..ee5cc582375 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/static_analysis/cei_pattern_violation_in_asm_block_bal/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/static_analysis/cei_pattern_violation_in_asm_block_bal/Forc.toml @@ -4,3 +4,6 @@ authors = ["Fuel Labs "] entry = "main.sw" license = "Apache-2.0" implicit-std = false + +[dependencies] +core = { path = "../../../../../../../sway-lib-core" } diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/static_analysis/cei_pattern_violation_in_asm_block_read/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_pass/static_analysis/cei_pattern_violation_in_asm_block_read/Forc.lock index 6c75d48cac1..06e1414fe17 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/static_analysis/cei_pattern_violation_in_asm_block_read/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_pass/static_analysis/cei_pattern_violation_in_asm_block_read/Forc.lock @@ -1,3 +1,8 @@ [[package]] -name = 'cei_pattern_violation_in_asm_block_read' -source = 'member' +name = "cei_pattern_violation_in_asm_block_read" +source = "member" +dependencies = ["core"] + +[[package]] +name = "core" +source = "path+from-root-32137B93369C5D83" diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/static_analysis/cei_pattern_violation_in_asm_block_read/Forc.toml b/test/src/e2e_vm_tests/test_programs/should_pass/static_analysis/cei_pattern_violation_in_asm_block_read/Forc.toml index 5ee48b22436..28de505a9f9 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/static_analysis/cei_pattern_violation_in_asm_block_read/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/static_analysis/cei_pattern_violation_in_asm_block_read/Forc.toml @@ -4,3 +4,6 @@ authors = ["Fuel Labs "] entry = "main.sw" license = "Apache-2.0" implicit-std = false + +[dependencies] +core = { path = "../../../../../../../sway-lib-core" } diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/static_analysis/cei_pattern_violation_in_asm_block_smo/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_pass/static_analysis/cei_pattern_violation_in_asm_block_smo/Forc.lock index e753c850beb..c383cba7860 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/static_analysis/cei_pattern_violation_in_asm_block_smo/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_pass/static_analysis/cei_pattern_violation_in_asm_block_smo/Forc.lock @@ -1,3 +1,8 @@ [[package]] -name = 'cei_pattern_violation_in_asm_block_smo' -source = 'member' +name = "cei_pattern_violation_in_asm_block_smo" +source = "member" +dependencies = ["core"] + +[[package]] +name = "core" +source = "path+from-root-633FC5F6A194FE18" diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/static_analysis/cei_pattern_violation_in_asm_block_smo/Forc.toml b/test/src/e2e_vm_tests/test_programs/should_pass/static_analysis/cei_pattern_violation_in_asm_block_smo/Forc.toml index 6266eae98d1..ef48869ce52 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/static_analysis/cei_pattern_violation_in_asm_block_smo/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/static_analysis/cei_pattern_violation_in_asm_block_smo/Forc.toml @@ -4,3 +4,6 @@ authors = ["Fuel Labs "] entry = "main.sw" license = "Apache-2.0" implicit-std = false + +[dependencies] +core = { path = "../../../../../../../sway-lib-core" } diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/static_analysis/cei_pattern_violation_more_complex_logic/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_pass/static_analysis/cei_pattern_violation_more_complex_logic/Forc.lock index 4706d0627bc..5015d6dfbe0 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/static_analysis/cei_pattern_violation_more_complex_logic/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_pass/static_analysis/cei_pattern_violation_more_complex_logic/Forc.lock @@ -1,13 +1,16 @@ [[package]] -name = 'cei_pattern_violation_more_complex_logic' -source = 'member' -dependencies = ['std'] +name = "cei_pattern_violation_more_complex_logic" +source = "member" +dependencies = [ + "core", + "std", +] [[package]] -name = 'core' -source = 'path+from-root-C4D8ECCE530DF143' +name = "core" +source = "path+from-root-C4D8ECCE530DF143" [[package]] -name = 'std' -source = 'path+from-root-C4D8ECCE530DF143' -dependencies = ['core'] +name = "std" +source = "path+from-root-C4D8ECCE530DF143" +dependencies = ["core"] diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/static_analysis/cei_pattern_violation_more_complex_logic/Forc.toml b/test/src/e2e_vm_tests/test_programs/should_pass/static_analysis/cei_pattern_violation_more_complex_logic/Forc.toml index 458b2928a44..850ae157aa2 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/static_analysis/cei_pattern_violation_more_complex_logic/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/should_pass/static_analysis/cei_pattern_violation_more_complex_logic/Forc.toml @@ -5,4 +5,5 @@ entry = "main.sw" license = "Apache-2.0" [dependencies] +core = { path = "../../../../../../../sway-lib-core" } std = { path = "../../../../../../../sway-lib-std" } From 41e5b66890fff824678a77175bfc656252bfdcef Mon Sep 17 00:00:00 2001 From: xunilrj Date: Wed, 24 Apr 2024 21:45:18 +0100 Subject: [PATCH 11/11] multiple fixes for the new encoding --- .../json_abi_oracle_new_encoding.json | 26 +++++++++++++++++++ .../json_abi_oracle_new_encoding.json | 26 +++++++++++++++++++ .../json_abi_oracle_new_encoding.json | 26 +++++++++++++++++++ .../json_abi_oracle_new_encoding.json | 26 +++++++++++++++++++ .../json_abi_oracle_new_encoding.json | 26 +++++++++++++++++++ .../json_abi_oracle_new_encoding.json | 26 +++++++++++++++++++ .../json_abi_oracle_new_encoding.json | 26 +++++++++++++++++++ .../json_abi_oracle_new_encoding.json | 26 +++++++++++++++++++ .../json_abi_oracle_new_encoding.json | 26 +++++++++++++++++++ .../json_abi_oracle_new_encoding.json | 26 +++++++++++++++++++ .../json_abi_oracle_new_encoding.json | 26 +++++++++++++++++++ .../json_abi_oracle_new_encoding.json | 26 +++++++++++++++++++ .../json_abi_oracle_new_encoding.json | 26 +++++++++++++++++++ .../json_abi_oracle_new_encoding.json | 26 +++++++++++++++++++ .../json_abi_oracle_new_encoding.json | 26 +++++++++++++++++++ .../json_abi_oracle_new_encoding.json | 26 +++++++++++++++++++ .../json_abi_oracle_new_encoding.json | 26 +++++++++++++++++++ .../json_abi_oracle_new_encoding.json | 26 +++++++++++++++++++ .../json_abi_oracle_new_encoding.json | 26 +++++++++++++++++++ .../json_abi_oracle_new_encoding.json | 26 +++++++++++++++++++ .../json_abi_oracle_new_encoding.json | 26 +++++++++++++++++++ .../json_abi_oracle_new_encoding.json | 26 +++++++++++++++++++ .../json_abi_oracle_new_encoding.json | 26 +++++++++++++++++++ .../json_abi_oracle_new_encoding.json | 26 +++++++++++++++++++ .../json_abi_oracle_new_encoding.json | 26 +++++++++++++++++++ .../json_abi_oracle_new_encoding.json | 26 +++++++++++++++++++ .../json_abi_oracle_new_encoding.json | 26 +++++++++++++++++++ .../json_abi_oracle_new_encoding.json | 26 +++++++++++++++++++ .../json_abi_oracle_new_encoding.json | 26 +++++++++++++++++++ .../json_abi_oracle_new_encoding.json | 26 +++++++++++++++++++ .../json_abi_oracle_new_encoding.json | 26 +++++++++++++++++++ .../json_abi_oracle_new_encoding.json | 26 +++++++++++++++++++ .../json_abi_oracle_new_encoding.json | 26 +++++++++++++++++++ .../json_abi_oracle_new_encoding.json | 26 +++++++++++++++++++ .../size_of/json_abi_oracle_new_encoding.json | 26 +++++++++++++++++++ .../json_abi_oracle_new_encoding.json | 26 +++++++++++++++++++ .../json_abi_oracle_new_encoding.json | 26 +++++++++++++++++++ .../json_abi_oracle_new_encoding.json | 26 +++++++++++++++++++ .../json_abi_oracle_new_encoding.json | 26 +++++++++++++++++++ 39 files changed, 1014 insertions(+) create mode 100644 test/src/e2e_vm_tests/test_programs/should_pass/language/abort_control_flow_good/json_abi_oracle_new_encoding.json create mode 100644 test/src/e2e_vm_tests/test_programs/should_pass/language/aliased_imports/json_abi_oracle_new_encoding.json create mode 100644 test/src/e2e_vm_tests/test_programs/should_pass/language/b256_ops/json_abi_oracle_new_encoding.json create mode 100644 test/src/e2e_vm_tests/test_programs/should_pass/language/binop_intrinsics/json_abi_oracle_new_encoding.json create mode 100644 test/src/e2e_vm_tests/test_programs/should_pass/language/builtin_type_method_call/json_abi_oracle_new_encoding.json create mode 100644 test/src/e2e_vm_tests/test_programs/should_pass/language/chained_if_let/json_abi_oracle_new_encoding.json create mode 100644 test/src/e2e_vm_tests/test_programs/should_pass/language/const_decl/json_abi_oracle_new_encoding.json create mode 100644 test/src/e2e_vm_tests/test_programs/should_pass/language/const_decl_and_use_in_library/json_abi_oracle_new_encoding.json create mode 100644 test/src/e2e_vm_tests/test_programs/should_pass/language/const_decl_with_call_path/json_abi_oracle_new_encoding.json create mode 100644 test/src/e2e_vm_tests/test_programs/should_pass/language/contract_caller_as_ret/json_abi_oracle_new_encoding.json create mode 100644 test/src/e2e_vm_tests/test_programs/should_pass/language/diverging_exprs/json_abi_oracle_new_encoding.json create mode 100644 test/src/e2e_vm_tests/test_programs/should_pass/language/enum_destructuring/json_abi_oracle_new_encoding.json create mode 100644 test/src/e2e_vm_tests/test_programs/should_pass/language/enum_init_fn_call/json_abi_oracle_new_encoding.json create mode 100644 test/src/e2e_vm_tests/test_programs/should_pass/language/enum_instantiation/json_abi_oracle_new_encoding.json create mode 100644 test/src/e2e_vm_tests/test_programs/should_pass/language/enum_variant_imports/json_abi_oracle_new_encoding.json create mode 100644 test/src/e2e_vm_tests/test_programs/should_pass/language/eq_and_neq/json_abi_oracle_new_encoding.json create mode 100644 test/src/e2e_vm_tests/test_programs/should_pass/language/eq_intrinsic/json_abi_oracle_new_encoding.json create mode 100644 test/src/e2e_vm_tests/test_programs/should_pass/language/fix_opcode_bug/json_abi_oracle_new_encoding.json create mode 100644 test/src/e2e_vm_tests/test_programs/should_pass/language/generic_impl_self_where/json_abi_oracle_new_encoding.json create mode 100644 test/src/e2e_vm_tests/test_programs/should_pass/language/generic_inside_generic/json_abi_oracle_new_encoding.json create mode 100644 test/src/e2e_vm_tests/test_programs/should_pass/language/generic_transpose/json_abi_oracle_new_encoding.json create mode 100644 test/src/e2e_vm_tests/test_programs/should_pass/language/import_method_from_other_file/json_abi_oracle_new_encoding.json create mode 100644 test/src/e2e_vm_tests/test_programs/should_pass/language/import_trailing_comma/json_abi_oracle_new_encoding.json create mode 100644 test/src/e2e_vm_tests/test_programs/should_pass/language/impure_ifs/json_abi_oracle_new_encoding.json create mode 100644 test/src/e2e_vm_tests/test_programs/should_pass/language/many_stack_variables/json_abi_oracle_new_encoding.json create mode 100644 test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions/json_abi_oracle_new_encoding.json create mode 100644 test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_enums/json_abi_oracle_new_encoding.json create mode 100644 test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_inside_generic_functions/json_abi_oracle_new_encoding.json create mode 100644 test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_or/json_abi_oracle_new_encoding.json create mode 100644 test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_rest/json_abi_oracle_new_encoding.json create mode 100644 test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_structs/json_abi_oracle_new_encoding.json create mode 100644 test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_with_self/json_abi_oracle_new_encoding.json create mode 100644 test/src/e2e_vm_tests/test_programs/should_pass/language/mut_ref_empty_type/json_abi_oracle_new_encoding.json create mode 100644 test/src/e2e_vm_tests/test_programs/should_pass/language/reassignment_operators/json_abi_oracle_new_encoding.json create mode 100644 test/src/e2e_vm_tests/test_programs/should_pass/language/size_of/json_abi_oracle_new_encoding.json create mode 100644 test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_single_element/json_abi_oracle_new_encoding.json create mode 100644 test/src/e2e_vm_tests/test_programs/should_pass/language/unary_not_basic_2/json_abi_oracle_new_encoding.json create mode 100644 test/src/e2e_vm_tests/test_programs/should_pass/language/use_absolute_path/json_abi_oracle_new_encoding.json create mode 100644 test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_functions/json_abi_oracle_new_encoding.json diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/abort_control_flow_good/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/abort_control_flow_good/json_abi_oracle_new_encoding.json new file mode 100644 index 00000000000..068da3305ab --- /dev/null +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/abort_control_flow_good/json_abi_oracle_new_encoding.json @@ -0,0 +1,26 @@ +{ + "configurables": [], + "encoding": "1", + "functions": [ + { + "attributes": null, + "inputs": [], + "name": "main", + "output": { + "name": "", + "type": 0, + "typeArguments": null + } + } + ], + "loggedTypes": [], + "messagesTypes": [], + "types": [ + { + "components": null, + "type": "u64", + "typeId": 0, + "typeParameters": null + } + ] +} \ No newline at end of file diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/aliased_imports/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/aliased_imports/json_abi_oracle_new_encoding.json new file mode 100644 index 00000000000..068da3305ab --- /dev/null +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/aliased_imports/json_abi_oracle_new_encoding.json @@ -0,0 +1,26 @@ +{ + "configurables": [], + "encoding": "1", + "functions": [ + { + "attributes": null, + "inputs": [], + "name": "main", + "output": { + "name": "", + "type": 0, + "typeArguments": null + } + } + ], + "loggedTypes": [], + "messagesTypes": [], + "types": [ + { + "components": null, + "type": "u64", + "typeId": 0, + "typeParameters": null + } + ] +} \ No newline at end of file diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/b256_ops/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/b256_ops/json_abi_oracle_new_encoding.json new file mode 100644 index 00000000000..068da3305ab --- /dev/null +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/b256_ops/json_abi_oracle_new_encoding.json @@ -0,0 +1,26 @@ +{ + "configurables": [], + "encoding": "1", + "functions": [ + { + "attributes": null, + "inputs": [], + "name": "main", + "output": { + "name": "", + "type": 0, + "typeArguments": null + } + } + ], + "loggedTypes": [], + "messagesTypes": [], + "types": [ + { + "components": null, + "type": "u64", + "typeId": 0, + "typeParameters": null + } + ] +} \ No newline at end of file diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/binop_intrinsics/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/binop_intrinsics/json_abi_oracle_new_encoding.json new file mode 100644 index 00000000000..068da3305ab --- /dev/null +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/binop_intrinsics/json_abi_oracle_new_encoding.json @@ -0,0 +1,26 @@ +{ + "configurables": [], + "encoding": "1", + "functions": [ + { + "attributes": null, + "inputs": [], + "name": "main", + "output": { + "name": "", + "type": 0, + "typeArguments": null + } + } + ], + "loggedTypes": [], + "messagesTypes": [], + "types": [ + { + "components": null, + "type": "u64", + "typeId": 0, + "typeParameters": null + } + ] +} \ No newline at end of file diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/builtin_type_method_call/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/builtin_type_method_call/json_abi_oracle_new_encoding.json new file mode 100644 index 00000000000..068da3305ab --- /dev/null +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/builtin_type_method_call/json_abi_oracle_new_encoding.json @@ -0,0 +1,26 @@ +{ + "configurables": [], + "encoding": "1", + "functions": [ + { + "attributes": null, + "inputs": [], + "name": "main", + "output": { + "name": "", + "type": 0, + "typeArguments": null + } + } + ], + "loggedTypes": [], + "messagesTypes": [], + "types": [ + { + "components": null, + "type": "u64", + "typeId": 0, + "typeParameters": null + } + ] +} \ No newline at end of file diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/chained_if_let/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/chained_if_let/json_abi_oracle_new_encoding.json new file mode 100644 index 00000000000..068da3305ab --- /dev/null +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/chained_if_let/json_abi_oracle_new_encoding.json @@ -0,0 +1,26 @@ +{ + "configurables": [], + "encoding": "1", + "functions": [ + { + "attributes": null, + "inputs": [], + "name": "main", + "output": { + "name": "", + "type": 0, + "typeArguments": null + } + } + ], + "loggedTypes": [], + "messagesTypes": [], + "types": [ + { + "components": null, + "type": "u64", + "typeId": 0, + "typeParameters": null + } + ] +} \ No newline at end of file diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/const_decl/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/const_decl/json_abi_oracle_new_encoding.json new file mode 100644 index 00000000000..068da3305ab --- /dev/null +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/const_decl/json_abi_oracle_new_encoding.json @@ -0,0 +1,26 @@ +{ + "configurables": [], + "encoding": "1", + "functions": [ + { + "attributes": null, + "inputs": [], + "name": "main", + "output": { + "name": "", + "type": 0, + "typeArguments": null + } + } + ], + "loggedTypes": [], + "messagesTypes": [], + "types": [ + { + "components": null, + "type": "u64", + "typeId": 0, + "typeParameters": null + } + ] +} \ No newline at end of file diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/const_decl_and_use_in_library/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/const_decl_and_use_in_library/json_abi_oracle_new_encoding.json new file mode 100644 index 00000000000..068da3305ab --- /dev/null +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/const_decl_and_use_in_library/json_abi_oracle_new_encoding.json @@ -0,0 +1,26 @@ +{ + "configurables": [], + "encoding": "1", + "functions": [ + { + "attributes": null, + "inputs": [], + "name": "main", + "output": { + "name": "", + "type": 0, + "typeArguments": null + } + } + ], + "loggedTypes": [], + "messagesTypes": [], + "types": [ + { + "components": null, + "type": "u64", + "typeId": 0, + "typeParameters": null + } + ] +} \ No newline at end of file diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/const_decl_with_call_path/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/const_decl_with_call_path/json_abi_oracle_new_encoding.json new file mode 100644 index 00000000000..068da3305ab --- /dev/null +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/const_decl_with_call_path/json_abi_oracle_new_encoding.json @@ -0,0 +1,26 @@ +{ + "configurables": [], + "encoding": "1", + "functions": [ + { + "attributes": null, + "inputs": [], + "name": "main", + "output": { + "name": "", + "type": 0, + "typeArguments": null + } + } + ], + "loggedTypes": [], + "messagesTypes": [], + "types": [ + { + "components": null, + "type": "u64", + "typeId": 0, + "typeParameters": null + } + ] +} \ No newline at end of file diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/contract_caller_as_ret/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/contract_caller_as_ret/json_abi_oracle_new_encoding.json new file mode 100644 index 00000000000..ef7773fb592 --- /dev/null +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/contract_caller_as_ret/json_abi_oracle_new_encoding.json @@ -0,0 +1,26 @@ +{ + "configurables": [], + "encoding": "1", + "functions": [ + { + "attributes": null, + "inputs": [], + "name": "test_function", + "output": { + "name": "", + "type": 0, + "typeArguments": null + } + } + ], + "loggedTypes": [], + "messagesTypes": [], + "types": [ + { + "components": null, + "type": "bool", + "typeId": 0, + "typeParameters": null + } + ] +} \ No newline at end of file diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/diverging_exprs/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/diverging_exprs/json_abi_oracle_new_encoding.json new file mode 100644 index 00000000000..068da3305ab --- /dev/null +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/diverging_exprs/json_abi_oracle_new_encoding.json @@ -0,0 +1,26 @@ +{ + "configurables": [], + "encoding": "1", + "functions": [ + { + "attributes": null, + "inputs": [], + "name": "main", + "output": { + "name": "", + "type": 0, + "typeArguments": null + } + } + ], + "loggedTypes": [], + "messagesTypes": [], + "types": [ + { + "components": null, + "type": "u64", + "typeId": 0, + "typeParameters": null + } + ] +} \ No newline at end of file diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_destructuring/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_destructuring/json_abi_oracle_new_encoding.json new file mode 100644 index 00000000000..068da3305ab --- /dev/null +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_destructuring/json_abi_oracle_new_encoding.json @@ -0,0 +1,26 @@ +{ + "configurables": [], + "encoding": "1", + "functions": [ + { + "attributes": null, + "inputs": [], + "name": "main", + "output": { + "name": "", + "type": 0, + "typeArguments": null + } + } + ], + "loggedTypes": [], + "messagesTypes": [], + "types": [ + { + "components": null, + "type": "u64", + "typeId": 0, + "typeParameters": null + } + ] +} \ No newline at end of file diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_init_fn_call/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_init_fn_call/json_abi_oracle_new_encoding.json new file mode 100644 index 00000000000..068da3305ab --- /dev/null +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_init_fn_call/json_abi_oracle_new_encoding.json @@ -0,0 +1,26 @@ +{ + "configurables": [], + "encoding": "1", + "functions": [ + { + "attributes": null, + "inputs": [], + "name": "main", + "output": { + "name": "", + "type": 0, + "typeArguments": null + } + } + ], + "loggedTypes": [], + "messagesTypes": [], + "types": [ + { + "components": null, + "type": "u64", + "typeId": 0, + "typeParameters": null + } + ] +} \ No newline at end of file diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_instantiation/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_instantiation/json_abi_oracle_new_encoding.json new file mode 100644 index 00000000000..068da3305ab --- /dev/null +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_instantiation/json_abi_oracle_new_encoding.json @@ -0,0 +1,26 @@ +{ + "configurables": [], + "encoding": "1", + "functions": [ + { + "attributes": null, + "inputs": [], + "name": "main", + "output": { + "name": "", + "type": 0, + "typeArguments": null + } + } + ], + "loggedTypes": [], + "messagesTypes": [], + "types": [ + { + "components": null, + "type": "u64", + "typeId": 0, + "typeParameters": null + } + ] +} \ No newline at end of file diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_variant_imports/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_variant_imports/json_abi_oracle_new_encoding.json new file mode 100644 index 00000000000..068da3305ab --- /dev/null +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_variant_imports/json_abi_oracle_new_encoding.json @@ -0,0 +1,26 @@ +{ + "configurables": [], + "encoding": "1", + "functions": [ + { + "attributes": null, + "inputs": [], + "name": "main", + "output": { + "name": "", + "type": 0, + "typeArguments": null + } + } + ], + "loggedTypes": [], + "messagesTypes": [], + "types": [ + { + "components": null, + "type": "u64", + "typeId": 0, + "typeParameters": null + } + ] +} \ No newline at end of file diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/eq_and_neq/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/eq_and_neq/json_abi_oracle_new_encoding.json new file mode 100644 index 00000000000..b89d516ddd1 --- /dev/null +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/eq_and_neq/json_abi_oracle_new_encoding.json @@ -0,0 +1,26 @@ +{ + "configurables": [], + "encoding": "1", + "functions": [ + { + "attributes": null, + "inputs": [], + "name": "main", + "output": { + "name": "", + "type": 0, + "typeArguments": null + } + } + ], + "loggedTypes": [], + "messagesTypes": [], + "types": [ + { + "components": null, + "type": "bool", + "typeId": 0, + "typeParameters": null + } + ] +} \ No newline at end of file diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/eq_intrinsic/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/eq_intrinsic/json_abi_oracle_new_encoding.json new file mode 100644 index 00000000000..068da3305ab --- /dev/null +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/eq_intrinsic/json_abi_oracle_new_encoding.json @@ -0,0 +1,26 @@ +{ + "configurables": [], + "encoding": "1", + "functions": [ + { + "attributes": null, + "inputs": [], + "name": "main", + "output": { + "name": "", + "type": 0, + "typeArguments": null + } + } + ], + "loggedTypes": [], + "messagesTypes": [], + "types": [ + { + "components": null, + "type": "u64", + "typeId": 0, + "typeParameters": null + } + ] +} \ No newline at end of file diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/fix_opcode_bug/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/fix_opcode_bug/json_abi_oracle_new_encoding.json new file mode 100644 index 00000000000..068da3305ab --- /dev/null +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/fix_opcode_bug/json_abi_oracle_new_encoding.json @@ -0,0 +1,26 @@ +{ + "configurables": [], + "encoding": "1", + "functions": [ + { + "attributes": null, + "inputs": [], + "name": "main", + "output": { + "name": "", + "type": 0, + "typeArguments": null + } + } + ], + "loggedTypes": [], + "messagesTypes": [], + "types": [ + { + "components": null, + "type": "u64", + "typeId": 0, + "typeParameters": null + } + ] +} \ No newline at end of file diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_impl_self_where/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_impl_self_where/json_abi_oracle_new_encoding.json new file mode 100644 index 00000000000..068da3305ab --- /dev/null +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_impl_self_where/json_abi_oracle_new_encoding.json @@ -0,0 +1,26 @@ +{ + "configurables": [], + "encoding": "1", + "functions": [ + { + "attributes": null, + "inputs": [], + "name": "main", + "output": { + "name": "", + "type": 0, + "typeArguments": null + } + } + ], + "loggedTypes": [], + "messagesTypes": [], + "types": [ + { + "components": null, + "type": "u64", + "typeId": 0, + "typeParameters": null + } + ] +} \ No newline at end of file diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_inside_generic/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_inside_generic/json_abi_oracle_new_encoding.json new file mode 100644 index 00000000000..068da3305ab --- /dev/null +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_inside_generic/json_abi_oracle_new_encoding.json @@ -0,0 +1,26 @@ +{ + "configurables": [], + "encoding": "1", + "functions": [ + { + "attributes": null, + "inputs": [], + "name": "main", + "output": { + "name": "", + "type": 0, + "typeArguments": null + } + } + ], + "loggedTypes": [], + "messagesTypes": [], + "types": [ + { + "components": null, + "type": "u64", + "typeId": 0, + "typeParameters": null + } + ] +} \ No newline at end of file diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_transpose/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_transpose/json_abi_oracle_new_encoding.json new file mode 100644 index 00000000000..b89d516ddd1 --- /dev/null +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_transpose/json_abi_oracle_new_encoding.json @@ -0,0 +1,26 @@ +{ + "configurables": [], + "encoding": "1", + "functions": [ + { + "attributes": null, + "inputs": [], + "name": "main", + "output": { + "name": "", + "type": 0, + "typeArguments": null + } + } + ], + "loggedTypes": [], + "messagesTypes": [], + "types": [ + { + "components": null, + "type": "bool", + "typeId": 0, + "typeParameters": null + } + ] +} \ No newline at end of file diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/import_method_from_other_file/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/import_method_from_other_file/json_abi_oracle_new_encoding.json new file mode 100644 index 00000000000..068da3305ab --- /dev/null +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/import_method_from_other_file/json_abi_oracle_new_encoding.json @@ -0,0 +1,26 @@ +{ + "configurables": [], + "encoding": "1", + "functions": [ + { + "attributes": null, + "inputs": [], + "name": "main", + "output": { + "name": "", + "type": 0, + "typeArguments": null + } + } + ], + "loggedTypes": [], + "messagesTypes": [], + "types": [ + { + "components": null, + "type": "u64", + "typeId": 0, + "typeParameters": null + } + ] +} \ No newline at end of file diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/import_trailing_comma/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/import_trailing_comma/json_abi_oracle_new_encoding.json new file mode 100644 index 00000000000..068da3305ab --- /dev/null +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/import_trailing_comma/json_abi_oracle_new_encoding.json @@ -0,0 +1,26 @@ +{ + "configurables": [], + "encoding": "1", + "functions": [ + { + "attributes": null, + "inputs": [], + "name": "main", + "output": { + "name": "", + "type": 0, + "typeArguments": null + } + } + ], + "loggedTypes": [], + "messagesTypes": [], + "types": [ + { + "components": null, + "type": "u64", + "typeId": 0, + "typeParameters": null + } + ] +} \ No newline at end of file diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/impure_ifs/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/impure_ifs/json_abi_oracle_new_encoding.json new file mode 100644 index 00000000000..068da3305ab --- /dev/null +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/impure_ifs/json_abi_oracle_new_encoding.json @@ -0,0 +1,26 @@ +{ + "configurables": [], + "encoding": "1", + "functions": [ + { + "attributes": null, + "inputs": [], + "name": "main", + "output": { + "name": "", + "type": 0, + "typeArguments": null + } + } + ], + "loggedTypes": [], + "messagesTypes": [], + "types": [ + { + "components": null, + "type": "u64", + "typeId": 0, + "typeParameters": null + } + ] +} \ No newline at end of file diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/many_stack_variables/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/many_stack_variables/json_abi_oracle_new_encoding.json new file mode 100644 index 00000000000..068da3305ab --- /dev/null +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/many_stack_variables/json_abi_oracle_new_encoding.json @@ -0,0 +1,26 @@ +{ + "configurables": [], + "encoding": "1", + "functions": [ + { + "attributes": null, + "inputs": [], + "name": "main", + "output": { + "name": "", + "type": 0, + "typeArguments": null + } + } + ], + "loggedTypes": [], + "messagesTypes": [], + "types": [ + { + "components": null, + "type": "u64", + "typeId": 0, + "typeParameters": null + } + ] +} \ No newline at end of file diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions/json_abi_oracle_new_encoding.json new file mode 100644 index 00000000000..068da3305ab --- /dev/null +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions/json_abi_oracle_new_encoding.json @@ -0,0 +1,26 @@ +{ + "configurables": [], + "encoding": "1", + "functions": [ + { + "attributes": null, + "inputs": [], + "name": "main", + "output": { + "name": "", + "type": 0, + "typeArguments": null + } + } + ], + "loggedTypes": [], + "messagesTypes": [], + "types": [ + { + "components": null, + "type": "u64", + "typeId": 0, + "typeParameters": null + } + ] +} \ No newline at end of file diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_enums/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_enums/json_abi_oracle_new_encoding.json new file mode 100644 index 00000000000..068da3305ab --- /dev/null +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_enums/json_abi_oracle_new_encoding.json @@ -0,0 +1,26 @@ +{ + "configurables": [], + "encoding": "1", + "functions": [ + { + "attributes": null, + "inputs": [], + "name": "main", + "output": { + "name": "", + "type": 0, + "typeArguments": null + } + } + ], + "loggedTypes": [], + "messagesTypes": [], + "types": [ + { + "components": null, + "type": "u64", + "typeId": 0, + "typeParameters": null + } + ] +} \ No newline at end of file diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_inside_generic_functions/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_inside_generic_functions/json_abi_oracle_new_encoding.json new file mode 100644 index 00000000000..068da3305ab --- /dev/null +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_inside_generic_functions/json_abi_oracle_new_encoding.json @@ -0,0 +1,26 @@ +{ + "configurables": [], + "encoding": "1", + "functions": [ + { + "attributes": null, + "inputs": [], + "name": "main", + "output": { + "name": "", + "type": 0, + "typeArguments": null + } + } + ], + "loggedTypes": [], + "messagesTypes": [], + "types": [ + { + "components": null, + "type": "u64", + "typeId": 0, + "typeParameters": null + } + ] +} \ No newline at end of file diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_or/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_or/json_abi_oracle_new_encoding.json new file mode 100644 index 00000000000..068da3305ab --- /dev/null +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_or/json_abi_oracle_new_encoding.json @@ -0,0 +1,26 @@ +{ + "configurables": [], + "encoding": "1", + "functions": [ + { + "attributes": null, + "inputs": [], + "name": "main", + "output": { + "name": "", + "type": 0, + "typeArguments": null + } + } + ], + "loggedTypes": [], + "messagesTypes": [], + "types": [ + { + "components": null, + "type": "u64", + "typeId": 0, + "typeParameters": null + } + ] +} \ No newline at end of file diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_rest/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_rest/json_abi_oracle_new_encoding.json new file mode 100644 index 00000000000..068da3305ab --- /dev/null +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_rest/json_abi_oracle_new_encoding.json @@ -0,0 +1,26 @@ +{ + "configurables": [], + "encoding": "1", + "functions": [ + { + "attributes": null, + "inputs": [], + "name": "main", + "output": { + "name": "", + "type": 0, + "typeArguments": null + } + } + ], + "loggedTypes": [], + "messagesTypes": [], + "types": [ + { + "components": null, + "type": "u64", + "typeId": 0, + "typeParameters": null + } + ] +} \ No newline at end of file diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_structs/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_structs/json_abi_oracle_new_encoding.json new file mode 100644 index 00000000000..068da3305ab --- /dev/null +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_structs/json_abi_oracle_new_encoding.json @@ -0,0 +1,26 @@ +{ + "configurables": [], + "encoding": "1", + "functions": [ + { + "attributes": null, + "inputs": [], + "name": "main", + "output": { + "name": "", + "type": 0, + "typeArguments": null + } + } + ], + "loggedTypes": [], + "messagesTypes": [], + "types": [ + { + "components": null, + "type": "u64", + "typeId": 0, + "typeParameters": null + } + ] +} \ No newline at end of file diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_with_self/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_with_self/json_abi_oracle_new_encoding.json new file mode 100644 index 00000000000..068da3305ab --- /dev/null +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_with_self/json_abi_oracle_new_encoding.json @@ -0,0 +1,26 @@ +{ + "configurables": [], + "encoding": "1", + "functions": [ + { + "attributes": null, + "inputs": [], + "name": "main", + "output": { + "name": "", + "type": 0, + "typeArguments": null + } + } + ], + "loggedTypes": [], + "messagesTypes": [], + "types": [ + { + "components": null, + "type": "u64", + "typeId": 0, + "typeParameters": null + } + ] +} \ No newline at end of file diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/mut_ref_empty_type/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/mut_ref_empty_type/json_abi_oracle_new_encoding.json new file mode 100644 index 00000000000..068da3305ab --- /dev/null +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/mut_ref_empty_type/json_abi_oracle_new_encoding.json @@ -0,0 +1,26 @@ +{ + "configurables": [], + "encoding": "1", + "functions": [ + { + "attributes": null, + "inputs": [], + "name": "main", + "output": { + "name": "", + "type": 0, + "typeArguments": null + } + } + ], + "loggedTypes": [], + "messagesTypes": [], + "types": [ + { + "components": null, + "type": "u64", + "typeId": 0, + "typeParameters": null + } + ] +} \ No newline at end of file diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/reassignment_operators/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/reassignment_operators/json_abi_oracle_new_encoding.json new file mode 100644 index 00000000000..068da3305ab --- /dev/null +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/reassignment_operators/json_abi_oracle_new_encoding.json @@ -0,0 +1,26 @@ +{ + "configurables": [], + "encoding": "1", + "functions": [ + { + "attributes": null, + "inputs": [], + "name": "main", + "output": { + "name": "", + "type": 0, + "typeArguments": null + } + } + ], + "loggedTypes": [], + "messagesTypes": [], + "types": [ + { + "components": null, + "type": "u64", + "typeId": 0, + "typeParameters": null + } + ] +} \ No newline at end of file diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/size_of/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/size_of/json_abi_oracle_new_encoding.json new file mode 100644 index 00000000000..068da3305ab --- /dev/null +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/size_of/json_abi_oracle_new_encoding.json @@ -0,0 +1,26 @@ +{ + "configurables": [], + "encoding": "1", + "functions": [ + { + "attributes": null, + "inputs": [], + "name": "main", + "output": { + "name": "", + "type": 0, + "typeArguments": null + } + } + ], + "loggedTypes": [], + "messagesTypes": [], + "types": [ + { + "components": null, + "type": "u64", + "typeId": 0, + "typeParameters": null + } + ] +} \ No newline at end of file diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_single_element/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_single_element/json_abi_oracle_new_encoding.json new file mode 100644 index 00000000000..068da3305ab --- /dev/null +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_single_element/json_abi_oracle_new_encoding.json @@ -0,0 +1,26 @@ +{ + "configurables": [], + "encoding": "1", + "functions": [ + { + "attributes": null, + "inputs": [], + "name": "main", + "output": { + "name": "", + "type": 0, + "typeArguments": null + } + } + ], + "loggedTypes": [], + "messagesTypes": [], + "types": [ + { + "components": null, + "type": "u64", + "typeId": 0, + "typeParameters": null + } + ] +} \ No newline at end of file diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/unary_not_basic_2/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/unary_not_basic_2/json_abi_oracle_new_encoding.json new file mode 100644 index 00000000000..b89d516ddd1 --- /dev/null +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/unary_not_basic_2/json_abi_oracle_new_encoding.json @@ -0,0 +1,26 @@ +{ + "configurables": [], + "encoding": "1", + "functions": [ + { + "attributes": null, + "inputs": [], + "name": "main", + "output": { + "name": "", + "type": 0, + "typeArguments": null + } + } + ], + "loggedTypes": [], + "messagesTypes": [], + "types": [ + { + "components": null, + "type": "bool", + "typeId": 0, + "typeParameters": null + } + ] +} \ No newline at end of file diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/use_absolute_path/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/use_absolute_path/json_abi_oracle_new_encoding.json new file mode 100644 index 00000000000..068da3305ab --- /dev/null +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/use_absolute_path/json_abi_oracle_new_encoding.json @@ -0,0 +1,26 @@ +{ + "configurables": [], + "encoding": "1", + "functions": [ + { + "attributes": null, + "inputs": [], + "name": "main", + "output": { + "name": "", + "type": 0, + "typeArguments": null + } + } + ], + "loggedTypes": [], + "messagesTypes": [], + "types": [ + { + "components": null, + "type": "u64", + "typeId": 0, + "typeParameters": null + } + ] +} \ No newline at end of file diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_functions/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_functions/json_abi_oracle_new_encoding.json new file mode 100644 index 00000000000..068da3305ab --- /dev/null +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/where_clause_functions/json_abi_oracle_new_encoding.json @@ -0,0 +1,26 @@ +{ + "configurables": [], + "encoding": "1", + "functions": [ + { + "attributes": null, + "inputs": [], + "name": "main", + "output": { + "name": "", + "type": 0, + "typeArguments": null + } + } + ], + "loggedTypes": [], + "messagesTypes": [], + "types": [ + { + "components": null, + "type": "u64", + "typeId": 0, + "typeParameters": null + } + ] +} \ No newline at end of file