From 92b333fb5b071d8879d474b14d7dff268dd7b2e7 Mon Sep 17 00:00:00 2001 From: Tom French <15848336+TomAFrench@users.noreply.github.com> Date: Tue, 17 Oct 2023 13:46:45 +0100 Subject: [PATCH] chore: remove unused argument from `write_vk` command (#3183) --- tooling/backend_interface/src/cli/contract.rs | 1 - tooling/backend_interface/src/cli/verify.rs | 1 - tooling/backend_interface/src/cli/write_vk.rs | 8 +------- tooling/backend_interface/src/proof_system.rs | 1 - tooling/backend_interface/src/smart_contract.rs | 1 - .../test-binaries/mock_backend/src/write_vk_cmd.rs | 3 --- 6 files changed, 1 insertion(+), 14 deletions(-) diff --git a/tooling/backend_interface/src/cli/contract.rs b/tooling/backend_interface/src/cli/contract.rs index 47ad1e4cc5b..e83fc1909b6 100644 --- a/tooling/backend_interface/src/cli/contract.rs +++ b/tooling/backend_interface/src/cli/contract.rs @@ -58,7 +58,6 @@ fn contract_command() -> Result<(), BackendError> { let write_vk_command = super::WriteVkCommand { bytecode_path, vk_path_output: vk_path.clone(), - is_recursive: false, crs_path: crs_path.clone(), }; write_vk_command.run(backend.binary_path())?; diff --git a/tooling/backend_interface/src/cli/verify.rs b/tooling/backend_interface/src/cli/verify.rs index 741dd8cbd14..a31f476d84c 100644 --- a/tooling/backend_interface/src/cli/verify.rs +++ b/tooling/backend_interface/src/cli/verify.rs @@ -59,7 +59,6 @@ fn verify_command() -> Result<(), BackendError> { let write_vk_command = WriteVkCommand { bytecode_path: bytecode_path.clone(), crs_path: crs_path.clone(), - is_recursive: false, vk_path_output: vk_path_output.clone(), }; diff --git a/tooling/backend_interface/src/cli/write_vk.rs b/tooling/backend_interface/src/cli/write_vk.rs index 987dac7cf8d..8d4aa9cc7e3 100644 --- a/tooling/backend_interface/src/cli/write_vk.rs +++ b/tooling/backend_interface/src/cli/write_vk.rs @@ -7,7 +7,6 @@ use crate::BackendError; /// to write a verification key to a file pub(crate) struct WriteVkCommand { pub(crate) crs_path: PathBuf, - pub(crate) is_recursive: bool, pub(crate) bytecode_path: PathBuf, pub(crate) vk_path_output: PathBuf, } @@ -25,10 +24,6 @@ impl WriteVkCommand { .arg("-o") .arg(self.vk_path_output); - if self.is_recursive { - command.arg("-r"); - } - let output = command.output()?; if output.status.success() { Ok(()) @@ -53,8 +48,7 @@ fn write_vk_command() -> Result<(), BackendError> { std::fs::File::create(&bytecode_path).expect("file should be created"); - let write_vk_command = - WriteVkCommand { bytecode_path, crs_path, is_recursive: false, vk_path_output }; + let write_vk_command = WriteVkCommand { bytecode_path, crs_path, vk_path_output }; write_vk_command.run(backend.binary_path())?; drop(temp_directory); diff --git a/tooling/backend_interface/src/proof_system.rs b/tooling/backend_interface/src/proof_system.rs index cbb4a61be8a..7d6e7d51888 100644 --- a/tooling/backend_interface/src/proof_system.rs +++ b/tooling/backend_interface/src/proof_system.rs @@ -110,7 +110,6 @@ impl Backend { WriteVkCommand { crs_path: self.crs_directory(), - is_recursive, bytecode_path, vk_path_output: vk_path.clone(), } diff --git a/tooling/backend_interface/src/smart_contract.rs b/tooling/backend_interface/src/smart_contract.rs index 50afd47287b..08f67e7b9bc 100644 --- a/tooling/backend_interface/src/smart_contract.rs +++ b/tooling/backend_interface/src/smart_contract.rs @@ -24,7 +24,6 @@ impl Backend { WriteVkCommand { crs_path: self.crs_directory(), - is_recursive: false, bytecode_path, vk_path_output: vk_path.clone(), } diff --git a/tooling/backend_interface/test-binaries/mock_backend/src/write_vk_cmd.rs b/tooling/backend_interface/test-binaries/mock_backend/src/write_vk_cmd.rs index 495aae27fc8..fcee224e85b 100644 --- a/tooling/backend_interface/test-binaries/mock_backend/src/write_vk_cmd.rs +++ b/tooling/backend_interface/test-binaries/mock_backend/src/write_vk_cmd.rs @@ -9,9 +9,6 @@ pub(crate) struct WriteVkCommand { #[clap(short = 'b')] pub(crate) bytecode_path: PathBuf, - #[clap(short = 'r')] - pub(crate) is_recursive: bool, - #[clap(short = 'o')] pub(crate) vk_path: PathBuf, }