Mine oracles creation in separate blocks

better mine method exception handling

Author: SirSevenG

qa/pytest_komodo/basic/pytest_util.py

@@ -1,12 +1,14 @@
 import time
 import jsonschema
 import os
-if os.name == 'posix':
+try:
     from slickrpc import Proxy
     from slickrpc.exc import RpcException as RPCError
-else:
+    from pycurl import error as HttpError
+except ImportError:
     from bitcoinrpc.authproxy import AuthServiceProxy as Proxy
     from bitcoinrpc.authproxy import JSONRPCException as RPCError
+    from http.client import HTTPException as HttpError
 
 
 def create_proxy(node_params_dictionary):
@@ -54,7 +56,7 @@ def enable_mining(proxy):
         try:
             proxy.setgenerate(True, threads_count)
             break
-        except RPCError as e:
+        except (RPCError, HttpError) as e:
             print(e, " Waiting chain startup\n")
             time.sleep(10)
             tries += 1

qa/pytest_komodo/cc_modules/test_channels.py

@@ -115,7 +115,7 @@ def test_channels(test_params):
     assert result == 200000
 
     result = rpc1.validateaddress(raw_transaction["vout"][3]["scriptPubKey"]["addresses"][0])["ismine"]
-    assert result == True
+    assert result
 
     # have to check that second node have coins to cover txfee at least
     rpc.sendtoaddress(rpc1.getnewaddress(), 1)
@@ -163,7 +163,7 @@ def test_channels(test_params):
     assert result == 700000
 
     result = rpc.validateaddress(raw_transaction["vout"][2]["scriptPubKey"]["addresses"][0])["ismine"]
-    assert result == True
+    assert result
 
     # creating and draining channel (10 payment by 100000 satoshies in total to fit full capacity)
     new_channel_hex1 = rpc.channelsopen(pubkey1, "10", "100000")
@@ -218,8 +218,8 @@ def test_channels(test_params):
 #    try:
 #        rpc1.channelsinfo(channel2_txid)["Transactions"][1]["Secret"]
 #    except Exception:
-#        secret_not_revealed = True
-#    assert secret_not_revealed == True
+#        secret_not_revealed
+#    assert secret_not_revealed
 #
 #    # trying to initiate payment from second node with revealed secret
 #    assert rpc1.getinfo()["connections"] == 0

qa/pytest_komodo/cc_modules/test_rewards.py

@@ -5,7 +5,6 @@
 
 import pytest
 import json
-
 from util import assert_success, assert_error, check_if_mined, send_and_mine,\
     rpc_connect, wait_some_blocks, generate_random_string, komodo_teardown
 

qa/pytest_komodo/cc_modules/util.py

@@ -1,12 +1,11 @@
 import pytest
 import time
 import sys
-import os
 from random import choice
 from string import ascii_uppercase
-if os.name == 'posix':
+try:
     from slickrpc import Proxy
-else:
+except ImportError:
     from bitcoinrpc.authproxy import AuthServiceProxy as Proxy
 
 

qa/pytest_komodo/chainconfig.json

@@ -4,7 +4,8 @@
     "rpc_user": "test",
     "rpcpassword": "test",
     "rpcallowip": "0.0.0.0/0",
-    "rpcport": "7000",
+    "rpcport": 7000,
+    "port": 6000,
     "rpcbind": "0.0.0.0",
     "ac_reward": "100000000000",
     "ac_supply": "10000000000",

qa/pytest_komodo/chainstart.py

@@ -99,25 +99,20 @@ def main():
         cl_args = [ac_params.get('binary_path'),
                    '-ac_name=' + aschain,
                    '-conf=' + confpath,
-                   '-rpcport=' + str(7000 + i),
-                   '-port=' + str(6000 + i),
                    '-datadir=' + datapath,
                    '-pubkey=' + env_params.get('test_pubkey')[i],
                    ]
-        if i > 0:
-            cl_args.append('-addnode=127.0.0.1:6000')
-        if ac_params.get('ac_reward'):
-            cl_args.append('-ac_reward=' + ac_params.get('ac_reward'))
+        if i == 0:
+            for key in ac_params.keys():
+                cl_args.append('-' + key + '=' + str(ac_params.get(key)))
         else:
-            cl_args.append('-ac_reward=100000000000')
-        if ac_params.get('ac_supply'):
-            cl_args.append('-ac_supply=' + ac_params.get('ac_supply'))
-        else:
-            cl_args.append('-ac_supply=10000000000')
-        if ac_params.get('ac_cc'):
-            cl_args.append('-ac_cc=' + ac_params.get('ac_cc'))
-        else:
-            cl_args.append('-ac_cc=2')
+            cl_args.append('-addnode=127.0.0.1:' + str(ac_params.get('port')))
+            for key in ac_params.keys():
+                if isinstance(ac_params.get(key), int):
+                    data = ac_params.get(key) + 1
+                    cl_args.append('-' + key + '=' + str(data))
+                else:
+                    cl_args.append('-' + key + '=' + str(ac_params.get(key)))
         cl_args.extend(ac_params.get('daemon_params'))
         print(cl_args)
         if os.name == "posix":