From c8b398d4b193c014d86fb4c964556543248b185c Mon Sep 17 00:00:00 2001 From: gadyrcdz Date: Tue, 29 Apr 2025 23:29:15 -0600 Subject: [PATCH 1/5] Move the content of test/data into tests, and delete the old folder of test --- .../{test => tests}/data/big_contract/.gitignore | 0 .../{test => tests}/data/big_contract/Forc.toml | 0 .../data/big_contract/big_contract-abi.json | 0 .../{test => tests}/data/big_contract/src/main.sw | 0 .../data/contract_with_dep/.gitignore | 0 .../data/contract_with_dep/Forc.toml | 0 .../data/contract_with_dep/src/main.sw | 0 .../contract_with_dep_with_salt_conflict/.gitignore | 0 .../contract_with_dep_with_salt_conflict/Forc.toml | 0 .../src/main.sw | 0 .../data/contract_with_types/Forc.toml | 0 .../contract_with_types-abi.json | 0 .../contract_with_types-storage_slots.json | 0 .../contract_with_types/contract_with_types.bin | Bin .../data/contract_with_types/src/main.sw | 0 .../data/deployed_predicate/.gitignore | 0 .../data/deployed_predicate/Forc.lock | 0 .../data/deployed_predicate/Forc.toml | 0 .../deployed_predicate/deployed_predicate-abi.json | 0 .../data/deployed_predicate/src/main.sw | 0 .../{test => tests}/data/deployed_script/.gitignore | 0 .../{test => tests}/data/deployed_script/Forc.toml | 0 .../data/deployed_script/deployed_script-abi.json | 0 .../deployed_script/deployed_script-loader-abi.json | 0 .../data/deployed_script/deployed_script.bin | Bin .../data/deployed_script/src/main.sw | 0 .../data/standalone_contract/.gitignore | 0 .../data/standalone_contract/Forc.lock | 0 .../data/standalone_contract/Forc.toml | 0 .../data/standalone_contract/src/main.sw | 0 .../standalone_contract-abi.json | 0 31 files changed, 0 insertions(+), 0 deletions(-) rename forc-plugins/forc-client/{test => tests}/data/big_contract/.gitignore (100%) rename forc-plugins/forc-client/{test => tests}/data/big_contract/Forc.toml (100%) rename forc-plugins/forc-client/{test => tests}/data/big_contract/big_contract-abi.json (100%) rename forc-plugins/forc-client/{test => tests}/data/big_contract/src/main.sw (100%) rename forc-plugins/forc-client/{test => tests}/data/contract_with_dep/.gitignore (100%) rename forc-plugins/forc-client/{test => tests}/data/contract_with_dep/Forc.toml (100%) rename forc-plugins/forc-client/{test => tests}/data/contract_with_dep/src/main.sw (100%) rename forc-plugins/forc-client/{test => tests}/data/contract_with_dep_with_salt_conflict/.gitignore (100%) rename forc-plugins/forc-client/{test => tests}/data/contract_with_dep_with_salt_conflict/Forc.toml (100%) rename forc-plugins/forc-client/{test => tests}/data/contract_with_dep_with_salt_conflict/src/main.sw (100%) rename forc-plugins/forc-client/{test => tests}/data/contract_with_types/Forc.toml (100%) rename forc-plugins/forc-client/{test => tests}/data/contract_with_types/contract_with_types-abi.json (100%) rename forc-plugins/forc-client/{test => tests}/data/contract_with_types/contract_with_types-storage_slots.json (100%) rename forc-plugins/forc-client/{test => tests}/data/contract_with_types/contract_with_types.bin (100%) rename forc-plugins/forc-client/{test => tests}/data/contract_with_types/src/main.sw (100%) rename forc-plugins/forc-client/{test => tests}/data/deployed_predicate/.gitignore (100%) rename forc-plugins/forc-client/{test => tests}/data/deployed_predicate/Forc.lock (100%) rename forc-plugins/forc-client/{test => tests}/data/deployed_predicate/Forc.toml (100%) rename forc-plugins/forc-client/{test => tests}/data/deployed_predicate/deployed_predicate-abi.json (100%) rename forc-plugins/forc-client/{test => tests}/data/deployed_predicate/src/main.sw (100%) rename forc-plugins/forc-client/{test => tests}/data/deployed_script/.gitignore (100%) rename forc-plugins/forc-client/{test => tests}/data/deployed_script/Forc.toml (100%) rename forc-plugins/forc-client/{test => tests}/data/deployed_script/deployed_script-abi.json (100%) rename forc-plugins/forc-client/{test => tests}/data/deployed_script/deployed_script-loader-abi.json (100%) rename forc-plugins/forc-client/{test => tests}/data/deployed_script/deployed_script.bin (100%) rename forc-plugins/forc-client/{test => tests}/data/deployed_script/src/main.sw (100%) rename forc-plugins/forc-client/{test => tests}/data/standalone_contract/.gitignore (100%) rename forc-plugins/forc-client/{test => tests}/data/standalone_contract/Forc.lock (100%) rename forc-plugins/forc-client/{test => tests}/data/standalone_contract/Forc.toml (100%) rename forc-plugins/forc-client/{test => tests}/data/standalone_contract/src/main.sw (100%) rename forc-plugins/forc-client/{test => tests}/data/standalone_contract/standalone_contract-abi.json (100%) diff --git a/forc-plugins/forc-client/test/data/big_contract/.gitignore b/forc-plugins/forc-client/tests/data/big_contract/.gitignore similarity index 100% rename from forc-plugins/forc-client/test/data/big_contract/.gitignore rename to forc-plugins/forc-client/tests/data/big_contract/.gitignore diff --git a/forc-plugins/forc-client/test/data/big_contract/Forc.toml b/forc-plugins/forc-client/tests/data/big_contract/Forc.toml similarity index 100% rename from forc-plugins/forc-client/test/data/big_contract/Forc.toml rename to forc-plugins/forc-client/tests/data/big_contract/Forc.toml diff --git a/forc-plugins/forc-client/test/data/big_contract/big_contract-abi.json b/forc-plugins/forc-client/tests/data/big_contract/big_contract-abi.json similarity index 100% rename from forc-plugins/forc-client/test/data/big_contract/big_contract-abi.json rename to forc-plugins/forc-client/tests/data/big_contract/big_contract-abi.json diff --git a/forc-plugins/forc-client/test/data/big_contract/src/main.sw b/forc-plugins/forc-client/tests/data/big_contract/src/main.sw similarity index 100% rename from forc-plugins/forc-client/test/data/big_contract/src/main.sw rename to forc-plugins/forc-client/tests/data/big_contract/src/main.sw diff --git a/forc-plugins/forc-client/test/data/contract_with_dep/.gitignore b/forc-plugins/forc-client/tests/data/contract_with_dep/.gitignore similarity index 100% rename from forc-plugins/forc-client/test/data/contract_with_dep/.gitignore rename to forc-plugins/forc-client/tests/data/contract_with_dep/.gitignore diff --git a/forc-plugins/forc-client/test/data/contract_with_dep/Forc.toml b/forc-plugins/forc-client/tests/data/contract_with_dep/Forc.toml similarity index 100% rename from forc-plugins/forc-client/test/data/contract_with_dep/Forc.toml rename to forc-plugins/forc-client/tests/data/contract_with_dep/Forc.toml diff --git a/forc-plugins/forc-client/test/data/contract_with_dep/src/main.sw b/forc-plugins/forc-client/tests/data/contract_with_dep/src/main.sw similarity index 100% rename from forc-plugins/forc-client/test/data/contract_with_dep/src/main.sw rename to forc-plugins/forc-client/tests/data/contract_with_dep/src/main.sw diff --git a/forc-plugins/forc-client/test/data/contract_with_dep_with_salt_conflict/.gitignore b/forc-plugins/forc-client/tests/data/contract_with_dep_with_salt_conflict/.gitignore similarity index 100% rename from forc-plugins/forc-client/test/data/contract_with_dep_with_salt_conflict/.gitignore rename to forc-plugins/forc-client/tests/data/contract_with_dep_with_salt_conflict/.gitignore diff --git a/forc-plugins/forc-client/test/data/contract_with_dep_with_salt_conflict/Forc.toml b/forc-plugins/forc-client/tests/data/contract_with_dep_with_salt_conflict/Forc.toml similarity index 100% rename from forc-plugins/forc-client/test/data/contract_with_dep_with_salt_conflict/Forc.toml rename to forc-plugins/forc-client/tests/data/contract_with_dep_with_salt_conflict/Forc.toml diff --git a/forc-plugins/forc-client/test/data/contract_with_dep_with_salt_conflict/src/main.sw b/forc-plugins/forc-client/tests/data/contract_with_dep_with_salt_conflict/src/main.sw similarity index 100% rename from forc-plugins/forc-client/test/data/contract_with_dep_with_salt_conflict/src/main.sw rename to forc-plugins/forc-client/tests/data/contract_with_dep_with_salt_conflict/src/main.sw diff --git a/forc-plugins/forc-client/test/data/contract_with_types/Forc.toml b/forc-plugins/forc-client/tests/data/contract_with_types/Forc.toml similarity index 100% rename from forc-plugins/forc-client/test/data/contract_with_types/Forc.toml rename to forc-plugins/forc-client/tests/data/contract_with_types/Forc.toml diff --git a/forc-plugins/forc-client/test/data/contract_with_types/contract_with_types-abi.json b/forc-plugins/forc-client/tests/data/contract_with_types/contract_with_types-abi.json similarity index 100% rename from forc-plugins/forc-client/test/data/contract_with_types/contract_with_types-abi.json rename to forc-plugins/forc-client/tests/data/contract_with_types/contract_with_types-abi.json diff --git a/forc-plugins/forc-client/test/data/contract_with_types/contract_with_types-storage_slots.json b/forc-plugins/forc-client/tests/data/contract_with_types/contract_with_types-storage_slots.json similarity index 100% rename from forc-plugins/forc-client/test/data/contract_with_types/contract_with_types-storage_slots.json rename to forc-plugins/forc-client/tests/data/contract_with_types/contract_with_types-storage_slots.json diff --git a/forc-plugins/forc-client/test/data/contract_with_types/contract_with_types.bin b/forc-plugins/forc-client/tests/data/contract_with_types/contract_with_types.bin similarity index 100% rename from forc-plugins/forc-client/test/data/contract_with_types/contract_with_types.bin rename to forc-plugins/forc-client/tests/data/contract_with_types/contract_with_types.bin diff --git a/forc-plugins/forc-client/test/data/contract_with_types/src/main.sw b/forc-plugins/forc-client/tests/data/contract_with_types/src/main.sw similarity index 100% rename from forc-plugins/forc-client/test/data/contract_with_types/src/main.sw rename to forc-plugins/forc-client/tests/data/contract_with_types/src/main.sw diff --git a/forc-plugins/forc-client/test/data/deployed_predicate/.gitignore b/forc-plugins/forc-client/tests/data/deployed_predicate/.gitignore similarity index 100% rename from forc-plugins/forc-client/test/data/deployed_predicate/.gitignore rename to forc-plugins/forc-client/tests/data/deployed_predicate/.gitignore diff --git a/forc-plugins/forc-client/test/data/deployed_predicate/Forc.lock b/forc-plugins/forc-client/tests/data/deployed_predicate/Forc.lock similarity index 100% rename from forc-plugins/forc-client/test/data/deployed_predicate/Forc.lock rename to forc-plugins/forc-client/tests/data/deployed_predicate/Forc.lock diff --git a/forc-plugins/forc-client/test/data/deployed_predicate/Forc.toml b/forc-plugins/forc-client/tests/data/deployed_predicate/Forc.toml similarity index 100% rename from forc-plugins/forc-client/test/data/deployed_predicate/Forc.toml rename to forc-plugins/forc-client/tests/data/deployed_predicate/Forc.toml diff --git a/forc-plugins/forc-client/test/data/deployed_predicate/deployed_predicate-abi.json b/forc-plugins/forc-client/tests/data/deployed_predicate/deployed_predicate-abi.json similarity index 100% rename from forc-plugins/forc-client/test/data/deployed_predicate/deployed_predicate-abi.json rename to forc-plugins/forc-client/tests/data/deployed_predicate/deployed_predicate-abi.json diff --git a/forc-plugins/forc-client/test/data/deployed_predicate/src/main.sw b/forc-plugins/forc-client/tests/data/deployed_predicate/src/main.sw similarity index 100% rename from forc-plugins/forc-client/test/data/deployed_predicate/src/main.sw rename to forc-plugins/forc-client/tests/data/deployed_predicate/src/main.sw diff --git a/forc-plugins/forc-client/test/data/deployed_script/.gitignore b/forc-plugins/forc-client/tests/data/deployed_script/.gitignore similarity index 100% rename from forc-plugins/forc-client/test/data/deployed_script/.gitignore rename to forc-plugins/forc-client/tests/data/deployed_script/.gitignore diff --git a/forc-plugins/forc-client/test/data/deployed_script/Forc.toml b/forc-plugins/forc-client/tests/data/deployed_script/Forc.toml similarity index 100% rename from forc-plugins/forc-client/test/data/deployed_script/Forc.toml rename to forc-plugins/forc-client/tests/data/deployed_script/Forc.toml diff --git a/forc-plugins/forc-client/test/data/deployed_script/deployed_script-abi.json b/forc-plugins/forc-client/tests/data/deployed_script/deployed_script-abi.json similarity index 100% rename from forc-plugins/forc-client/test/data/deployed_script/deployed_script-abi.json rename to forc-plugins/forc-client/tests/data/deployed_script/deployed_script-abi.json diff --git a/forc-plugins/forc-client/test/data/deployed_script/deployed_script-loader-abi.json b/forc-plugins/forc-client/tests/data/deployed_script/deployed_script-loader-abi.json similarity index 100% rename from forc-plugins/forc-client/test/data/deployed_script/deployed_script-loader-abi.json rename to forc-plugins/forc-client/tests/data/deployed_script/deployed_script-loader-abi.json diff --git a/forc-plugins/forc-client/test/data/deployed_script/deployed_script.bin b/forc-plugins/forc-client/tests/data/deployed_script/deployed_script.bin similarity index 100% rename from forc-plugins/forc-client/test/data/deployed_script/deployed_script.bin rename to forc-plugins/forc-client/tests/data/deployed_script/deployed_script.bin diff --git a/forc-plugins/forc-client/test/data/deployed_script/src/main.sw b/forc-plugins/forc-client/tests/data/deployed_script/src/main.sw similarity index 100% rename from forc-plugins/forc-client/test/data/deployed_script/src/main.sw rename to forc-plugins/forc-client/tests/data/deployed_script/src/main.sw diff --git a/forc-plugins/forc-client/test/data/standalone_contract/.gitignore b/forc-plugins/forc-client/tests/data/standalone_contract/.gitignore similarity index 100% rename from forc-plugins/forc-client/test/data/standalone_contract/.gitignore rename to forc-plugins/forc-client/tests/data/standalone_contract/.gitignore diff --git a/forc-plugins/forc-client/test/data/standalone_contract/Forc.lock b/forc-plugins/forc-client/tests/data/standalone_contract/Forc.lock similarity index 100% rename from forc-plugins/forc-client/test/data/standalone_contract/Forc.lock rename to forc-plugins/forc-client/tests/data/standalone_contract/Forc.lock diff --git a/forc-plugins/forc-client/test/data/standalone_contract/Forc.toml b/forc-plugins/forc-client/tests/data/standalone_contract/Forc.toml similarity index 100% rename from forc-plugins/forc-client/test/data/standalone_contract/Forc.toml rename to forc-plugins/forc-client/tests/data/standalone_contract/Forc.toml diff --git a/forc-plugins/forc-client/test/data/standalone_contract/src/main.sw b/forc-plugins/forc-client/tests/data/standalone_contract/src/main.sw similarity index 100% rename from forc-plugins/forc-client/test/data/standalone_contract/src/main.sw rename to forc-plugins/forc-client/tests/data/standalone_contract/src/main.sw diff --git a/forc-plugins/forc-client/test/data/standalone_contract/standalone_contract-abi.json b/forc-plugins/forc-client/tests/data/standalone_contract/standalone_contract-abi.json similarity index 100% rename from forc-plugins/forc-client/test/data/standalone_contract/standalone_contract-abi.json rename to forc-plugins/forc-client/tests/data/standalone_contract/standalone_contract-abi.json From 5ce4acf7d1affa375c58a59432eb922dfe07b5af Mon Sep 17 00:00:00 2001 From: gadyrcdz Date: Wed, 30 Apr 2025 22:52:09 -0600 Subject: [PATCH 2/5] Updated files for the new route tests/data --- .../forc-client/src/op/call/call_function.rs | 6 +++--- .../forc-client/src/op/call/list_functions.rs | 2 +- forc-plugins/forc-client/src/op/call/mod.rs | 4 ++-- forc-plugins/forc-client/tests/deploy.rs | 12 ++++++------ 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/forc-plugins/forc-client/src/op/call/call_function.rs b/forc-plugins/forc-client/src/op/call/call_function.rs index e08a4ec588f..97a31a6165f 100644 --- a/forc-plugins/forc-client/src/op/call/call_function.rs +++ b/forc-plugins/forc-client/src/op/call/call_function.rs @@ -297,7 +297,7 @@ pub mod tests { cmd::Call { address: (*id).into(), abi: Some(Either::Left(std::path::PathBuf::from( - "../../forc-plugins/forc-client/test/data/contract_with_types/contract_with_types-abi.json", + "../../forc-plugins/forc-client/tests/data/contract_with_types/contract_with_types-abi.json", ))), function: Some(selector.to_string()), function_args: args.into_iter().map(String::from).collect(), @@ -315,7 +315,7 @@ pub mod tests { abigen!(Contract( name = "TestContract", - abi = "forc-plugins/forc-client/test/data/contract_with_types/contract_with_types-abi.json" + abi = "forc-plugins/forc-client/tests/data/contract_with_types/contract_with_types-abi.json" )); pub async fn get_contract_instance() -> (TestContract, ContractId, Provider, SecretKey) @@ -331,7 +331,7 @@ pub mod tests { .unwrap(); let id = Contract::load_from( - "../../forc-plugins/forc-client/test/data/contract_with_types/contract_with_types.bin", + "../../forc-plugins/forc-client/tests/data/contract_with_types/contract_with_types.bin", LoadConfiguration::default(), ) .unwrap() diff --git a/forc-plugins/forc-client/src/op/call/list_functions.rs b/forc-plugins/forc-client/src/op/call/list_functions.rs index 1e7b2abf51b..88956eaf15d 100644 --- a/forc-plugins/forc-client/src/op/call/list_functions.rs +++ b/forc-plugins/forc-client/src/op/call/list_functions.rs @@ -130,7 +130,7 @@ mod tests { let (_, id, _, _) = get_contract_instance().await; // Load a test ABI - let abi_path_str = "../../forc-plugins/forc-client/test/data/contract_with_types/contract_with_types-abi.json"; + let abi_path_str = "../../forc-plugins/forc-client/tests/data/contract_with_types/contract_with_types-abi.json"; let abi_path = Path::new(abi_path_str); let abi = Either::Left(abi_path.to_path_buf()); diff --git a/forc-plugins/forc-client/src/op/call/mod.rs b/forc-plugins/forc-client/src/op/call/mod.rs index ab25bf03197..69623ee74fa 100644 --- a/forc-plugins/forc-client/src/op/call/mod.rs +++ b/forc-plugins/forc-client/src/op/call/mod.rs @@ -240,7 +240,7 @@ pub(crate) mod tests { abigen!(Contract( name = "TestContract", - abi = "forc-plugins/forc-client/test/data/contract_with_types/contract_with_types-abi.json" + abi = "forc-plugins/forc-client/tests/data/contract_with_types/contract_with_types-abi.json" )); pub async fn get_contract_instance() -> (TestContract, ContractId, Provider, SecretKey) @@ -256,7 +256,7 @@ pub(crate) mod tests { .unwrap(); let id = Contract::load_from( - "../../forc-plugins/forc-client/test/data/contract_with_types/contract_with_types.bin", + "../../forc-plugins/forc-client/tests/data/contract_with_types/contract_with_types.bin", LoadConfiguration::default(), ) .unwrap() diff --git a/forc-plugins/forc-client/tests/deploy.rs b/forc-plugins/forc-client/tests/deploy.rs index c56215961e7..f17a37227f6 100644 --- a/forc-plugins/forc-client/tests/deploy.rs +++ b/forc-plugins/forc-client/tests/deploy.rs @@ -151,7 +151,7 @@ fn update_main_sw(tmp_dir: &Path) -> anyhow::Result<()> { async fn assert_big_contract_calls(wallet: Wallet, contract_id: ContractId) { abigen!(Contract( name = "BigContract", - abi = "forc-plugins/forc-client/test/data/big_contract/big_contract-abi.json" + abi = "forc-plugins/forc-client/tests/data/big_contract/big_contract-abi.json" )); let instance = BigContract::new(contract_id, wallet); @@ -530,7 +530,7 @@ async fn test_proxy_contract_re_routes_call() { abigen!(Contract( name = "ImplementationContract", - abi = "forc-plugins/forc-client/test/data/standalone_contract/standalone_contract-abi.json" + abi = "forc-plugins/forc-client/tests/data/standalone_contract/standalone_contract-abi.json" )); let impl_contract_a = ImplementationContract::new(proxy_contract_id, wallet_unlocked.clone()); @@ -943,7 +943,7 @@ async fn deploy_script_calls() { abigen!(Script( name = "MyScript", - abi = "forc-plugins/forc-client/test/data/deployed_script/deployed_script-abi.json" + abi = "forc-plugins/forc-client/tests/data/deployed_script/deployed_script-abi.json" )); let provider = Provider::connect(&node_url).await.unwrap(); @@ -1070,7 +1070,7 @@ async fn deployed_predicate_call() { abigen!(Predicate( name = "MyPredicate", - abi = "forc-plugins/forc-client/test/data/deployed_predicate/deployed_predicate-abi.json" + abi = "forc-plugins/forc-client/tests/data/deployed_predicate/deployed_predicate-abi.json" )); let provider = Provider::connect(&node_url).await.unwrap(); @@ -1133,7 +1133,7 @@ async fn call_with_sdk_generated_overrides(node_url: &str, contract_id: Contract let project_dir = test_data_path().join("deployed_script"); abigen!(Script( name = "MyScript", - abi = "forc-plugins/forc-client/test/data/deployed_script/deployed_script-abi.json" + abi = "forc-plugins/forc-client/tests/data/deployed_script/deployed_script-abi.json" )); let provider = Provider::connect(&node_url).await.unwrap(); let secret_key = SecretKey::from_str(forc_client::constants::DEFAULT_PRIVATE_KEY).unwrap(); @@ -1236,7 +1236,7 @@ async fn call_with_forc_generated_overrides(node_url: &str, contract_id: Contrac let generated_loader_bin = tmp_dir.path().join("out/deployed_script-loader.bin"); abigen!(Script( name = "MyScript", - abi = "forc-plugins/forc-client/test/data/deployed_script/deployed_script-loader-abi.json" + abi = "forc-plugins/forc-client/tests/data/deployed_script/deployed_script-loader-abi.json" )); let forc_generated_script_instance = MyScript::new( wallet_unlocked, From c9ef2520dc7c7807ca9db7102b542159fb7c3969 Mon Sep 17 00:00:00 2001 From: gadyrcdz Date: Tue, 20 May 2025 15:32:13 -0600 Subject: [PATCH 3/5] Change format for testing --- forc-plugins/forc-client/src/op/call/call_function.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/forc-plugins/forc-client/src/op/call/call_function.rs b/forc-plugins/forc-client/src/op/call/call_function.rs index 1ee5056adb8..6983674dc97 100644 --- a/forc-plugins/forc-client/src/op/call/call_function.rs +++ b/forc-plugins/forc-client/src/op/call/call_function.rs @@ -318,7 +318,8 @@ pub mod tests { abigen!(Contract( name = "TestContract", - abi = "forc-plugins/forc-client/tests/data/contract_with_types/contract_with_types-abi.json" + abi = + "forc-plugins/forc-client/tests/data/contract_with_types/contract_with_types-abi.json" )); pub async fn get_contract_instance() -> (TestContract, ContractId, Provider, SecretKey) From 33f18014de35537bcb770340218aa71525bb0c1e Mon Sep 17 00:00:00 2001 From: gadyrcdz Date: Tue, 20 May 2025 15:33:19 -0600 Subject: [PATCH 4/5] Change format for testing mod.rs --- forc-plugins/forc-client/src/op/call/mod.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/forc-plugins/forc-client/src/op/call/mod.rs b/forc-plugins/forc-client/src/op/call/mod.rs index e4c158651e4..e61ef152167 100644 --- a/forc-plugins/forc-client/src/op/call/mod.rs +++ b/forc-plugins/forc-client/src/op/call/mod.rs @@ -264,7 +264,8 @@ pub(crate) mod tests { abigen!(Contract( name = "TestContract", - abi = "forc-plugins/forc-client/tests/data/contract_with_types/contract_with_types-abi.json" + abi = + "forc-plugins/forc-client/tests/data/contract_with_types/contract_with_types-abi.json" )); pub async fn get_contract_instance() -> (TestContract, ContractId, Provider, SecretKey) From 30be3248085b244711c0ef63d3a0ac2df2d7b918 Mon Sep 17 00:00:00 2001 From: gadyrcdz Date: Tue, 20 May 2025 15:33:39 -0600 Subject: [PATCH 5/5] Change format for testing deploy.rs --- forc-plugins/forc-client/tests/deploy.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/forc-plugins/forc-client/tests/deploy.rs b/forc-plugins/forc-client/tests/deploy.rs index fd57256c9f1..987075abbe7 100644 --- a/forc-plugins/forc-client/tests/deploy.rs +++ b/forc-plugins/forc-client/tests/deploy.rs @@ -530,7 +530,8 @@ async fn test_proxy_contract_re_routes_call() { abigen!(Contract( name = "ImplementationContract", - abi = "forc-plugins/forc-client/tests/data/standalone_contract/standalone_contract-abi.json" + abi = + "forc-plugins/forc-client/tests/data/standalone_contract/standalone_contract-abi.json" )); let impl_contract_a = ImplementationContract::new(proxy_contract_id, wallet_unlocked.clone()); @@ -943,7 +944,8 @@ async fn deploy_script_calls() { abigen!(Script( name = "MyScript", - abi = "forc-plugins/forc-client/tests/data/deployed_script/deployed_script-abi.json" + abi = + "forc-plugins/forc-client/tests/data/deployed_script/deployed_script-abi.json" )); let provider = Provider::connect(&node_url).await.unwrap();