Use solidity_get_contract_data in other methods

Some compiler methods were missing the new method for extracting contract data.

Author: konradkonrad

ethereum/_solidity.py

@@ -362,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):
@@ -405,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