Fix up 652c8ee: add missing changes

Author: kisialiou

e2e-testing/snakefiles/common.smk

@@ -1,6 +1,6 @@
 import const
 
-rule tools_build:
+rule common_tools_build:
     output: const.common_tools_compile_stamp
     message: "Building tools"
     shell: """

e2e-testing/snakefiles/evm.smk

@@ -5,7 +5,7 @@ from utils import get_json_field
 
 module near_module:
     snakefile: "near.smk"
-use rule * from near_module as near_*
+use rule * from near_module
 
 EVM_NETWORKS = [network for network in EN]
 
@@ -48,15 +48,15 @@ def get_full_path(file_name):
 
 
 # Rule to deploy all networks
-rule deploy_all:
+rule evm_deploy_all:
     input:
         f"{get_evm_deploy_results_dir(EN.ETH_SEPOLIA)}/{network_deployed_stamp}",
         f"{get_evm_deploy_results_dir(EN.ARBITRUM_SEPOLIA)}/{network_deployed_stamp}",
         f"{get_evm_deploy_results_dir(EN.BASE_SEPOLIA)}/{network_deployed_stamp}",
     default_target: True
 
 
-rule build:
+rule evm_build:
     message: "Building EVM contracts"
     output: evm_build_stamp
     shell: f"""
@@ -67,7 +67,7 @@ rule build:
     touch {{output}}
     """
 
-rule create_eoa_account:
+rule evm_create_eoa_account:
     message: "Creating EOA account"
     output: pathlib.Path(get_evm_account_dir("{network}")) / "{account}.json"
     params:
@@ -78,7 +78,7 @@ rule create_eoa_account:
     {params.create_cmd} 2>/dev/stderr 1> {output}
     """
 
-rule deploy_fake_prover:
+rule evm_deploy_fake_prover:
     message: "Deploying fake prover to {wildcards.network}"
     input:
         build_stamp = evm_build_stamp
@@ -92,10 +92,10 @@ rule deploy_fake_prover:
     """
 
 
-rule create_enear_creation_file:
+rule evm_create_enear_creation_file:
     message: "Creating eNear creation file for {wildcards.network}"
     input:
-        fake_prover = rules.deploy_fake_prover.output,
+        fake_prover = rules.evm_deploy_fake_prover.output,
         template = evm_enear_creation_template_file
     output: get_full_path(enear_creation_file)
     params:
@@ -107,7 +107,7 @@ rule create_enear_creation_file:
     """
 
 
-rule deploy_enear:
+rule evm_deploy_enear:
     message: "Deploying eNear to {wildcards.network}"
     input:
         creation_file = get_full_path(enear_creation_file),
@@ -122,11 +122,11 @@ rule deploy_enear:
     """
 
 
-rule deploy_enear_proxy:
+rule evm_deploy_enear_proxy:
     message: "Deploying eNear proxy to {wildcards.network}"
     input:
-        rules.build.output,
-        enear = rules.deploy_enear.output
+        rules.evm_build.output,
+        enear = rules.evm_deploy_enear.output
     output: get_full_path(f"{EC.ENEAR_PROXY}.json")
     params:
         mkdir=get_mkdir_cmd,
@@ -137,10 +137,10 @@ rule deploy_enear_proxy:
     """
 
 
-rule deploy_token_impl:
+rule evm_deploy_token_impl:
     message: "Deploying token implementation to {wildcards.network}"
     input:
-        rules.build.output
+        rules.evm_build.output
     output: get_full_path(f"{EC.TOKEN_IMPL}.json")
     params:
         mkdir = get_mkdir_cmd,
@@ -151,11 +151,11 @@ rule deploy_token_impl:
     """
 
 
-rule deploy_bridge:
+rule evm_deploy_bridge:
     message: "Deploying bridge contract to {wildcards.network}"
     input:
-        rules.build.output,
-        token_impl = rules.deploy_token_impl.output,
+        rules.evm_build.output,
+        token_impl = rules.evm_deploy_token_impl.output,
         near_bridge_file = near_bridge_file,
     output: get_full_path(f"{EC.OMNI_BRIDGE}.json")
     params:
@@ -169,7 +169,7 @@ rule deploy_bridge:
     """
 
 
