Skip to content

Commit

Permalink
feat: move the solc client to another crate (#118)
Browse files Browse the repository at this point in the history
  • Loading branch information
hedgar2017 authored Nov 1, 2024
1 parent 1939677 commit cba5ffd
Show file tree
Hide file tree
Showing 23 changed files with 189 additions and 223 deletions.
89 changes: 52 additions & 37 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion LLVM.lock
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
url = "https://github.com/matter-labs/era-compiler-llvm"
branch = "kpv-eravm-fix-linker-duplicating-symbols"
branch = "main"
1 change: 1 addition & 0 deletions compiler_tester/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ era-compiler-common = { git = "https://github.com/matter-labs/era-compiler-commo
era-compiler-downloader = { git = "https://github.com/matter-labs/era-compiler-common", branch = "main" }
era-compiler-llvm-context = { git = "https://github.com/matter-labs/era-compiler-llvm-context", branch = "main" }
era-compiler-solidity = { git = "https://github.com/matter-labs/era-compiler-solidity", branch = "main" }
era-solc = { 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" }

solidity-adapter = { path = "../solidity_adapter" }
Expand Down
13 changes: 4 additions & 9 deletions compiler_tester/src/compilers/eravm/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ pub mod mode;
use std::collections::BTreeMap;
use std::collections::HashMap;

use era_compiler_solidity::CollectableError;
use era_solc::CollectableError;

use crate::compilers::mode::Mode;
use crate::compilers::Compiler;
Expand All @@ -27,7 +27,7 @@ impl Compiler for EraVMCompiler {
&self,
_test_path: String,
sources: Vec<(String, String)>,
_libraries: era_compiler_solidity::SolcStandardJsonInputSettingsLibraries,
_libraries: era_solc::StandardJsonInputLibraries,
_mode: &Mode,
llvm_options: Vec<String>,
debug_config: Option<era_compiler_llvm_context::DebugConfig>,
Expand All @@ -41,12 +41,7 @@ impl Compiler for EraVMCompiler {
let project = era_compiler_solidity::Project::try_from_eravm_assembly_sources(
sources
.into_iter()
.map(|(path, source)| {
(
path,
era_compiler_solidity::SolcStandardJsonInputSource::from(source),
)
})
.map(|(path, source)| (path, era_solc::StandardJsonInputSource::from(source)))
.collect(),
None,
)?;
Expand Down Expand Up @@ -76,7 +71,7 @@ impl Compiler for EraVMCompiler {
&self,
_test_path: String,
_sources: Vec<(String, String)>,
_libraries: era_compiler_solidity::SolcStandardJsonInputSettingsLibraries,
_libraries: era_solc::StandardJsonInputLibraries,
_mode: &Mode,
_test_params: Option<&solidity_adapter::Params>,
_llvm_options: Vec<String>,
Expand Down
Loading

0 comments on commit cba5ffd

Please sign in to comment.