Merge pull request #371 from hackaugusto/issue_370

Fix for the issue #370

Author: konradkonrad

ethereum/tester.py

@@ -98,9 +98,16 @@ class ContractCreationFailed(Exception):
 
 class ABIContract(object):  # pylint: disable=too-few-public-methods
 
-    def __init__(self, test_state, abi_translator, address, listen=True, log_listener=None, default_key=None):  # pylint: disable=too-many-arguments
+    def __init__(self, _state, _abi, address, listen=True,  # pylint: disable=too-many-arguments
+                 log_listener=None, default_key=None):
         self.address = address
         self.default_key = default_key or DEFAULT_KEY
+
+        if isinstance(_abi, ContractTranslator):
+            abi_translator = _abi
+        else:
+            abi_translator = ContractTranslator(_abi)
+
         self.translator = abi_translator
 
         def listener(log):
@@ -110,10 +117,10 @@ def listener(log):
                 log_listener(result)
 
         if listen:
-            test_state.block.log_listeners.append(listener)
+            _state.block.log_listeners.append(listener)
 
         for function_name in self.translator.function_data:
-            function = self.method_factory(test_state, function_name)
+            function = self.method_factory(_state, function_name)
             method = types.MethodType(function, self)
             setattr(self, function_name, method)
 
@@ -377,10 +384,13 @@ def trace(self, sender, to, value, data=None):
         return recorder.pop_records()
 
     def mine(self, number_of_blocks=1, coinbase=DEFAULT_ACCOUNT, **kwargs):
-        if 'n' in kwargs: # compatibility 
+        if 'n' in kwargs:  # compatibility
             number_of_blocks = kwargs['n']
-            warnings.warn('The argument \'n\' is deprecated and its support will be removed '\
-                'in the future versions. Please use the name \'number_of_blocks\'.')
+            warnings.warn(
+                "The argument 'n' is deprecated and its support will be removed "
+                "in the future versions. Please use the name 'number_of_blocks'."
+            )
+
         for _ in range(number_of_blocks):
             self.block.finalize()
             self.block.commit_state()

ethereum/tests/contracts/simple_contract.sol

@@ -0,0 +1,5 @@
+contract Simple {
+    function test() returns (int256) {
+        return 1;
+    }
+}

ethereum/tests/test_tester.py

@@ -0,0 +1,35 @@
+# -*- coding: utf8 -*-
+import json
+from os import path
+
+import pytest
+
+from ethereum.tester import state, ABIContract
+from ethereum._solidity import get_solidity, compile_file
+
+SOLIDITY_AVAILABLE = get_solidity() is not None
+CONTRACTS_DIR = path.join(path.dirname(__file__), 'contracts')
+
+
+@pytest.mark.skipif(not SOLIDITY_AVAILABLE, reason='solc compiler not available')
+def test_abicontract_interface():
+    """ Test for issue #370. """
+    tester_state = state()
+
+    contract_path = path.join(CONTRACTS_DIR, 'simple_contract.sol')
+    simple_compiled = compile_file(contract_path)
+    simple_address = tester_state.evm(simple_compiled['Simple']['bin'])
+
+    # ABIContract class must accept json_abi
+    abi_json = json.dumps(simple_compiled['Simple']['abi'])
+
+    abi = ABIContract(
+        _state=tester_state,
+        _abi=abi_json,
+        address=simple_address,
+        listen=False,
+        log_listener=None,
+        default_key=None,
+    )
+
+    assert abi.test() == 1  # pylint: disable=no-member