-rule deploy_test_token:
+rule evm_deploy_test_token:
     message: "Deploying test token to {wildcards.network}"
     input:
         const.common_tools_compile_stamp
@@ -186,12 +186,12 @@ rule deploy_test_token:
 
 
 # Aggregate rules for each network
-rule deploy_to_network:
+rule evm_deploy_to_network:
     message: "Deploying network {wildcards.network}"
     input:
-        bridge = rules.deploy_bridge.output,
-        enear_proxy = rules.deploy_enear_proxy.output,
-        test_token = rules.deploy_test_token.output
+        bridge = rules.evm_deploy_bridge.output,
+        enear_proxy = rules.evm_deploy_enear_proxy.output,
+        test_token = rules.evm_deploy_test_token.output
     output:
         touch(f"{const.evm_deploy_results_dir}/{{network}}/{network_deployed_stamp}")
     params:

e2e-testing/snakefiles/near.smk

@@ -5,7 +5,7 @@ from utils import get_json_field, extract_tx_hash
 
 module common_module:
     snakefile: "common.smk"
-use rule * from common_module as common_*
+use rule * from common_module
 
 # NEAR-specific variables and paths
 near_dir = const.common_testing_root / "../near"
@@ -41,7 +41,7 @@ def get_mkdir_cmd(directory):
     return f"mkdir -p {directory}"
 
 
-rule deploy_all:
+rule near_deploy_all:
     message: "Deploying all NEAR contracts"
     input:
         expand(const.near_deploy_results_dir / "{contract}.json", 
@@ -51,15 +51,15 @@ rule deploy_all:
     default_target: True
 
 
-rule build:
+rule near_build:
     message: "Building NEAR contracts"
     output:
         expand(near_binary_dir / "{binary}", binary=near_binaries)
     shell: f"""
     OUT_DIR={near_binary_dir} make -f {const.common_testing_root}/../Makefile rust-build-near
     """
 
-rule create_account:
+rule near_create_account:
     message: "Creating {wildcards.account} account"
     output: const.near_account_dir / "{account}.json"
     params:
@@ -72,7 +72,7 @@ rule create_account:
     """
 
 
-rule generate_token_deployer_init_args:
+rule near_generate_token_deployer_init_args:
     message: "Generating token deployer init args"
     input:
         omni_bridge = omni_bridge_file,
@@ -88,7 +88,7 @@ rule generate_token_deployer_init_args:
     """
 
 
-rule generate_mock_token_init_args:
+rule near_generate_mock_token_init_args:
     message: "Generating mock token init args"
     input: near_init_account_credentials_file
     output: const.common_generated_dir / "mock_token_dyn_init_args.json"
@@ -101,7 +101,7 @@ rule generate_mock_token_init_args:
     """
 
 
-rule generate_omni_bridge_init_args:
+rule near_generate_omni_bridge_init_args:
     message: "Generating omni bridge init args"
     input: omni_prover_file
     output: const.common_generated_dir / "omni_bridge_dyn_init_args.json"
@@ -114,7 +114,7 @@ rule generate_omni_bridge_init_args:
     """
 
 
-rule omni_prover_dau_grant:
+rule near_omni_prover_dau_grant:
     message: "Granting DAO role to omni prover"
     input:
         init_account = near_init_account_credentials_file,
@@ -137,12 +137,12 @@ rule omni_prover_dau_grant:
     """
 
 
-rule evm_prover_setup:
+rule near_evm_prover_setup:
     message: "Setting up EVM prover"
     input:
         omni_prover = omni_prover_file,
         evm_prover = evm_prover_file,
-        dau_grant = rules.omni_prover_dau_grant.output,
+        dau_grant = rules.near_omni_prover_dau_grant.output,
         dao_account = near_dao_account_credentials_file
     output: near_evm_prover_setup_call_file
     params:
@@ -162,7 +162,7 @@ rule evm_prover_setup:
     """
 
 
-rule deploy_contract:
+rule near_deploy_contract:
     message: "Deploying {wildcards.contract} contract"
     input:
         init_params=near_init_params_file,