Merge pull request #431 from gsalgado/compile_code_error_when_solc_missing

compile_code: raise exception when solc missing

Author: konradkonrad

ethereum/_solidity.py

@@ -17,6 +17,10 @@ class CompileError(Exception):
     pass
 
 
+class SolcMissing(Exception):
+    pass
+
+
 def get_compiler_path():
     """ Return the path to the solc compiler.
 
@@ -323,7 +327,10 @@ def compile_last_contract(filepath, libraries=None, combined='bin,abi', optimize
 
 def compile_code(sourcecode, libraries=None, combined='bin,abi', optimize=True, extra_args=None):
     args = solc_arguments(libraries=libraries, combined=combined, optimize=optimize, extra_args=extra_args)
-    args.insert(0, get_compiler_path())
+    compiler = get_compiler_path()
+    if compiler is None:
+        raise SolcMissing("solc not found")
+    args.insert(0, compiler)
 
     process = subprocess.Popen(args, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     stdoutdata, stderrdata = process.communicate(input=utils.to_string(sourcecode))

ethereum/tests/test_solidity.py

@@ -271,3 +271,10 @@ def test_extra_args():
         extra_args=["--optimize-runs", "100"]
     )
     assert bytecode_is_generated(contract_info, 'foo')
+
+def test_missing_solc(monkeypatch):
+    monkeypatch.setattr(_solidity, 'get_compiler_path', lambda: None)
+    assert _solidity.get_compiler_path() is None
+    sample_sol_code = "contract SampleContract {}"
+    with pytest.raises(_solidity.SolcMissing):
+        _solidity.compile_code(sample_sol_code)