From 77fe683f18cefff37056ead50ea1c336afc7a91a Mon Sep 17 00:00:00 2001
From: Cyrill Leutwiler <cyrill@parity.io>
Date: Fri, 4 Oct 2024 09:59:27 +0200
Subject: [PATCH] remove the test encoding option (#65)

---
 crates/solidity/src/lib.rs           | 4 ----
 crates/solidity/src/process/input.rs | 4 ----
 crates/solidity/src/process/mod.rs   | 3 ---
 crates/solidity/src/project/mod.rs   | 2 --
 crates/solidity/src/test_utils.rs    | 4 ++--
 5 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/crates/solidity/src/lib.rs b/crates/solidity/src/lib.rs
index ad7cec7..3f0a897 100644
--- a/crates/solidity/src/lib.rs
+++ b/crates/solidity/src/lib.rs
@@ -83,7 +83,6 @@ pub fn yul(
         optimizer_settings,
         is_system_mode,
         include_metadata_hash,
-        false,
         debug_config,
     )?;
 
@@ -113,7 +112,6 @@ pub fn llvm_ir(
         optimizer_settings,
         is_system_mode,
         include_metadata_hash,
-        false,
         debug_config,
     )?;
 
@@ -204,7 +202,6 @@ pub fn standard_output(
         optimizer_settings,
         is_system_mode,
         include_metadata_hash,
-        false,
         debug_config,
     )?;
 
@@ -282,7 +279,6 @@ pub fn standard_json(
             optimizer_settings,
             is_system_mode,
             include_metadata_hash,
-            false,
             debug_config,
         )?;
         build.write_to_standard_json(&mut solc_output, &solc_version, &resolc_version)?;
diff --git a/crates/solidity/src/process/input.rs b/crates/solidity/src/process/input.rs
index 9492318..9f746d9 100644
--- a/crates/solidity/src/process/input.rs
+++ b/crates/solidity/src/process/input.rs
@@ -18,8 +18,6 @@ pub struct Input {
     pub is_system_mode: bool,
     /// Whether to append the metadata hash.
     pub include_metadata_hash: bool,
-    /// Enables the test bytecode encoding.
-    pub enable_test_encoding: bool,
     /// The optimizer settings.
     pub optimizer_settings: revive_llvm_context::OptimizerSettings,
     /// The debug output config.
@@ -33,7 +31,6 @@ impl Input {
         project: Project,
         is_system_mode: bool,
         include_metadata_hash: bool,
-        enable_test_encoding: bool,
         optimizer_settings: revive_llvm_context::OptimizerSettings,
         debug_config: Option<revive_llvm_context::DebugConfig>,
     ) -> Self {
@@ -42,7 +39,6 @@ impl Input {
             project,
             is_system_mode,
             include_metadata_hash,
-            enable_test_encoding,
             optimizer_settings,
             debug_config,
         }
diff --git a/crates/solidity/src/process/mod.rs b/crates/solidity/src/process/mod.rs
index 491be4a..3f16816 100644
--- a/crates/solidity/src/process/mod.rs
+++ b/crates/solidity/src/process/mod.rs
@@ -40,9 +40,6 @@ pub fn run(input_file: Option<&mut std::fs::File>) -> anyhow::Result<()> {
     }
 
     let input: Input = revive_common::deserialize_from_slice(buffer.as_slice())?;
-    if input.enable_test_encoding {
-        todo!()
-    }
     let result = input.contract.compile(
         input.project,
         input.optimizer_settings,
diff --git a/crates/solidity/src/project/mod.rs b/crates/solidity/src/project/mod.rs
index fc5d80f..d99afd7 100644
--- a/crates/solidity/src/project/mod.rs
+++ b/crates/solidity/src/project/mod.rs
@@ -64,7 +64,6 @@ impl Project {
         optimizer_settings: revive_llvm_context::OptimizerSettings,
         is_system_mode: bool,
         include_metadata_hash: bool,
-        bytecode_encoding_testing: bool,
         debug_config: Option<revive_llvm_context::DebugConfig>,
     ) -> anyhow::Result<Build> {
         let project = self.clone();
@@ -77,7 +76,6 @@ impl Project {
                     project.clone(),
                     is_system_mode,
                     include_metadata_hash,
-                    bytecode_encoding_testing,
                     optimizer_settings.clone(),
                     debug_config.clone(),
                 ));
diff --git a/crates/solidity/src/test_utils.rs b/crates/solidity/src/test_utils.rs
index 6330506..3c72b07 100644
--- a/crates/solidity/src/test_utils.rs
+++ b/crates/solidity/src/test_utils.rs
@@ -106,7 +106,7 @@ pub fn build_solidity_with_options(
 
     let project = output.try_to_project(sources, libraries, pipeline, &solc_version, None)?;
 
-    let build: crate::Build = project.compile(optimizer_settings, false, false, false, None)?;
+    let build: crate::Build = project.compile(optimizer_settings, false, false, None)?;
     build.write_to_standard_json(
         &mut output,
         &solc_version,
@@ -229,7 +229,7 @@ pub fn build_yul(source_code: &str) -> anyhow::Result<()> {
 
     let project =
         Project::try_from_yul_string(PathBuf::from("test.yul").as_path(), source_code, None)?;
-    let _build = project.compile(optimizer_settings, false, false, false, None)?;
+    let _build = project.compile(optimizer_settings, false, false, None)?;
 
     Ok(())
 }