Add interface, contract token symbol external call

python/tests/test_deploy.py

@@ -89,8 +89,8 @@ class Test(unittest.TestCase):
         c.functions.add(self.address_token_two, d).transact({'from': self.w3.eth.accounts[0]})
         c.functions.add(self.address_token_two, d).transact({'from': self.w3.eth.accounts[1]})
 
-    def test_endorsement(self):
 
+    def test_endorsement(self):
         c = self.w3.eth.contract(abi=self.abi, address=self.address)
 
         d = '0x' + os.urandom(32).hex()
@@ -105,7 +105,6 @@ class Test(unittest.TestCase):
 
         assert d[2:] == c.functions.endorsement(z.hex()).call().hex()
 
-        #another_token_address = web3.Web3.toChecksumAddress('0x' + os.urandom(20).hex())
         c.functions.add(self.address_token_two, d).transact({'from': self.w3.eth.accounts[0]})
 
         assert c.functions.endorsers(self.w3.eth.accounts[0], 0).call() == 1
@@ -127,6 +126,8 @@ class Test(unittest.TestCase):
         c.functions.add(self.address_token_one, d).transact({'from': self.w3.eth.accounts[1]})
         c.functions.add(self.address_token_two, d).transact({'from': self.w3.eth.accounts[1]})
 
+        self.assertEqual(c.functions.tokenSymbolIndex('FOO').call(), self.address_token_one);
+        self.assertEqual(c.functions.tokenSymbolIndex('BAR').call(), self.address_token_two);
 
 
 if __name__ == '__main__':

python/tests/test_inteface.py

@@ -0,0 +1,105 @@
+import os
+import unittest
+import json
+import logging
+
+import web3
+import eth_tester
+import eth_abi
+
+from eth_token_endorser import TokenEndorser
+
+logging.basicConfig(level=logging.DEBUG)
+logg = logging.getLogger()
+
+logging.getLogger('web3').setLevel(logging.WARNING)
+logging.getLogger('eth.vm').setLevel(logging.WARNING)
+
+testdir = os.path.dirname(__file__)
+
+
+class Test(unittest.TestCase):
+
+    contract = None
+
+    def setUp(self):
+        eth_params = eth_tester.backends.pyevm.main.get_default_genesis_params({
+            'gas_limit': 9000000,
+            })
+
+        # create store of used accounts
+        f = open(os.path.join(testdir, '../eth_token_endorser/data/TokenEndorser.bin'), 'r')
+        bytecode = f.read()
+        f.close()
+
+        f = open(os.path.join(testdir, '../eth_token_endorser/data/TokenEndorser.json'), 'r')
+        self.abi = json.load(f)
+        f.close()
+
+
+        backend = eth_tester.PyEVMBackend(eth_params)
+        self.eth_tester =  eth_tester.EthereumTester(backend)
+        provider = web3.Web3.EthereumTesterProvider(self.eth_tester)
+        self.w3 = web3.Web3(provider)
+        c = self.w3.eth.contract(abi=self.abi, bytecode=bytecode)
+        tx_hash = c.constructor().transact({'from': self.w3.eth.accounts[0]})
+
+        r = self.w3.eth.getTransactionReceipt(tx_hash)
+
+        self.address = r.contractAddress
+
+
+        # create token
+        f = open(os.path.join(testdir, '../eth_token_endorser/data/GiftableToken.bin'), 'r')
+        bytecode = f.read()
+        f.close()
+
+        f = open(os.path.join(testdir, '../eth_token_endorser/data/GiftableToken.json'), 'r')
+        self.abi_token = json.load(f)
+        f.close()
+
+        t = self.w3.eth.contract(abi=self.abi_token, bytecode=bytecode)
+        tx_hash = t.constructor('Foo Token', 'FOO', 18).transact({'from': self.w3.eth.accounts[0]})
+
+        r = self.w3.eth.getTransactionReceipt(tx_hash)
+
+        self.address_token_one = r.contractAddress
+
+        t = self.w3.eth.contract(abi=self.abi_token, bytecode=bytecode)
+        tx_hash = t.constructor('Bar Token', 'BAR', 18).transact({'from': self.w3.eth.accounts[0]})
+
+        r = self.w3.eth.getTransactionReceipt(tx_hash)
+
+        self.address_token_two = r.contractAddress
+
+
+        c = self.w3.eth.contract(abi=self.abi, address=self.address)
+        d = '0x' + os.urandom(32).hex()
+        c.functions.add(self.address_token_one, d).transact({'from': self.w3.eth.accounts[0]})
+        c.functions.add(self.address_token_two, d).transact({'from': self.w3.eth.accounts[0]})
+
+
+    def tearDown(self):
+        pass
+
+
+    def test_interface(self):
+        i = TokenEndorser(self.w3, self.address) #, self.w3.eth.accounts[1])
+        self.assertEqual(i.token_from_symbol('FOO'), self.address_token_one)
+
+
+    def test_endorsed_tokens(self):
+        i = TokenEndorser(self.w3, self.address) #, self.w3.eth.accounts[1])
+        t = i.endorsed_tokens(self.w3.eth.accounts[0])
+        self.assertEqual(t[0], self.address_token_one)
+        self.assertEqual(t[1], self.address_token_two)
+
+
+    def test_add(self):
+        i = TokenEndorser(self.w3, self.address, self.w3.eth.accounts[1])
+        d = '0x' + os.urandom(32).hex()
+        i.add(self.address_token_one, d)
+
+
+if __name__ == '__main__':
+    unittest.main()