Add writer test contract

python/eth_writer/unittest/__init__.py

@@ -1 +1 @@
-from .base import TestEthWriterInterface
+from .interface import TestEthWriterInterface

python/eth_writer/unittest/base.py

@@ -1,45 +1,58 @@
+# standard imports
+import os
+import logging
+
 # external imports
 from chainlib.eth.unittest.ethtester import EthTesterCase
 from chainlib.connection import RPCConnection
 from chainlib.eth.nonce import RPCNonceOracle
 from chainlib.eth.tx import receipt
+from chainlib.eth.tx import TxFactory
+from chainlib.eth.tx import TxFormat
+from chainlib.eth.contract import ABIContractEncoder
+from chainlib.eth.contract import ABIContractType
 
 # local imports
 from eth_writer import EthWriter
 
+script_dir = os.path.dirname(os.path.realpath(__file__))
+contract_dir = os.path.join(script_dir, '..', '..', 'solidity')
 
-class TestEthWriterInterface:
+logg = logging.getLogger(__name__)
 
-    def test_add_delete(self):
-        writer_contract_address = self.contracts['writer']
-        publisher_address = self.roles.get('publisher')
-        writer_account = self.roles['writer']
 
-        nonce_oracle = RPCNonceOracle(self.publisher, conn=self.conn)
+class TestEthWriter(EthTesterCase):
+
+    def setUp(self):
+        super(TestEthWriter, self).setUp()
+
+        self.set_method = None
+
+        self.conn = RPCConnection.connect(self.chain_spec, 'default')
+        nonce_oracle = RPCNonceOracle(self.accounts[0], self.conn)
+
+        f = open(os.path.join(contract_dir, 'WriterTest.bin'))
+        code = f.read()
+        f.close()
+
+        txf = TxFactory(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle)
+        tx = txf.template(self.accounts[0], None, use_nonce=True)
+        tx = txf.set_code(tx, code)
+        (tx_hash_hex, o) = txf.build(tx)
+        self.conn.do(o)
+        o = receipt(tx_hash_hex)
+        r = self.conn.do(o)
+        self.assertEqual(r['status'], 1)
+        self.address = r['contract_address']
+        self.contracts['writer'] = self.address
+        self.roles['publisher'] = self.accounts[0]
+        self.roles['writer'] = self.accounts[1]
+        logg.debug('published writer test contract with hash {}'.format(r))
+
         c = EthWriter(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle)
-
-        o = c.is_writer(writer_contract_address, publisher_address, sender_address=publisher_address)
-        r = self.rpc.do(o)
-        self.assertEqual(int(r, 16), 1)
-
-        self.alice = self.accounts[1]
-        (tx_hash, o) = c.add_writer(writer_contract_address, publisher_address, writer_account)
+        (tx_hash, o) = c.add_writer(self.address, self.accounts[0], self.accounts[0])
         self.rpc.do(o)
         o = receipt(tx_hash)
         r = self.rpc.do(o)
         self.assertEqual(r['status'], 1)
 
-        o = c.is_writer(writer_contract_address, writer_account, sender_address=publisher_address)
-        r = self.rpc.do(o)
-        self.assertEqual(int(r, 16), 1)
-
-        self.alice = self.accounts[1]
-        (tx_hash, o) = c.delete_writer(writer_contract_address, publisher_address, writer_account)
-        self.rpc.do(o)
-        o = receipt(tx_hash)
-        r = self.rpc.do(o)
-        self.assertEqual(r['status'], 1)
-
-        o = c.is_writer(writer_contract_address, self.alice, sender_address=publisher_address)
-        r = self.rpc.do(o)
-        self.assertEqual(int(r, 16), 0)

python/eth_writer/unittest/interface.py

@@ -0,0 +1,45 @@
+# external imports
+from chainlib.eth.unittest.ethtester import EthTesterCase
+from chainlib.connection import RPCConnection
+from chainlib.eth.nonce import RPCNonceOracle
+from chainlib.eth.tx import receipt
+
+# local imports
+from eth_writer import EthWriter
+
+
+class TestEthWriterInterface:
+
+    def test_add_delete(self):
+        writer_contract_address = self.contracts['writer']
+        publisher_address = self.roles.get('publisher')
+        writer_account = self.roles['writer']
+
+        nonce_oracle = RPCNonceOracle(self.publisher, conn=self.conn)
+        c = EthWriter(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle)
+
+        o = c.is_writer(writer_contract_address, publisher_address, sender_address=publisher_address)
+        r = self.rpc.do(o)
+        self.assertEqual(int(r, 16), 1)
+
+        self.alice = self.accounts[1]
+        (tx_hash, o) = c.add_writer(writer_contract_address, publisher_address, writer_account)
+        self.rpc.do(o)
+        o = receipt(tx_hash)
+        r = self.rpc.do(o)
+        self.assertEqual(r['status'], 1)
+
+        o = c.is_writer(writer_contract_address, writer_account, sender_address=publisher_address)
+        r = self.rpc.do(o)
+        self.assertEqual(int(r, 16), 1)
+
+        self.alice = self.accounts[1]
+        (tx_hash, o) = c.delete_writer(writer_contract_address, publisher_address, writer_account)
+        self.rpc.do(o)
+        o = receipt(tx_hash)
+        r = self.rpc.do(o)
+        self.assertEqual(r['status'], 1)
+
+        o = c.is_writer(writer_contract_address, self.alice, sender_address=publisher_address)
+        r = self.rpc.do(o)
+        self.assertEqual(int(r, 16), 0)