Skip to content

Commit

Permalink
Update deps to public ones
Browse files Browse the repository at this point in the history
  • Loading branch information
hedgar2017 committed Mar 11, 2024
1 parent 157473d commit 21519ab
Show file tree
Hide file tree
Showing 8 changed files with 6 additions and 41 deletions.
4 changes: 2 additions & 2 deletions LLVM.lock
Original file line number Diff line number Diff line change
@@ -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"
5 changes: 0 additions & 5 deletions compiler_tester/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }

Expand Down
9 changes: 0 additions & 9 deletions compiler_tester/src/compilers/eravm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
9 changes: 0 additions & 9 deletions compiler_tester/src/compilers/llvm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
9 changes: 0 additions & 9 deletions compiler_tester/src/compilers/yul.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions compiler_tester/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion compiler_tester/src/vm/eravm/system_contracts.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 21519ab

Please sign in to comment.