Merge pull request #435 from konradkonrad/fix_solidity_combinedjson

Fix solidity combinedjson -- thanks @LefterisJP!

Author: konradkonrad

.travis.yml

@@ -11,7 +11,7 @@ env:
     - COVERAGE_APPEND="--append"
     - secure: cKbIgpTJ1yjKLBxpCEiT6IH7NShDWZUE+BvnrAfc+ujCsR6LyLJcKxFQmKnWryJCqg7fp82Ep2bF2oDKzanAROar2xDY1SFGbai42seYMaFCw53YPGJ6u3VNCcfT0rN9BWgE7el/m4fjcD6CRsZYKArNNJbMX8csRt3uXXCFLso=
     - secure: "QyFPrxQHd2LlNQ6zNeTFYhgPmZaOHoWuywcgn8qaSOh6PklyFxHbexkwg0bl23JvtgNEZ1mCD8j0x1/ydSdtxgCFwK9SEL0h7aYuAq+OAIa/G18OPeTJMf7ASsb2QZdfkt9reFpUnjbadzHkuv+rqqb4bFnTJBKwB2LWzHPLhWg="
-    - SOLC_VERSION=0.4.8
+    - SOLC_VERSION=0.4.9
 cache:
   directories:
     - $HOME/.bin

ethereum/_solidity.py

@@ -261,6 +261,34 @@ def compile_file(filepath, libraries=None, combined='bin,abi', optimize=True, ex
     return solc_parse_output(output)
 
 
+def solidity_get_contract_data(all_contracts, filepath, contract_name):
+    """ A backwards compatible method of getting the contract data out
+    of a solc --combined-json output"""
+    try:
+        contract_data = all_contracts[contract_name]
+    except:
+        if filepath is None:
+            filename = '<stdin>'
+        else:
+            _, filename = os.path.split(filepath)
+        contract_data = all_contracts[filename + ":" + contract_name]
+    return contract_data
+
+
+def solidity_get_contract_key(all_contracts, filepath, contract_name):
+    """ A backwards compatible method of getting the key to the all_contracts
+    dictionary for a particular contract"""
+    if contract_name in all_contracts:
+        return contract_name
+    else:
+        if filepath is None:
+            filename = '<stdin>'
+        else:
+            _, filename = os.path.split(filepath)
+        contract_key = filename + ":" + contract_name
+        return contract_key if contract_key in all_contracts else None
+
+
 def compile_contract(filepath, contract_name, libraries=None, combined='bin,abi', optimize=True, extra_args=None):
     all_contracts = compile_file(
         filepath,
@@ -269,8 +297,7 @@ def compile_contract(filepath, contract_name, libraries=None, combined='bin,abi'
         optimize=optimize,
         extra_args=extra_args
     )
-
-    return all_contracts[contract_name]
+    return solidity_get_contract_data(all_contracts, filepath, contract_name)
 
 
 def compile_last_contract(filepath, libraries=None, combined='bin,abi', optimize=True, extra_args=None):
@@ -335,7 +362,7 @@ def _code_or_path(sourcecode, path, contract_name, libraries, combined, extra_ar
         last_contract = all_contract_names[-1]
 
         result = compile_code(sourcecode, libraries=libraries, combined=combined, extra_args=extra_args)
-        return result[last_contract]
+        return solidity_get_contract_data(result, path, last_contract)
 
     @classmethod
     def compile(cls, code, path=None, libraries=None, contract_name='', extra_args=None):
@@ -378,7 +405,12 @@ def combined(cls, code, path=None, extra_args=None):
 
         sorted_contracts = []
         for name in solidity_names(code):
-            sorted_contracts.append((name[1], contracts[name[1]]))
+            sorted_contracts.append(
+                (
+                    name[1],
+                    solidity_get_contract_data(contracts, path, name[1])
+                )
+            )
         return sorted_contracts
 
     @classmethod

ethereum/tests/test_solidity.py

@@ -17,6 +17,7 @@
 def bytecode_is_generated(cinfo, cname):
     return 'code' in cinfo[cname] and len(cinfo[cname]['code']) > 10
 
+
 @pytest.mark.skipif(not SOLIDITY_AVAILABLE, reason='solc compiler not available')
 def test_library_from_file():
     state = tester.state()
@@ -249,6 +250,7 @@ def test_abi_contract():
     assert contract.mul2(2) == 4
     assert contract.mul2(-2) == -4
 
+
 @pytest.mark.skipif(not SOLIDITY_AVAILABLE, reason='solc compiler not available')
 def test_extra_args():
     src = """

ethereum/tests/test_tester.py

@@ -5,7 +5,11 @@
 import pytest
 
 from ethereum.tester import state, ABIContract
-from ethereum._solidity import get_solidity, compile_file
+from ethereum._solidity import (
+        get_solidity,
+        compile_file,
+        solidity_get_contract_data,
+        )
 
 SOLIDITY_AVAILABLE = get_solidity() is not None
 CONTRACTS_DIR = path.join(path.dirname(__file__), 'contracts')
@@ -17,11 +21,17 @@ def test_abicontract_interface():
     tester_state = state()
 
     contract_path = path.join(CONTRACTS_DIR, 'simple_contract.sol')
+    contract_name = 'Simple'
     simple_compiled = compile_file(contract_path)
-    simple_address = tester_state.evm(simple_compiled['Simple']['bin'])
+    simple_data = solidity_get_contract_data(
+            simple_compiled,
+            contract_path,
+            contract_name,
+            )
+    simple_address = tester_state.evm(simple_data['bin'])
 
     # ABIContract class must accept json_abi
-    abi_json = json.dumps(simple_compiled['Simple']['abi']).encode('utf-8')
+    abi_json = json.dumps(simple_data['abi']).encode('utf-8')
 
     abi = ABIContract(
         _state=tester_state,