From 21519ab89e54fc2ec6e0f3e63b4c5a7dd0ebbf36 Mon Sep 17 00:00:00 2001
From: Oleksandr Zarudnyi <hedgar2017@gmail.com>
Date: Mon, 11 Mar 2024 23:35:55 +0400
Subject: [PATCH] Update deps to public ones

---
 LLVM.lock                                                | 4 ++--
 compiler_tester/Cargo.toml                               | 5 -----
 compiler_tester/src/compilers/eravm.rs                   | 9 ---------
 compiler_tester/src/compilers/llvm.rs                    | 9 ---------
 compiler_tester/src/compilers/yul.rs                     | 9 ---------
 compiler_tester/src/lib.rs                               | 6 +++---
 compiler_tester/src/vm/eravm/system_contracts.rs         | 2 +-
 .../src/test/function_call/parser/syntax/parser/event.rs | 3 ---
 8 files changed, 6 insertions(+), 41 deletions(-)

diff --git a/LLVM.lock b/LLVM.lock
index 91e7f13c..e59e9c5e 100644
--- a/LLVM.lock
+++ b/LLVM.lock
@@ -1,2 +1,2 @@
-url = "https://github.com/matter-labs/compiler-llvm"
-branch = "main"
+url = "https://github.com/matter-labs/era-compiler-llvm"
+branch = "v1.4.1"
diff --git a/compiler_tester/Cargo.toml b/compiler_tester/Cargo.toml
index 10efbdda..e7f03cb7 100644
--- a/compiler_tester/Cargo.toml
+++ b/compiler_tester/Cargo.toml
@@ -47,11 +47,6 @@ era-compiler-llvm-context = { git = "https://github.com/matter-labs/era-compiler
 era-compiler-solidity = { git = "https://github.com/matter-labs/era-compiler-solidity", branch = "main" }
 era-compiler-vyper = { git = "https://github.com/matter-labs/era-compiler-vyper", branch = "main" }
 
-# era-compiler-common = { path = "../../era-compiler-common" }
-# era-compiler-llvm-context = { path = "../../era-compiler-llvm-context" }
-# era-compiler-solidity = { path = "../../era-compiler-solidity" }
-# era-compiler-vyper = { path = "../../era-compiler-vyper" }
-
 solidity-adapter = { path = "../solidity_adapter" }
 benchmark-analyzer = { path = "../benchmark_analyzer" }
 
diff --git a/compiler_tester/src/compilers/eravm.rs b/compiler_tester/src/compilers/eravm.rs
index 50e8da1e..fc9e9fd3 100644
--- a/compiler_tester/src/compilers/eravm.rs
+++ b/compiler_tester/src/compilers/eravm.rs
@@ -19,15 +19,6 @@ use crate::vm::evm::input::Input as EVMInput;
 #[allow(non_camel_case_types)]
 pub struct EraVMCompiler;
 
-impl EraVMCompiler {
-    ///
-    /// A shortcut constructor.
-    ///
-    pub fn new() -> Self {
-        Self::default()
-    }
-}
-
 impl Compiler for EraVMCompiler {
     fn compile_for_eravm(
         &self,
diff --git a/compiler_tester/src/compilers/llvm.rs b/compiler_tester/src/compilers/llvm.rs
index 94ad2a85..902f452a 100644
--- a/compiler_tester/src/compilers/llvm.rs
+++ b/compiler_tester/src/compilers/llvm.rs
@@ -33,15 +33,6 @@ lazy_static::lazy_static! {
     };
 }
 
-impl LLVMCompiler {
-    ///
-    /// A shortcut constructor.
-    ///
-    pub fn new() -> Self {
-        Self::default()
-    }
-}
-
 impl Compiler for LLVMCompiler {
     fn compile_for_eravm(
         &self,
diff --git a/compiler_tester/src/compilers/yul.rs b/compiler_tester/src/compilers/yul.rs
index 97d361fb..8208185d 100644
--- a/compiler_tester/src/compilers/yul.rs
+++ b/compiler_tester/src/compilers/yul.rs
@@ -33,15 +33,6 @@ lazy_static::lazy_static! {
     };
 }
 
-impl YulCompiler {
-    ///
-    /// A shortcut constructor.
-    ///
-    pub fn new() -> Self {
-        Self::default()
-    }
-}
-
 impl Compiler for YulCompiler {
     fn compile_for_eravm(
         &self,
diff --git a/compiler_tester/src/lib.rs b/compiler_tester/src/lib.rs
index 6c1890e0..a80f364f 100644
--- a/compiler_tester/src/lib.rs
+++ b/compiler_tester/src/lib.rs
@@ -190,9 +190,9 @@ impl CompilerTester {
     fn all_tests(&self) -> anyhow::Result<Vec<Test>> {
         let solidity_compiler = Arc::new(SolidityCompiler::new());
         let vyper_compiler = Arc::new(VyperCompiler::new());
-        let yul_compiler = Arc::new(YulCompiler::new());
-        let llvm_compiler = Arc::new(LLVMCompiler::new());
-        let eravm_compiler = Arc::new(EraVMCompiler::new());
+        let yul_compiler = Arc::new(YulCompiler);
+        let llvm_compiler = Arc::new(LLVMCompiler);
+        let eravm_compiler = Arc::new(EraVMCompiler);
 
         let mut tests = Vec::with_capacity(16384);
 
diff --git a/compiler_tester/src/vm/eravm/system_contracts.rs b/compiler_tester/src/vm/eravm/system_contracts.rs
index c85e2f1b..dd20f22a 100644
--- a/compiler_tester/src/vm/eravm/system_contracts.rs
+++ b/compiler_tester/src/vm/eravm/system_contracts.rs
@@ -231,7 +231,7 @@ impl SystemContracts {
         }
         let yul_mode = YulMode::new(era_compiler_llvm_context::OptimizerSettings::cycles()).into();
         let mut builds = Self::compile(
-            YulCompiler::new(),
+            YulCompiler,
             &yul_mode,
             yul_file_paths,
             debug_config.clone(),
diff --git a/solidity_adapter/src/test/function_call/parser/syntax/parser/event.rs b/solidity_adapter/src/test/function_call/parser/syntax/parser/event.rs
index 96e7e24e..d0cbdc17 100644
--- a/solidity_adapter/src/test/function_call/parser/syntax/parser/event.rs
+++ b/solidity_adapter/src/test/function_call/parser/syntax/parser/event.rs
@@ -339,9 +339,6 @@ impl Parser {
 
 #[cfg(test)]
 mod tests {
-
-    use crate::test::function_call::parser::lexical::Identifier as LexicalIdentifier;
-
     use crate::test::function_call::parser::lexical::Lexeme;
 
     use crate::test::function_call::parser::lexical::Location;