@@ -26,15 +26,7 @@ use std::{
2626 str:: FromStr ,
2727} ;
2828use tempfile:: tempdir;
29- use toml_edit:: { value, DocumentMut , InlineTable , Item , Table , Value } ;
30-
31- fn get_workspace_root ( ) -> PathBuf {
32- PathBuf :: from ( env ! ( "CARGO_MANIFEST_DIR" ) )
33- . join ( "../" )
34- . join ( "../" )
35- . canonicalize ( )
36- . unwrap ( )
37- }
29+ use toml_edit:: { value, DocumentMut , Item , Table } ;
3830
3931fn test_data_path ( ) -> PathBuf {
4032 PathBuf :: from ( env ! ( "CARGO_MANIFEST_DIR" ) )
@@ -105,11 +97,6 @@ fn expect_deployed_predicate(deployed_package: DeployedPackage) -> DeployedExecu
10597 }
10698}
10799
108- fn patch_manifest_file_with_path_std ( _manifest_dir : & Path ) -> anyhow:: Result < ( ) > {
109- // No longer needed - test projects now use implicit-std = true
110- Ok ( ( ) )
111- }
112-
113100fn patch_manifest_file_with_proxy_table ( manifest_dir : & Path , proxy : Proxy ) -> anyhow:: Result < ( ) > {
114101 let toml_path = manifest_dir. join ( sway_utils:: constants:: MANIFEST_FILE_NAME ) ;
115102 let toml_content = fs:: read_to_string ( & toml_path) ?;
@@ -341,7 +328,6 @@ async fn test_simple_deploy() {
341328 let tmp_dir = tempdir ( ) . unwrap ( ) ;
342329 let project_dir = test_data_path ( ) . join ( "standalone_contract" ) ;
343330 copy_dir ( & project_dir, tmp_dir. path ( ) ) . unwrap ( ) ;
344- patch_manifest_file_with_path_std ( tmp_dir. path ( ) ) . unwrap ( ) ;
345331
346332 let pkg = Pkg {
347333 path : Some ( tmp_dir. path ( ) . display ( ) . to_string ( ) ) ,
@@ -383,7 +369,6 @@ async fn test_deploy_submit_only() {
383369 let tmp_dir = tempdir ( ) . unwrap ( ) ;
384370 let project_dir = test_data_path ( ) . join ( "standalone_contract" ) ;
385371 copy_dir ( & project_dir, tmp_dir. path ( ) ) . unwrap ( ) ;
386- patch_manifest_file_with_path_std ( tmp_dir. path ( ) ) . unwrap ( ) ;
387372
388373 let pkg = Pkg {
389374 path : Some ( tmp_dir. path ( ) . display ( ) . to_string ( ) ) ,
@@ -427,7 +412,6 @@ async fn test_deploy_fresh_proxy() {
427412 let tmp_dir = tempdir ( ) . unwrap ( ) ;
428413 let project_dir = test_data_path ( ) . join ( "standalone_contract" ) ;
429414 copy_dir ( & project_dir, tmp_dir. path ( ) ) . unwrap ( ) ;
430- patch_manifest_file_with_path_std ( tmp_dir. path ( ) ) . unwrap ( ) ;
431415 let proxy = Proxy {
432416 enabled : true ,
433417 address : None ,
@@ -480,7 +464,6 @@ async fn test_proxy_contract_re_routes_call() {
480464 let tmp_dir = tempdir ( ) . unwrap ( ) ;
481465 let project_dir = test_data_path ( ) . join ( "standalone_contract" ) ;
482466 copy_dir ( & project_dir, tmp_dir. path ( ) ) . unwrap ( ) ;
483- patch_manifest_file_with_path_std ( tmp_dir. path ( ) ) . unwrap ( ) ;
484467 let proxy = Proxy {
485468 enabled : true ,
486469 address : None ,
@@ -616,7 +599,6 @@ async fn test_non_owner_fails_to_set_target() {
616599 let tmp_dir = tempdir ( ) . unwrap ( ) ;
617600 let project_dir = test_data_path ( ) . join ( "standalone_contract" ) ;
618601 copy_dir ( & project_dir, tmp_dir. path ( ) ) . unwrap ( ) ;
619- patch_manifest_file_with_path_std ( tmp_dir. path ( ) ) . unwrap ( ) ;
620602 let proxy = Proxy {
621603 enabled : true ,
622604 address : None ,
@@ -726,7 +708,6 @@ async fn chunked_deploy() {
726708 let tmp_dir = tempdir ( ) . unwrap ( ) ;
727709 let project_dir = test_data_path ( ) . join ( "big_contract" ) ;
728710 copy_dir ( & project_dir, tmp_dir. path ( ) ) . unwrap ( ) ;
729- patch_manifest_file_with_path_std ( tmp_dir. path ( ) ) . unwrap ( ) ;
730711
731712 let pkg = Pkg {
732713 path : Some ( tmp_dir. path ( ) . display ( ) . to_string ( ) ) ,
@@ -760,7 +741,6 @@ async fn chunked_deploy_re_routes_calls() {
760741 let tmp_dir = tempdir ( ) . unwrap ( ) ;
761742 let project_dir = test_data_path ( ) . join ( "big_contract" ) ;
762743 copy_dir ( & project_dir, tmp_dir. path ( ) ) . unwrap ( ) ;
763- patch_manifest_file_with_path_std ( tmp_dir. path ( ) ) . unwrap ( ) ;
764744
765745 let pkg = Pkg {
766746 path : Some ( tmp_dir. path ( ) . display ( ) . to_string ( ) ) ,
@@ -800,7 +780,6 @@ async fn chunked_deploy_with_proxy_re_routes_call() {
800780 let tmp_dir = tempdir ( ) . unwrap ( ) ;
801781 let project_dir = test_data_path ( ) . join ( "big_contract" ) ;
802782 copy_dir ( & project_dir, tmp_dir. path ( ) ) . unwrap ( ) ;
803- patch_manifest_file_with_path_std ( tmp_dir. path ( ) ) . unwrap ( ) ;
804783 let proxy = Proxy {
805784 enabled : true ,
806785 address : None ,
@@ -845,7 +824,6 @@ async fn can_deploy_script() {
845824 let tmp_dir = tempdir ( ) . unwrap ( ) ;
846825 let project_dir = test_data_path ( ) . join ( "deployed_script" ) ;
847826 copy_dir ( & project_dir, tmp_dir. path ( ) ) . unwrap ( ) ;
848- patch_manifest_file_with_path_std ( tmp_dir. path ( ) ) . unwrap ( ) ;
849827
850828 let node_url = format ! ( "http://127.0.0.1:{port}/v1/graphql" ) ;
851829 let target = NodeTarget {
@@ -877,7 +855,6 @@ async fn deploy_script_calls() {
877855 let tmp_dir = tempdir ( ) . unwrap ( ) ;
878856 let project_dir = test_data_path ( ) . join ( "deployed_script" ) ;
879857 copy_dir ( & project_dir, tmp_dir. path ( ) ) . unwrap ( ) ;
880- patch_manifest_file_with_path_std ( tmp_dir. path ( ) ) . unwrap ( ) ;
881858
882859 let node_url = format ! ( "http://127.0.0.1:{port}/v1/graphql" ) ;
883860 let target = NodeTarget {
@@ -905,7 +882,6 @@ async fn deploy_script_calls() {
905882 let contract_tmp_dir = tempdir ( ) . unwrap ( ) ;
906883 let project_dir = test_data_path ( ) . join ( "standalone_contract" ) ;
907884 copy_dir ( & project_dir, contract_tmp_dir. path ( ) ) . unwrap ( ) ;
908- patch_manifest_file_with_path_std ( contract_tmp_dir. path ( ) ) . unwrap ( ) ;
909885
910886 let pkg = Pkg {
911887 path : Some ( contract_tmp_dir. path ( ) . display ( ) . to_string ( ) ) ,
@@ -1003,7 +979,6 @@ async fn can_deploy_predicates() {
1003979 let tmp_dir = tempdir ( ) . unwrap ( ) ;
1004980 let project_dir = test_data_path ( ) . join ( "deployed_predicate" ) ;
1005981 copy_dir ( & project_dir, tmp_dir. path ( ) ) . unwrap ( ) ;
1006- patch_manifest_file_with_path_std ( tmp_dir. path ( ) ) . unwrap ( ) ;
1007982
1008983 let node_url = format ! ( "http://127.0.0.1:{port}/v1/graphql" ) ;
1009984 let target = NodeTarget {
@@ -1035,7 +1010,6 @@ async fn deployed_predicate_call() {
10351010 let tmp_dir = tempdir ( ) . unwrap ( ) ;
10361011 let project_dir = test_data_path ( ) . join ( "deployed_predicate" ) ;
10371012 copy_dir ( & project_dir, tmp_dir. path ( ) ) . unwrap ( ) ;
1038- patch_manifest_file_with_path_std ( tmp_dir. path ( ) ) . unwrap ( ) ;
10391013
10401014 let node_url = format ! ( "http://127.0.0.1:{port}/v1/graphql" ) ;
10411015 let target = NodeTarget {
@@ -1199,7 +1173,6 @@ async fn call_with_forc_generated_overrides(node_url: &str, contract_id: Contrac
11991173 let tmp_dir = tempdir ( ) . unwrap ( ) ;
12001174 let project_dir = test_data_path ( ) . join ( "deployed_script" ) ;
12011175 copy_dir ( & project_dir, tmp_dir. path ( ) ) . unwrap ( ) ;
1202- patch_manifest_file_with_path_std ( tmp_dir. path ( ) ) . unwrap ( ) ;
12031176
12041177 let target = NodeTarget {
12051178 node_url : Some ( node_url. to_string ( ) ) ,
@@ -1304,7 +1277,6 @@ async fn offset_shifted_abi_works() {
13041277 let contract_tmp_dir = tempdir ( ) . unwrap ( ) ;
13051278 let project_dir = test_data_path ( ) . join ( "standalone_contract" ) ;
13061279 copy_dir ( & project_dir, contract_tmp_dir. path ( ) ) . unwrap ( ) ;
1307- patch_manifest_file_with_path_std ( contract_tmp_dir. path ( ) ) . unwrap ( ) ;
13081280
13091281 let pkg = Pkg {
13101282 path : Some ( contract_tmp_dir. path ( ) . display ( ) . to_string ( ) ) ,
0 commit comments