Improve test coverage

python/eth_erc20/runnable/balance.py

@@ -27,10 +27,6 @@ from eth_abi import encode_single
 
 # external imports
 from chainlib.eth.address import to_checksum
-from chainlib.jsonrpc import (
-        jsonrpc_template,
-        jsonrpc_result,
-        )
 from chainlib.eth.connection import EthHTTPConnection
 from chainlib.eth.gas import (
         OverrideGasOracle,
@@ -44,8 +40,9 @@ from eth_erc20 import ERC20
 logging.basicConfig(level=logging.WARNING)
 logg = logging.getLogger()
 
-default_abi_dir = os.environ.get('ETH_ABI_DIR', '/usr/share/local/cic/solidity/abi')
-default_eth_provider = os.environ.get('ETH_PROVIDER', 'http://localhost:8545')
+default_eth_provider = os.environ.get('RPC_PROVIDER')
+if default_eth_provider == None:
+    default_eth_provider = os.environ.get('ETH_PROVIDER', 'http://localhost:8545')
 
 argparser = argparse.ArgumentParser()
 argparser.add_argument('-p', '--provider', dest='p', default=default_eth_provider, type=str, help='Web3 provider url (http only)')
@@ -53,6 +50,7 @@ argparser.add_argument('-a', '--token-address', dest='a', required=True, type=st
 argparser.add_argument('-f', '--format', dest='f', type=str, default='terminal', help='Output format [terminal (default), raw, brief]')
 argparser.add_argument('-i', '--chain-spec', dest='i', type=str, default='evm:ethereum:1', help='Chain specification string')
 argparser.add_argument('-u', '--unsafe', dest='u', action='store_true', help='Auto-convert address to checksum adddress')
+argparser.add_argument('--seq', action='store_true', help='Use sequential rpc ids')
 argparser.add_argument('-v', action='store_true', help='Be verbose')
 argparser.add_argument('-vv', action='store_true', help='Be more verbose')
 argparser.add_argument('address', type=str, help='Account address')

python/eth_erc20/runnable/transfer.py

@@ -24,7 +24,9 @@ from hexathon import (
         strip_0x,
         )
 from chainlib.eth.connection import EthHTTPConnection
-from chainlib.jsonrpc import jsonrpc_template
+from chainlib.jsonrpc import (
+        IntSequenceGenerator,
+        )
 from chainlib.eth.nonce import (
         RPCNonceOracle,
         OverrideNonceOracle,
@@ -45,9 +47,12 @@ logg = logging.getLogger()
 logging.getLogger('web3').setLevel(logging.WARNING)
 logging.getLogger('urllib3').setLevel(logging.WARNING)
 
-default_abi_dir = '/usr/local/share/cic/solidity/abi'
+default_eth_provider = os.environ.get('RPC_PROVIDER')
+if default_eth_provider == None:
+    default_eth_provider = os.environ.get('ETH_PROVIDER', 'http://localhost:8545')
+
 argparser = argparse.ArgumentParser()
-argparser.add_argument('-p', '--provider', dest='p', default='http://localhost:8545', type=str, help='Web3 provider url (http only)')
+argparser.add_argument('-p', '--provider', dest='p', default=default_eth_provider, type=str, help='Web3 provider url (http only)')
 argparser.add_argument('-w', action='store_true', help='Wait for the last transaction to be confirmed')
 argparser.add_argument('-ww', action='store_true', help='Wait for every transaction to be confirmed')
 argparser.add_argument('-i', '--chain-spec', dest='i', type=str, default='evm:ethereum:1', help='Chain specification string')
@@ -59,6 +64,7 @@ argparser.add_argument('-s', '--send', dest='s', action='store_true', help='Send
 argparser.add_argument('--nonce', type=int, help='Override nonce')
 argparser.add_argument('--gas-price', dest='gas_price', type=int, help='Override gas price')
 argparser.add_argument('--gas-limit', dest='gas_limit', type=int, help='Override gas limit')
+argparser.add_argument('--seq', action='store_true', help='Use sequential rpc ids')
 argparser.add_argument('-v', action='store_true', help='Be verbose')
 argparser.add_argument('-vv', action='store_true', help='Be more verbose')
 argparser.add_argument('recipient', type=str, help='Recipient account address')
@@ -91,22 +97,33 @@ if args.y != None:
     logg.debug('now have key for signer address {}'.format(signer_address))
 signer = EIP155Signer(keystore)
 
+rpc_id_generator = None
+if args.seq:
+    rpc_id_generator = IntSequenceGenerator()
+
+auth = None
+#if os.environ.get('RPC_AUTHENTICATION') == 'custom_token':
+
+if os.environ.get('RPC_AUTHENTICATION') == 'basic':
+    from chainlib.auth import BasicAuth
+    #auth = CustomHeaderTokenAuth('x-api-key', os.environ['RPC_AUTHENTICATION_STRING'])
+    auth = BasicAuth(os.environ['RPC_USERNAME'], os.environ['RPC_PASSWORD'])
 conn = EthHTTPConnection(args.p)
 
 nonce_oracle = None
 if args.nonce != None:
-    nonce_oracle = OverrideNonceOracle(signer_address, args.nonce)
+    nonce_oracle = OverrideNonceOracle(signer_address, args.nonce, id_generator=rpc_id_generator)
 else:
-    nonce_oracle = RPCNonceOracle(signer_address, conn)
+    nonce_oracle = RPCNonceOracle(signer_address, conn, id_generator=rpc_id_generator)
 
-def _max_gas(code=None):
-    return 8000000
+#def _max_gas(code=None):
+#    return 8000000
 
 gas_oracle = None
 if args.gas_price != None or args.gas_limit != None:
-    gas_oracle = OverrideGasOracle(price=args.gas_price, limit=args.gas_limit)
+    gas_oracle = OverrideGasOracle(price=args.gas_price, limit=args.gas_limit, id_generator=rpc_id_generator, conn=conn)
 else:
-    gas_oracle = RPCGasOracle(conn, code_callback=_max_gas)
+    gas_oracle = RPCGasOracle(conn, code_callback=ERC20.gas, id_generator=rpc_id_generator)
 
 chain_spec = ChainSpec.from_chain_str(args.i)
 chain_id = chain_spec.network_id()
@@ -118,8 +135,8 @@ send = args.s
 g = ERC20(chain_spec, signer=signer, gas_oracle=gas_oracle, nonce_oracle=nonce_oracle)
 
 
-def balance(token_address, address):
-    o = g.balance(token_address, address)
+def balance(token_address, address, id_generator=None):
+    o = g.balance(token_address, address, id_generator=id_generator)
     r = conn.do(o)
     hx = strip_0x(r)
     return int(hx, 16)
@@ -131,18 +148,22 @@ def main():
         raise ValueError('invalid checksum address')
 
     if logg.isEnabledFor(logging.DEBUG):
-        logg.debug('sender {} balance after: {}'.format(signer_address, balance(args.a, signer_address)))
-        logg.debug('recipient {} balance after: {}'.format(recipient, balance(args.a, recipient)))
+        sender_balance = balance(args.a, signer_address, id_generator=rpc_id_generator)
+        recipient_balance = balance(args.a, recipient, id_generator=rpc_id_generator)
+        logg.debug('sender {} balance after: {}'.format(signer_address, sender_balance))
+        logg.debug('recipient {} balance after: {}'.format(recipient, recipient_balance))
 
-    (tx_hash_hex, o) = g.transfer(args.a, signer_address, recipient, value)
+    (tx_hash_hex, o) = g.transfer(args.a, signer_address, recipient, value, id_generator=rpc_id_generator)
 
     if send:
         conn.do(o)
         if block_last:
             r = conn.wait(tx_hash_hex)
             if logg.isEnabledFor(logging.DEBUG):
-                logg.debug('sender {} balance after: {}'.format(signer_address, balance(args.a, signer_address)))
-                logg.debug('recipient {} balance after: {}'.format(recipient, balance(args.a, recipient)))
+                sender_balance = balance(args.a, signer_address, id_generator=rpc_id_generator)
+                recipient_balance = balance(args.a, recipient, id_generator=rpc_id_generator)
+                logg.debug('sender {} balance after: {}'.format(signer_address, sender_balance))
+                logg.debug('recipient {} balance after: {}'.format(recipient, recipient_balance))
             if r['status'] == 0:
                 logg.critical('VM revert. Wish I could tell you more')
                 sys.exit(1)