Skip to content

Commit

Permalink
Merge pull request #375 from clearmatics/tmp-docker-ci-fix
Browse files Browse the repository at this point in the history
Revert solc compile-from-source
  • Loading branch information
AntoineRondelet authored May 6, 2021
2 parents e1e5e2e + 3849994 commit 3ae3e20
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions client/zeth/core/contracts.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
from web3.utils.events import get_event_data # type: ignore
from eth_utils import event_abi_to_log_topic # type: ignore
import solcx
import solcx.install # type: ignore
from typing import Dict, List, Iterator, Optional, Union, Iterable, Any

# Avoid trying to read too much data into memory
Expand Down Expand Up @@ -118,10 +117,7 @@ def get_block_number(web3: Any) -> int:


def install_sol() -> None:
try:
solcx.install_solc(SOL_COMPILER_VERSION)
except solcx.exceptions.SolcInstallationError:
solcx.install.compile_solc(SOL_COMPILER_VERSION)
solcx.install_solc(SOL_COMPILER_VERSION)


def compile_files(files: List[str], **kwargs: Any) -> Any:
Expand Down

0 comments on commit 3ae3e20

Please sign in to comment.